From cf86d81ef75923708cc2fe46eca8b36fcd4a2171 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Sun, 13 Mar 2016 22:53:57 -0700 Subject: [PATCH] Rename older AbstractTransportTest to AbstractInteropTest There are two AbstractTransportTests. The newest one is the more aptly named, so rename the older one to AbstractInteropTest to remove name collision when speaking. Fixes #1484 --- .../{AbstractTransportTest.java => AbstractInteropTest.java} | 2 +- .../java/io/grpc/testing/integration/TestServiceClient.java | 2 +- .../io/grpc/testing/integration/Http2NettyLocalChannelTest.java | 2 +- .../test/java/io/grpc/testing/integration/Http2NettyTest.java | 2 +- .../test/java/io/grpc/testing/integration/Http2OkHttpTest.java | 2 +- .../test/java/io/grpc/testing/integration/InProcessTest.java | 2 +- .../io/grpc/testing/integration/TransportCompressionTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename interop-testing/src/main/java/io/grpc/testing/integration/{AbstractTransportTest.java => AbstractInteropTest.java} (99%) diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java similarity index 99% rename from interop-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java rename to interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java index 14d914f067..bfec091f0b 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/AbstractTransportTest.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/AbstractInteropTest.java @@ -99,7 +99,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * Abstract base class for all GRPC transport tests. */ -public abstract class AbstractTransportTest { +public abstract class AbstractInteropTest { public static final Metadata.Key METADATA_KEY = ProtoUtils.keyForProto(Messages.SimpleContext.getDefaultInstance()); diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java index bc038df385..edd73adb56 100644 --- a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java +++ b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceClient.java @@ -258,7 +258,7 @@ public class TestServiceClient { } } - private class Tester extends AbstractTransportTest { + private class Tester extends AbstractInteropTest { @Override protected ManagedChannel createChannel() { if (!useOkHttp) { diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java index 952fc34535..db2fd63b5a 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyLocalChannelTest.java @@ -48,7 +48,7 @@ import org.junit.runners.JUnit4; * Run transport tests over the Netty in-process channel. */ @RunWith(JUnit4.class) -public class Http2NettyLocalChannelTest extends AbstractTransportTest { +public class Http2NettyLocalChannelTest extends AbstractInteropTest { /** Start server. */ @BeforeClass diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java index 9cea4f3161..423f4cc8c0 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java @@ -50,7 +50,7 @@ import java.io.IOException; * Integration tests for GRPC over HTTP2 using the Netty framework. */ @RunWith(JUnit4.class) -public class Http2NettyTest extends AbstractTransportTest { +public class Http2NettyTest extends AbstractInteropTest { private static int serverPort = TestUtils.pickUnusedPort(); /** Starts the server with HTTPS. */ diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java index 663dd8eb74..e805018f24 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java @@ -68,7 +68,7 @@ import javax.net.ssl.SSLPeerUnverifiedException; * Integration tests for GRPC over Http2 using the OkHttp framework. */ @RunWith(JUnit4.class) -public class Http2OkHttpTest extends AbstractTransportTest { +public class Http2OkHttpTest extends AbstractInteropTest { private static int serverPort = TestUtils.pickUnusedPort(); /** Starts the server with HTTPS. */ diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java index 50854509e4..7f4aa2ef53 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/InProcessTest.java @@ -42,7 +42,7 @@ import org.junit.runners.JUnit4; /** Unit tests for {@link InProcess}. */ @RunWith(JUnit4.class) -public class InProcessTest extends AbstractTransportTest { +public class InProcessTest extends AbstractInteropTest { private static String serverName = "test"; /** Starts the in-process server. */ diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java index 9629a5a06f..b237d0f228 100644 --- a/interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java +++ b/interop-testing/src/test/java/io/grpc/testing/integration/TransportCompressionTest.java @@ -78,7 +78,7 @@ import java.io.OutputStream; * Tests that compression is turned on. */ @RunWith(JUnit4.class) -public class TransportCompressionTest extends AbstractTransportTest { +public class TransportCompressionTest extends AbstractInteropTest { private static int serverPort = TestUtils.pickUnusedPort();