From db96219be1ed6a996ed3a4cd8812446166118c06 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 22 May 2024 14:50:26 -0700 Subject: [PATCH] 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. --- core/build.gradle | 1 - .../io/grpc/internal/ManagedChannelImplBuilderTest.java | 5 +++-- .../internal/ManagedChannelImplGetNameResolverTest.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 22c68b2114..f8a95c3728 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -32,7 +32,6 @@ dependencies { libraries.truth, project(':grpc-testing') testImplementation testFixtures(project(':grpc-api')), - project(':grpc-inprocess'), project(':grpc-testing') testImplementation libraries.guava.testlib diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java index d6ae0a532b..ce446bbabc 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplBuilderTest.java @@ -46,7 +46,6 @@ import io.grpc.MetricSink; import io.grpc.NameResolver; import io.grpc.NameResolverRegistry; import io.grpc.StaticTestingClassLoader; -import io.grpc.inprocess.InProcessSocketAddress; import io.grpc.internal.ManagedChannelImplBuilder.ChannelBuilderDefaultPortProvider; import io.grpc.internal.ManagedChannelImplBuilder.ClientTransportFactoryBuilder; import io.grpc.internal.ManagedChannelImplBuilder.FixedPortProvider; @@ -367,7 +366,7 @@ public class ManagedChannelImplBuilderTest { when(mockClientTransportFactoryBuilder.buildClientTransportFactory()) .thenReturn(mockClientTransportFactory); when(mockClientTransportFactory.getSupportedSocketAddressTypes()) - .thenReturn(Collections.singleton(InProcessSocketAddress.class)); + .thenReturn(Collections.singleton(CustomSocketAddress.class)); builder = new ManagedChannelImplBuilder(DUMMY_AUTHORITY_VALID, mockClientTransportFactoryBuilder, new FixedPortProvider(DUMMY_PORT)); @@ -782,4 +781,6 @@ public class ManagedChannelImplBuilderTest { assertFalse(uriPattern.matcher("a,:/").matches()); // ',' not matched assertFalse(uriPattern.matcher(" a:/").matches()); // space not matched } + + private static class CustomSocketAddress extends SocketAddress {} } diff --git a/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java b/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java index 98300bc82f..a0bd388b1b 100644 --- a/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java +++ b/core/src/test/java/io/grpc/internal/ManagedChannelImplGetNameResolverTest.java @@ -22,8 +22,8 @@ import static org.junit.Assert.fail; import io.grpc.NameResolver; import io.grpc.NameResolverProvider; import io.grpc.NameResolverRegistry; -import io.grpc.inprocess.InProcessSocketAddress; import java.net.InetSocketAddress; +import java.net.SocketAddress; import java.net.URI; import java.util.Collections; import org.junit.Test; @@ -110,7 +110,7 @@ public class ManagedChannelImplGetNameResolverTest { try { ManagedChannelImplBuilder.getNameResolverProvider( "testscheme:///foo.googleapis.com:8080", nameResolverRegistry, - Collections.singleton(InProcessSocketAddress.class)); + Collections.singleton(CustomSocketAddress.class)); fail("Should fail"); } catch (IllegalArgumentException e) { assertThat(e).hasMessageThat().isEqualTo( @@ -196,4 +196,6 @@ public class ManagedChannelImplGetNameResolverTest { @Override public void shutdown() {} } + + private static class CustomSocketAddress extends SocketAddress {} }