From ee5b5929d56de13e00c88352cd2ad16ffd6e0308 Mon Sep 17 00:00:00 2001 From: ZHANG Dapeng Date: Tue, 15 Sep 2020 11:22:44 -0700 Subject: [PATCH] api,netty: Fix TruthIncompatibleType --- api/src/test/java/io/grpc/ClientInterceptorsTest.java | 2 +- .../io/grpc/netty/WriteBufferingAndExceptionHandlerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/test/java/io/grpc/ClientInterceptorsTest.java b/api/src/test/java/io/grpc/ClientInterceptorsTest.java index df5e8007582..555e9405764 100644 --- a/api/src/test/java/io/grpc/ClientInterceptorsTest.java +++ b/api/src/test/java/io/grpc/ClientInterceptorsTest.java @@ -329,7 +329,7 @@ public ClientCall interceptCall( assertSame(listener, call.listener); assertSame(headers, call.headers); interceptedCall.sendMessage(null /*request*/); - assertThat(call.messages).containsExactly((Void) null /*request*/); + assertThat(call.messages).containsExactly((String) null); interceptedCall.halfClose(); assertTrue(call.halfClosed); interceptedCall.request(1); diff --git a/netty/src/test/java/io/grpc/netty/WriteBufferingAndExceptionHandlerTest.java b/netty/src/test/java/io/grpc/netty/WriteBufferingAndExceptionHandlerTest.java index b3b536b20ea..b99a9386fcf 100644 --- a/netty/src/test/java/io/grpc/netty/WriteBufferingAndExceptionHandlerTest.java +++ b/netty/src/test/java/io/grpc/netty/WriteBufferingAndExceptionHandlerTest.java @@ -345,7 +345,7 @@ public void run() { assertThat(chan.pipeline().context(handler)).isNull(); assertThat(write.get().getClass()).isSameInstanceAs(Object.class); assertTrue(flush.get()); - assertThat(chan.pipeline()).doesNotContain(handler); + assertThat(chan.pipeline().toMap().values()).doesNotContain(handler); } @Test