flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/test/java/io/grpc/inprocess/InProcessClientTransportFactoryTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.inprocess; package io.grpc.inprocess;
import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory; import io.grpc.internal.ClientTransportFactory;
import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;

2
core/src/test/java/io/grpc/internal/ClientCallImplTest.java
View File

@ -61,7 +61,7 @@ import io.grpc.MethodDescriptor.MethodType;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.ClientCallImpl.ClientStreamProvider; import io.grpc.internal.ClientCallImpl.ClientStreamProvider;
import io.grpc.internal.ManagedChannelServiceConfig.MethodInfo; import io.grpc.internal.ManagedChannelServiceConfig.MethodInfo;
import io.grpc.internal.testing.SingleMessageProducer; import io.grpc.internal.SingleMessageProducer;
import io.grpc.testing.TestMethodDescriptors; import io.grpc.testing.TestMethodDescriptors;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.IOException; import java.io.IOException;

2
core/src/test/java/io/grpc/internal/DelayedStreamTest.java
View File

@ -42,7 +42,7 @@ import io.grpc.DecompressorRegistry;
import io.grpc.Metadata; import io.grpc.Metadata;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.ClientStreamListener.RpcProgress; import io.grpc.internal.ClientStreamListener.RpcProgress;
import io.grpc.internal.testing.SingleMessageProducer; import io.grpc.internal.SingleMessageProducer;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

2
core/src/test/java/io/grpc/internal/ServerCallImplTest.java
View File

@ -47,7 +47,7 @@ import io.grpc.SecurityLevel;
import io.grpc.ServerCall; import io.grpc.ServerCall;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.internal.ServerCallImpl.ServerStreamListenerImpl; import io.grpc.internal.ServerCallImpl.ServerStreamListenerImpl;
import io.grpc.internal.testing.SingleMessageProducer; import io.grpc.internal.SingleMessageProducer;
import io.perfmark.PerfMark; import io.perfmark.PerfMark;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.InputStream; import java.io.InputStream;

2
core/src/test/java/io/grpc/internal/ServerImplTest.java
View File

@ -78,7 +78,7 @@ import io.grpc.Status.Code;
import io.grpc.StringMarshaller; import io.grpc.StringMarshaller;
import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener; import io.grpc.internal.ServerImpl.JumpToApplicationThreadServerStreamListener;
import io.grpc.internal.ServerImplBuilder.ClientTransportServersBuilder; 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.internal.testing.TestServerStreamTracer;
import io.grpc.util.MutableHandlerRegistry; import io.grpc.util.MutableHandlerRegistry;
import io.perfmark.PerfMark; import io.perfmark.PerfMark;

3
testing/src/main/java/io/grpc/internal/testing/AbstractClientTransportFactoryTest.java → core/src/testFixtures/java/io/grpc/internal/AbstractClientTransportFactoryTest.java
View File

@ -14,10 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package io.grpc.internal.testing; package io.grpc.internal;
import io.grpc.ChannelLogger; import io.grpc.ChannelLogger;
import io.grpc.internal.ClientTransportFactory;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;

3
testing/src/main/java/io/grpc/internal/testing/SingleMessageProducer.java → core/src/testFixtures/java/io/grpc/internal/SingleMessageProducer.java
View File

@ -14,9 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
package io.grpc.internal.testing; package io.grpc.internal;
import io.grpc.internal.StreamListener;
import java.io.InputStream; import java.io.InputStream;
import javax.annotation.Nullable; import javax.annotation.Nullable;

2
netty/src/test/java/io/grpc/netty/NettyClientTransportFactoryTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.netty; package io.grpc.netty;
import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory; import io.grpc.internal.ClientTransportFactory;
import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;

2
okhttp/src/test/java/io/grpc/okhttp/OkHttpClientTransportFactoryTest.java
View File

@ -16,8 +16,8 @@
package io.grpc.okhttp; package io.grpc.okhttp;
import io.grpc.internal.AbstractClientTransportFactoryTest;
import io.grpc.internal.ClientTransportFactory; import io.grpc.internal.ClientTransportFactory;
import io.grpc.internal.testing.AbstractClientTransportFactoryTest;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.JUnit4; import org.junit.runners.JUnit4;