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

core: Remove direct test dependency on inprocess 

An inprocess class was just being abused. Note that grpc-testing depends
on inprocess, so there is still an indirect dependency on inprocess
present.
This commit is contained in:
Eric Anderson 2024-05-22 14:50:26 -07:00 committed by GitHub
parent 58bab7434a
commit db96219be1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/build.gradle
View File

@ -32,7 +32,6 @@ dependencies {
libraries.truth, libraries.truth,
project(':grpc-testing') project(':grpc-testing')
testImplementation testFixtures(project(':grpc-api')), testImplementation testFixtures(project(':grpc-api')),
project(':grpc-inprocess'),
project(':grpc-testing') project(':grpc-testing')
testImplementation libraries.guava.testlib testImplementation libraries.guava.testlib

5
core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java
View File

@ -46,7 +46,6 @@ import io.grpc.MetricSink;
import io.grpc.NameResolver; import io.grpc.NameResolver;
import io.grpc.NameResolverRegistry; import io.grpc.NameResolverRegistry;
import io.grpc.StaticTestingClassLoader; import io.grpc.StaticTestingClassLoader;
import io.grpc.inprocess.InProcessSocketAddress;
import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider; import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider;
import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder; import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder;
import io.grpc.internal.ManagedChannelImplBuilder.FixedPortProvider; import io.grpc.internal.ManagedChannelImplBuilder.FixedPortProvider;
@ -367,7 +366,7 @@ public class ManagedChannelImplBuilderTest {
when(mockClientTransportFactoryBuilder.buildClientTransportFactory()) when(mockClientTransportFactoryBuilder.buildClientTransportFactory())
.thenReturn(mockClientTransportFactory); .thenReturn(mockClientTransportFactory);
when(mockClientTransportFactory.getSupportedSocketAddressTypes()) when(mockClientTransportFactory.getSupportedSocketAddressTypes())
.thenReturn(Collections.singleton(InProcessSocketAddress.class)); .thenReturn(Collections.singleton(CustomSocketAddress.class));
builder = new ManagedChannelImplBuilder(DUMMY_AUTHORITY_VALID, builder = new ManagedChannelImplBuilder(DUMMY_AUTHORITY_VALID,
mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT)); mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT));
@ -782,4 +781,6 @@ public class ManagedChannelImplBuilderTest {
assertFalse(uriPattern.matcher("a,:/").matches()); // ',' not matched assertFalse(uriPattern.matcher("a,:/").matches()); // ',' not matched
assertFalse(uriPattern.matcher(" a:/").matches()); // space not matched assertFalse(uriPattern.matcher(" a:/").matches()); // space not matched
} }
private static class CustomSocketAddress extends SocketAddress {}
} }

6
core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java
View File

@ -22,8 +22,8 @@ import static org.junit.Assert.fail;
import io.grpc.NameResolver; import io.grpc.NameResolver;
import io.grpc.NameResolverProvider; import io.grpc.NameResolverProvider;
import io.grpc.NameResolverRegistry; import io.grpc.NameResolverRegistry;
import io.grpc.inprocess.InProcessSocketAddress;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.net.URI; import java.net.URI;
import java.util.Collections; import java.util.Collections;
import org.junit.Test; import org.junit.Test;
@ -110,7 +110,7 @@ public class ManagedChannelImplGetNameResolverTest {
try { try {
ManagedChannelImplBuilder.getNameResolverProvider( ManagedChannelImplBuilder.getNameResolverProvider(
"testscheme:///foo.googleapis.com:8080", nameResolverRegistry, "testscheme:///foo.googleapis.com:8080", nameResolverRegistry,
Collections.singleton(InProcessSocketAddress.class)); Collections.singleton(CustomSocketAddress.class));
fail("Should fail"); fail("Should fail");
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
assertThat(e).hasMessageThat().isEqualTo( assertThat(e).hasMessageThat().isEqualTo(
@ -196,4 +196,6 @@ public class ManagedChannelImplGetNameResolverTest {
@Override public void shutdown() {} @Override public void shutdown() {}
} }
private static class CustomSocketAddress extends SocketAddress {}
} }