aboutsummaryrefslogtreecommitdiff
path: root/netty
diff options
context:
space:
mode:
authorEric Gribkoff <ericgribkoff@google.com>2017-09-25 09:01:53 -0700
committerGitHub <noreply@github.com>2017-09-25 09:01:53 -0700
commit5ac9ad0c1f76564fe745865feda2cab79363ee1e (patch)
tree72998cc9ddc61ff1183b8cc5a107d750e596f79a /netty
parenta34ea3592cc9c2ce79ec2c7aac3f857ebc0f5e5d (diff)
downloadgrpc-grpc-java-5ac9ad0c1f76564fe745865feda2cab79363ee1e.tar.gz
core: client supports inbound gzipped streams (#3403)
Diffstat (limited to 'netty')
-rw-r--r--netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java
index e1549c345..98a0f7392 100644
--- a/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyServerHandlerTest.java
@@ -42,6 +42,7 @@ import static org.mockito.Matchers.anyString;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -55,6 +56,7 @@ import io.grpc.Attributes;
import io.grpc.Metadata;
import io.grpc.ServerStreamTracer;
import io.grpc.Status;
+import io.grpc.Status.Code;
import io.grpc.StreamTracer;
import io.grpc.internal.GrpcUtil;
import io.grpc.internal.KeepAliveManager;
@@ -271,9 +273,6 @@ public class NettyServerHandlerTest extends NettyHandlerTestBase<NettyServerHand
assertNull("no messages expected", streamListenerMessageQueue.poll());
}
- // TODO(ericgribkoff) Figure out how this test should be restructured to accommodate application-
- // thread deframing.
- /*
@Test
public void streamErrorShouldNotCloseChannel() throws Exception {
manualSetUp();
@@ -297,7 +296,6 @@ public class NettyServerHandlerTest extends NettyHandlerTestBase<NettyServerHand
assertEquals(e, captor.getValue().asException().getCause());
assertEquals(Code.UNKNOWN, captor.getValue().getCode());
}
- */
@Test
public void closeShouldCloseChannel() throws Exception {