fix ut

Author: guohao

contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/FallbackResolverTest.java

@@ -7,7 +7,6 @@
 
 package com.salesforce.grpc.contrib;
 
-import io.grpc.Attributes;
 import io.grpc.NameResolver;
 import io.grpc.NameResolverProvider;
 import org.junit.Test;
@@ -18,6 +17,8 @@
 
 @SuppressWarnings("ALL")
 public class FallbackResolverTest {
+
+    private final NameResolverFakes fakes = new NameResolverFakes();
     @Test
     public void firstShouldFind() throws Exception {
         NameResolver fakeResolver = new FakeResolver();
@@ -26,7 +27,7 @@ public void firstShouldFind() throws Exception {
 
         NameResolver.Factory factory = FallbackResolver.startWith(canResolve).thenCheck(cannotResolve);
 
-        assertEquals(fakeResolver, factory.newNameResolver(new URI("aaa://foo"), Attributes.EMPTY));
+        assertEquals(fakeResolver, factory.newNameResolver(new URI("aaa://foo"), fakes.fakeArgs));
     }
 
     @Test
@@ -37,7 +38,7 @@ public void secondShouldFind() throws Exception {
 
         NameResolver.Factory factory = FallbackResolver.startWith(cannotResolve).thenCheck(canResolve);
 
-        assertEquals(fakeResolver, factory.newNameResolver(new URI("bbb://foo"), Attributes.EMPTY));
+        assertEquals(fakeResolver, factory.newNameResolver(new URI("bbb://foo"), fakes.fakeArgs));
     }
 
     @Test
@@ -46,7 +47,7 @@ public void neitherShouldFind() throws Exception {
 
         NameResolver.Factory factory = FallbackResolver.startWith(cannotResolve).thenCheck(cannotResolve);
 
-        assertNull(factory.newNameResolver(new URI("bbb://foo"), Attributes.EMPTY));
+        assertNull(factory.newNameResolver(new URI("bbb://foo"), fakes.fakeArgs));
     }
 
     @Test

contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/NameResolverFakes.java

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2019, Salesforce.com, Inc.
+ *  All rights reserved.
+ *  Licensed under the BSD 3-Clause license.
+ *  For full license text, see LICENSE.txt file in the repo root  or https://opensource.org/licenses/BSD-3-Clause
+ */
+
+package com.salesforce.grpc.contrib;
+
+import io.grpc.NameResolver;
+import io.grpc.SynchronizationContext;
+import io.grpc.internal.GrpcUtil;
+
+import java.util.Map;
+
+public class NameResolverFakes {
+    final SynchronizationContext fakeSyncContext = new SynchronizationContext(new Thread.UncaughtExceptionHandler() {
+        @Override
+        public void uncaughtException(Thread t, Throwable e) {
+            e.printStackTrace();
+        }
+    });
+    final NameResolver.ServiceConfigParser fakeParser =new NameResolver.ServiceConfigParser() {
+        @Override
+        public NameResolver.ConfigOrError parseServiceConfig(Map<String, ?> rawServiceConfig) {
+            return NameResolver.ConfigOrError.fromConfig(new Object());
+        }
+    };
+
+    final NameResolver.Args fakeArgs = NameResolver.Args.newBuilder()
+            .setDefaultPort(GrpcUtil.DEFAULT_PORT_PLAINTEXT)
+            .setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR)
+            .setSynchronizationContext(fakeSyncContext)
+            .setServiceConfigParser(fakeParser)
+            .build();
+}

contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/StaticResolverProviderTest.java

@@ -20,28 +20,31 @@
 import static org.junit.Assert.*;
 
 public class StaticResolverProviderTest {
+
+    private final NameResolverFakes fakes = new NameResolverFakes();
+
     private final InetSocketAddress staticAddress = new InetSocketAddress("localhost", 55555);
 
     @Test
     public void ProviderShouldProvide() {
         NameResolverProvider provider = StaticResolver.provider(staticAddress);
-        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
+        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
 
         assertThat(resolver).isNotNull();
     }
 
     @Test
     public void ResolverShouldHaveCorrectAuthority() {
         NameResolverProvider provider = StaticResolver.provider(staticAddress);
-        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
+        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
 
         assertThat(resolver.getServiceAuthority()).isEqualTo("some.service");
     }
 
     @Test
     public void ResolverShouldResolve() {
         NameResolverProvider provider = StaticResolver.provider(staticAddress);
-        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), Attributes.EMPTY);
+        NameResolver resolver = provider.newNameResolver(URI.create("mesh://some.service"), fakes.fakeArgs);
 
         AtomicBoolean isResolved = new AtomicBoolean();
 

contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/context/AmbientContextEnforcerTest.java

@@ -12,6 +12,7 @@
 import com.salesforce.grpc.contrib.HelloResponse;
 import com.salesforce.grpc.contrib.Statuses;
 import io.grpc.*;
+import io.grpc.Status.Code;
 import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcServerRule;
 import org.assertj.core.api.Condition;
@@ -114,7 +115,7 @@ public void serverEnforcerFailsMissing() {
                 .has(new Condition<Throwable>() {
                     @Override
                     public boolean matches(Throwable throwable) {
-                        return Statuses.hasStatusCode(throwable, Status.Code.FAILED_PRECONDITION);
+                        return Statuses.hasStatusCode(throwable, Code.FAILED_PRECONDITION);
                     }
                 });
     }
@@ -141,7 +142,7 @@ public void serverEnforcerFailsIncomplete() {
                     .has(new Condition<Throwable>() {
                         @Override
                         public boolean matches(Throwable throwable) {
-                            return Statuses.hasStatusCode(throwable, Status.Code.FAILED_PRECONDITION);
+                            return Statuses.hasStatusCode(throwable, Code.FAILED_PRECONDITION);
                         }
                     });
         });

contrib/grpc-contrib/src/test/java/com/salesforce/grpc/contrib/context/AmbientContextTransferTest.java

@@ -17,16 +17,15 @@
 import io.grpc.ServerInterceptors;
 import io.grpc.stub.StreamObserver;
 import io.grpc.testing.GrpcServerRule;
-import org.awaitility.Duration;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.time.Duration;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
 import static org.awaitility.Awaitility.await;
 
 public class AmbientContextTransferTest {
@@ -191,7 +190,7 @@ public void sayHello(HelloRequest request, StreamObserver<HelloResponse> respons
                     response -> assertThat(AmbientContext.current().get(ctxKey)).isEqualTo(expectedCtxValue),
                     Context.currentContextExecutor(Executors.newSingleThreadExecutor()));
 
-            await().atMost(Duration.ONE_SECOND).until(futureResponse::isDone);
+            await().atMost(Duration.ofSeconds(1)).until(futureResponse::isDone);
         });
 
         assertThat(ctxValue.get()).isEqualTo(expectedCtxValue);

contrib/pom.xml

@@ -239,7 +239,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M7</version>
                 <configuration>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                    <argLine>-Xmx1024m</argLine>
                 </configuration>
             </plugin>
 

jprotoc/pom.xml

@@ -195,7 +195,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M7</version>
                 <configuration>
-                    <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+                    <argLine>-Xmx1024m</argLine>
                 </configuration>
             </plugin>