adapt quickstart sample

lightbend · Nov 21, 2023 · 5862de3 · 5862de3
1 parent 9f4c566
commit 5862de3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 24 deletions.
diff --git a/samples/java-protobuf-customer-registry-kafka-quickstart/pom.xml b/samples/java-protobuf-customer-registry-kafka-quickstart/pom.xml
@@ -284,9 +284,21 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.2</version>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.10.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter</artifactId>
+      <version>5.10.1 </version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.10.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...mer-registry-kafka-quickstart/src/it/java/customer/api/CustomerActionIntegrationTest.java b/...mer-registry-kafka-quickstart/src/it/java/customer/api/CustomerActionIntegrationTest.java
@@ -5,8 +5,8 @@
 import kalix.javasdk.testkit.EventingTestKit;
 import kalix.javasdk.testkit.KalixTestKit;
 import kalix.javasdk.testkit.junit.KalixTestKitResource;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
@@ -16,7 +16,7 @@
 import java.util.concurrent.TimeoutException;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //
@@ -30,10 +30,11 @@ public class CustomerActionIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
       new KalixTestKitResource(Main.createKalix(), KalixTestKit.Settings.DEFAULT.withTopicOutgoingMessages("customer_changes"));
 
+
   /**
    * Use the generated gRPC client to call the service through the Kalix proxy.
    */
@@ -70,7 +71,7 @@ public void createAndPublish() throws Exception {
         .get(5, SECONDS);
 
     // wait for action to publish the change of state
-    var nameChangeMsgOut = outTopic.expectOneTyped(CustomerApi.Customer.class);
+    var nameChangeMsgOut = outTopic.expectOneTyped(CustomerApi.Customer.class, Duration.of(10, ChronoUnit.SECONDS));
     assertEquals(completeName, nameChangeMsgOut.getPayload().getName());
 
     outTopic.expectNone(); // no more messages are sent

diff --git a/...try-kafka-quickstart/src/it/java/customer/api/CustomerActionWithKafkaIntegrationTest.java b/...try-kafka-quickstart/src/it/java/customer/api/CustomerActionWithKafkaIntegrationTest.java
@@ -10,19 +10,19 @@
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.apache.kafka.common.serialization.ByteArrayDeserializer;
 import org.apache.kafka.common.serialization.StringDeserializer;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
 
 import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.Collections;
+import java.util.Properties;
+import java.util.UUID;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 import static java.time.Duration.ofSeconds;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.testcontainers.shaded.org.awaitility.Awaitility.await;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
@@ -38,7 +38,7 @@ public class CustomerActionWithKafkaIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit;
   static KalixTestKit.Settings settings;
 
@@ -48,6 +48,7 @@ public class CustomerActionWithKafkaIntegrationTest {
         settings);
   }
 
+
   /**
    * Use the generated gRPC client to call the service through the Kalix proxy.
    */

diff --git a/...-customer-registry-kafka-quickstart/src/it/java/customer/api/CustomerIntegrationTest.java b/...-customer-registry-kafka-quickstart/src/it/java/customer/api/CustomerIntegrationTest.java
@@ -1,16 +1,14 @@
 package customer.api;
 
-import java.util.UUID;
-
-import kalix.javasdk.testkit.junit.KalixTestKitResource;
 import customer.Main;
-import customer.api.CustomerApi;
-import customer.api.CustomerService;
-import org.junit.ClassRule;
-import org.junit.Test;
+import kalix.javasdk.testkit.junit.KalixTestKitResource;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import java.util.UUID;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //
@@ -24,7 +22,7 @@ public class CustomerIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
       new KalixTestKitResource(Main.createKalix());