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.
This commit is contained in:
Eric Anderson 2023-05-07 14:43:19 -07:00
parent 3b2cba09c1
commit cb42405217
9 changed files with 9 additions and 11 deletions

View File

@ -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;

View File

@ -61,7 +61,7 @@ import io.grpc.MethodDescriptor.MethodType;
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;

View File

@ -42,7 +42,7 @@ import io.grpc.DecompressorRegistry;
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;

View File

@ -47,7 +47,7 @@ import io.grpc.SecurityLevel;
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;

View File

@ -78,7 +78,7 @@ import io.grpc.Status.Code;
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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;