diff options
author | Muxi Yan <mxyan@google.com> | 2017-12-06 22:09:36 -0800 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2017-12-06 22:09:36 -0800 |
commit | 67454d71e833a7704d61e673ad32e71dd31c868a (patch) | |
tree | fe720c5bb8388a02ed334b0b0c071c0f7b895b31 /test/core/compression | |
parent | fc38142db69cd8c95f3c55a296b4e73b04c720c3 (diff) | |
parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) |
Merge commit 'b0bad8f' into fix-stream-compression-config-interface
Diffstat (limited to 'test/core/compression')
-rw-r--r-- | test/core/compression/algorithm_test.cc | 4 | ||||
-rw-r--r-- | test/core/compression/stream_compression_test.cc | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/test/core/compression/algorithm_test.cc b/test/core/compression/algorithm_test.cc index a0ed7dbc98..275b60b08f 100644 --- a/test/core/compression/algorithm_test.cc +++ b/test/core/compression/algorithm_test.cc @@ -87,11 +87,11 @@ static void test_algorithm_failure(void) { gpr_log(GPR_DEBUG, "test_algorithm_failure"); GPR_ASSERT(grpc_compression_algorithm_name(GRPC_COMPRESS_ALGORITHMS_COUNT, - NULL) == 0); + nullptr) == 0); GPR_ASSERT( grpc_compression_algorithm_name(static_cast<grpc_compression_algorithm>( GRPC_COMPRESS_ALGORITHMS_COUNT + 1), - NULL) == 0); + nullptr) == 0); mdstr = grpc_slice_from_static_string("this-is-an-invalid-algorithm"); GPR_ASSERT(grpc_compression_algorithm_from_slice(mdstr) == GRPC_COMPRESS_ALGORITHMS_COUNT); diff --git a/test/core/compression/stream_compression_test.cc b/test/core/compression/stream_compression_test.cc index 7cb583b88d..2f30b7fc19 100644 --- a/test/core/compression/stream_compression_test.cc +++ b/test/core/compression/stream_compression_test.cc @@ -66,7 +66,7 @@ static void test_stream_compression_simple_compress_decompress() { GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); grpc_slice slice = grpc_slice_from_static_string(test_str); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); bool end_of_context; @@ -99,7 +99,7 @@ test_stream_compression_simple_compress_decompress_with_output_size_constraint() GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); grpc_slice slice = grpc_slice_from_static_string(test_str); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); grpc_stream_compression_context_destroy(compress_ctx); @@ -149,7 +149,7 @@ test_stream_compression_simple_compress_decompress_with_large_data() { GRPC_STREAM_COMPRESSION_GZIP_DECOMPRESS); grpc_slice slice = grpc_slice_from_static_string(test_str); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); bool end_of_context; @@ -180,7 +180,7 @@ static void test_stream_compression_drop_context() { GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); grpc_slice slice = grpc_slice_from_static_string(test_str); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); grpc_stream_compression_context_destroy(compress_ctx); @@ -189,7 +189,7 @@ static void test_stream_compression_drop_context() { GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); slice = grpc_slice_from_static_string(test_str2); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); grpc_stream_compression_context_destroy(compress_ctx); @@ -249,7 +249,7 @@ static void test_stream_compression_sync_flush() { GRPC_STREAM_COMPRESSION_GZIP_COMPRESS); grpc_slice slice = grpc_slice_from_static_string(test_str); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_SYNC)); @@ -268,7 +268,7 @@ static void test_stream_compression_sync_flush() { grpc_slice_buffer_init(&sink); slice = grpc_slice_from_static_string(test_str2); grpc_slice_buffer_add(&source, slice); - GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, NULL, + GPR_ASSERT(grpc_stream_compress(compress_ctx, &source, &relay, nullptr, ~(size_t)0, GRPC_STREAM_COMPRESSION_FLUSH_FINISH)); grpc_stream_compression_context_destroy(compress_ctx); |