From 4c5dabf7050a05652bc443f873fc82682fbda1b6 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Wed, 26 Sep 2018 12:49:12 -0700
Subject: [PATCH] netty: Don't return null ServerTransportListener in tests

Null is never allowed, so will cause exceptions and not behave properly.
---
 .../java/io/grpc/netty/NettyServerTest.java   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/netty/src/test/java/io/grpc/netty/NettyServerTest.java b/netty/src/test/java/io/grpc/netty/NettyServerTest.java
index 539f1358b7..648fc78184 100644
--- a/netty/src/test/java/io/grpc/netty/NettyServerTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyServerTest.java
@@ -24,11 +24,14 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
 import com.google.common.util.concurrent.SettableFuture;
+import io.grpc.Attributes;
 import io.grpc.InternalChannelz;
 import io.grpc.InternalChannelz.SocketStats;
 import io.grpc.InternalInstrumented;
+import io.grpc.Metadata;
 import io.grpc.ServerStreamTracer;
 import io.grpc.internal.ServerListener;
+import io.grpc.internal.ServerStream;
 import io.grpc.internal.ServerTransport;
 import io.grpc.internal.ServerTransportListener;
 import io.grpc.internal.TransportTracer;
@@ -75,7 +78,7 @@ public class NettyServerTest {
     ns.start(new ServerListener() {
       @Override
       public ServerTransportListener transportCreated(ServerTransport transport) {
-        return null;
+        return new NoopServerTransportListener();
       }
 
       @Override
@@ -159,7 +162,7 @@ public class NettyServerTest {
 
         countDownLatch.countDown();
 
-        return null;
+        return new NoopServerTransportListener();
       }
 
       @Override
@@ -202,7 +205,7 @@ public class NettyServerTest {
     ns.start(new ServerListener() {
       @Override
       public ServerTransportListener transportCreated(ServerTransport transport) {
-        return null;
+        return new NoopServerTransportListener();
       }
 
       @Override
@@ -231,4 +234,14 @@ public class NettyServerTest {
     // listen socket is removed
     assertNull(channelz.getSocket(id(listenSocket)));
   }
+
+  private static class NoopServerTransportListener implements ServerTransportListener {
+    @Override public void streamCreated(ServerStream stream, String method, Metadata headers) {}
+
+    @Override public Attributes transportReady(Attributes attributes) {
+      return attributes;
+    }
+
+    @Override public void transportTerminated() {}
+  }
 }