don't use TLS in tests

lagom · Nov 27, 2020 · fea27b6 · fea27b6
1 parent 58e55e5
commit fea27b6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 92 deletions.
diff --git a/...e/grpc-example-java/hello-impl/src/test/java/com/example/hello/impl/HelloServiceTest.java b/...e/grpc-example-java/hello-impl/src/test/java/com/example/hello/impl/HelloServiceTest.java
@@ -2,7 +2,7 @@
 
 import akka.grpc.GrpcClientSettings;
 import com.example.hello.api.HelloService;
-import com.lightbend.lagom.javadsl.testkit.grpc.AkkaGrpcClientHelpers;
+import com.lightbend.lagom.javadsl.testkit.ServiceTest;
 import example.myapp.helloworld.grpc.GreeterServiceClient;
 import example.myapp.helloworld.grpc.HelloReply;
 import example.myapp.helloworld.grpc.HelloRequest;
@@ -28,20 +28,16 @@ public void shouldSayHelloUsingALagomClient() throws Exception {
 
     @Test
     public void shouldSayHelloUsingGrpc() throws Exception {
-        withServer(defaultSetup().withSsl(), server -> {
-            AkkaGrpcClientHelpers
-                .withGrpcClient(
-                    server,
-                    GreeterServiceClient::create,
-                    serviceClient -> {
-                        HelloRequest request =
-                            HelloRequest.newBuilder().setName("Steve").build();
-                        HelloReply reply = serviceClient
-                            .sayHello(request)
-                            .toCompletableFuture()
-                            .get(5, SECONDS);
-                        assertEquals("Hi Steve (gRPC)", reply.getMessage());
-                    });
+        withServer(defaultSetup(), server -> {
+            GreeterServiceClient serviceClient = createServiceClient(server);
+
+            HelloRequest request =
+                    HelloRequest.newBuilder().setName("Steve").build();
+            HelloReply reply = serviceClient
+                    .sayHello(request)
+                    .toCompletableFuture()
+                    .get(5, SECONDS);
+            assertEquals("Hi Steve (gRPC)", reply.getMessage());
         });
     }
 
@@ -51,11 +47,7 @@ public void shouldSayHelloUsingGrpc() throws Exception {
     @Test
     public void shouldSayHelloUsingGrpcNoSsl() throws Exception {
         withServer(defaultSetup(), server -> {
-            GrpcClientSettings settings = GrpcClientSettings
-                    .connectToServiceAt("127.0.0.1", server.port(), server.system())
-                    .withTls(false);
-            GreeterServiceClient serviceClient = GreeterServiceClient.create(settings, server.system());
-
+            GreeterServiceClient serviceClient = createServiceClient(server);
             HelloRequest request =
                     HelloRequest.newBuilder().setName("Steve").build();
             HelloReply reply = serviceClient
@@ -66,4 +58,10 @@ public void shouldSayHelloUsingGrpcNoSsl() throws Exception {
         });
     }
 
+    private GreeterServiceClient createServiceClient(ServiceTest.TestServer server) {
+        GrpcClientSettings settings = GrpcClientSettings
+                .connectToServiceAt("127.0.0.1", server.port(), server.system())
+                .withTls(false);
+        return GreeterServiceClient.create(settings, server.system());
+    }
 }
diff --git a/...hello-proxy-impl/src/test/java/com/example/helloproxy/impl/HelloProxyServiceImplTest.java b/...hello-proxy-impl/src/test/java/com/example/helloproxy/impl/HelloProxyServiceImplTest.java
@@ -32,8 +32,6 @@ public class HelloProxyServiceImplTest {
     @BeforeClass
     public static void setUp() {
         ServiceTest.Setup setup = defaultSetup()
-            .withCluster(false)
-            .withSsl(false)
             .configureBuilder(builder ->
                 builder
                     .disable(AkkaGrpcClientModule.class)

diff --git a/...xample-scala/hello-impl/src/test/scala/com/example/hello/impl/HelloServiceNoSslSpec.scala b/...xample-scala/hello-impl/src/test/scala/com/example/hello/impl/HelloServiceNoSslSpec.scala
diff --git a/...rpc-example-scala/hello-impl/src/test/scala/com/example/hello/impl/HelloServiceSpec.scala b/...rpc-example-scala/hello-impl/src/test/scala/com/example/hello/impl/HelloServiceSpec.scala
@@ -1,30 +1,35 @@
 package com.example.hello.impl
 
 import akka.actor.ActorSystem
+import akka.grpc.GrpcClientSettings
 import com.example.hello.api._
 import com.lightbend.lagom.scaladsl.server.LocalServiceLocator
 import com.lightbend.lagom.scaladsl.testkit.ServiceTest
 import com.lightbend.lagom.scaladsl.testkit.grpc.AkkaGrpcClientHelpers
-import example.myapp.helloworld.grpc.{ GreeterServiceClient, HelloRequest }
+import example.myapp.helloworld.grpc.{GreeterServiceClient, HelloRequest}
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AsyncWordSpec
 
 class HelloServiceSpec extends AsyncWordSpec with Matchers with BeforeAndAfterAll {
 
-  private val server: ServiceTest.TestServer[HelloApplication with LocalServiceLocator] = ServiceTest.startServer(
-    ServiceTest.defaultSetup.withSsl(true)
-  ) { ctx =>
-    new HelloApplication(ctx) with LocalServiceLocator
-  }
+  private val server: ServiceTest.TestServer[HelloApplication with LocalServiceLocator] = 
+    ServiceTest.startServer(ServiceTest.defaultSetup) { ctx =>
+      new HelloApplication(ctx) with LocalServiceLocator
+    }
 
   implicit val sys: ActorSystem = server.actorSystem
 
   val client: HelloService = server.serviceClient.implement[HelloService]
-  val grpcClient: GreeterServiceClient = AkkaGrpcClientHelpers.grpcClient(
-    server,
-    GreeterServiceClient.apply,
-  )
+  val grpcClient: GreeterServiceClient = {
+    val httpPort = server.playServer.httpPort.get
+
+    val settings = GrpcClientSettings
+      .connectToServiceAt("127.0.0.1", httpPort)(server.actorSystem)
+      .withTls(false)
+
+    GreeterServiceClient(settings)
+  }
 
 
   override protected def afterAll(): Unit = {