diff options
author | Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-03-26 13:19:07 -0700 |
commit | 92b3f568dbd1bf15c85cddac8d8f57a5a58201ef (patch) | |
tree | 57cbb547c3e2feee2737df86382b422d37ebb3c0 /test/core/json | |
parent | c63a09eb6ceb547c73b674f48a5833412cd5f08f (diff) | |
parent | 94f908ae84ab6d280a41e09245925ecfa612dce8 (diff) |
Merge github.com:grpc/grpc into fuzzy-bits
Diffstat (limited to 'test/core/json')
-rw-r--r-- | test/core/json/json_rewrite_test.c | 4 | ||||
-rw-r--r-- | test/core/json/json_stream_error_test.c | 4 | ||||
-rw-r--r-- | test/core/json/json_test.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/core/json/json_rewrite_test.c b/test/core/json/json_rewrite_test.c index d99cb0dd03..1916d4b86c 100644 --- a/test/core/json/json_rewrite_test.c +++ b/test/core/json/json_rewrite_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,8 +35,8 @@ #include <stdlib.h> #include <grpc/support/alloc.h> -#include <grpc/support/useful.h> #include <grpc/support/log.h> +#include <grpc/support/useful.h> #include "test/core/util/test_config.h" #include "src/core/json/json_reader.h" diff --git a/test/core/json/json_stream_error_test.c b/test/core/json/json_stream_error_test.c index 400776759d..3b07fcd38e 100644 --- a/test/core/json/json_stream_error_test.c +++ b/test/core/json/json_stream_error_test.c @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -35,8 +35,8 @@ #include <stdlib.h> #include <grpc/support/alloc.h> -#include <grpc/support/useful.h> #include <grpc/support/log.h> +#include <grpc/support/useful.h> #include "test/core/util/test_config.h" #include "src/core/json/json_reader.h" diff --git a/test/core/json/json_test.c b/test/core/json/json_test.c index cbd96a75fe..db3119af70 100644 --- a/test/core/json/json_test.c +++ b/test/core/json/json_test.c @@ -34,9 +34,9 @@ #include <string.h> #include <grpc/support/alloc.h> -#include <grpc/support/useful.h> #include <grpc/support/log.h> #include <grpc/support/string_util.h> +#include <grpc/support/useful.h> #include "src/core/json/json.h" #include "src/core/support/string.h" @@ -67,7 +67,7 @@ static testing_pair testing_pairs[] = { {"{\"\\ud834\\udd1e\":0}", "{\"\\ud834\\udd1e\":0}"}, /* Testing nested empty containers. */ { - " [ [ ] , { } , [ ] ] ", "[[],{},[]]", + " [ [ ] , { } , [ ] ] ", "[[],{},[]]", }, /* Testing escapes and control chars in key strings. */ {" { \"\\u007f\x7f\\n\\r\\\"\\f\\b\\\\a , b\": 1, \"\": 0 } ", |