testing: Move some internal classes to testFixtures
These two classes are precisely the purpose of test fixtures. Move them
close to the classes they make easier to use in tests.
diff --git a/core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java b/core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java
index 4dcd4b8..1629d74 100644
--- a/core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java
+++ b/core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java
@@ -16,8 +16,8 @@
package io.grpc.inprocess;
+import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory;
-import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
index d19c60a..ce553ed 100644
--- a/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ClientCallImplTest.java
@@ -61,7 +61,7 @@
import io.grpc.Status;
import io.grpc.internal.ClientCallImpl.ClientStreamProvider;
import io.grpc.internal.ManagedChannelServiceConfig.MethodInfo;
-import io.grpc.internal.testing.SingleMessageProducer;
+import io.grpc.internal.SingleMessageProducer;
import io.grpc.testing.TestMethodDescriptors;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/core/src/test/java/io/grpc/internal/DelayedStreamTest.java b/core/src/test/java/io/grpc/internal/DelayedStreamTest.java
index d3ec87f..e39e8d4 100644
--- a/core/src/test/java/io/grpc/internal/DelayedStreamTest.java
+++ b/core/src/test/java/io/grpc/internal/DelayedStreamTest.java
@@ -42,7 +42,7 @@
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.internal.ClientStreamListener.RpcProgress;
-import io.grpc.internal.testing.SingleMessageProducer;
+import io.grpc.internal.SingleMessageProducer;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.concurrent.TimeUnit;
diff --git a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java
index 8a2b616..10eb7f1 100644
--- a/core/src/test/java/io/grpc/internal/ServerCallImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ServerCallImplTest.java
@@ -47,7 +47,7 @@
import io.grpc.ServerCall;
import io.grpc.Status;
import io.grpc.internal.ServerCallImpl.ServerStreamListenerImpl;
-import io.grpc.internal.testing.SingleMessageProducer;
+import io.grpc.internal.SingleMessageProducer;
import io.perfmark.PerfMark;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
diff --git a/core/src/test/java/io/grpc/internal/ServerImplTest.java b/core/src/test/java/io/grpc/internal/ServerImplTest.java
index ce9a16f..458d18d 100644
--- a/core/src/test/java/io/grpc/internal/ServerImplTest.java
+++ b/core/src/test/java/io/grpc/internal/ServerImplTest.java
@@ -78,7 +78,7 @@
import io.grpc.StringMarshaller;
import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener;
import io.grpc.internal.ServerImplBuilder.ClientTransportServersBuilder;
-import io.grpc.internal.testing.SingleMessageProducer;
+import io.grpc.internal.SingleMessageProducer;
import io.grpc.internal.testing.TestServerStreamTracer;
import io.grpc.util.MutableHandlerRegistry;
import io.perfmark.PerfMark;
diff --git a/testing/src/main/java/io/grpc/internal/testing/AbstractClientTransportFactoryTest.java b/core/src/testFixtures/java/io/grpc/internal/AbstractClientTransportFactoryTest.java
similarity index 95%
rename from testing/src/main/java/io/grpc/internal/testing/AbstractClientTransportFactoryTest.java
rename to core/src/testFixtures/java/io/grpc/internal/AbstractClientTransportFactoryTest.java
index b84ffbd..8e6f00f 100644
--- a/testing/src/main/java/io/grpc/internal/testing/AbstractClientTransportFactoryTest.java
+++ b/core/src/testFixtures/java/io/grpc/internal/AbstractClientTransportFactoryTest.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package io.grpc.internal.testing;
+package io.grpc.internal;
import io.grpc.ChannelLogger;
-import io.grpc.internal.ClientTransportFactory;
import java.net.InetSocketAddress;
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/testing/src/main/java/io/grpc/internal/testing/SingleMessageProducer.java b/core/src/testFixtures/java/io/grpc/internal/SingleMessageProducer.java
similarity index 92%
rename from testing/src/main/java/io/grpc/internal/testing/SingleMessageProducer.java
rename to core/src/testFixtures/java/io/grpc/internal/SingleMessageProducer.java
index c621e50..8f89ed1 100644
--- a/testing/src/main/java/io/grpc/internal/testing/SingleMessageProducer.java
+++ b/core/src/testFixtures/java/io/grpc/internal/SingleMessageProducer.java
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package io.grpc.internal.testing;
+package io.grpc.internal;
-import io.grpc.internal.StreamListener;
import java.io.InputStream;
import javax.annotation.Nullable;
diff --git a/netty/src/test/java/io/grpc/netty/NettyClientTransportFactoryTest.java b/netty/src/test/java/io/grpc/netty/NettyClientTransportFactoryTest.java
index d512271..621afd9 100644
--- a/netty/src/test/java/io/grpc/netty/NettyClientTransportFactoryTest.java
+++ b/netty/src/test/java/io/grpc/netty/NettyClientTransportFactoryTest.java
@@ -16,8 +16,8 @@
package io.grpc.netty;
+import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory;
-import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportFactoryTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportFactoryTest.java
index dbd1023..dea9917 100644
--- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportFactoryTest.java
+++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportFactoryTest.java
@@ -16,8 +16,8 @@
package io.grpc.okhttp;
+import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory;
-import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
