port java samples to junit5

samples/java-protobuf-customer-registry-kafka-quickstart/src/test/java/customer/action/CustomerStateSubscriptionActionTest.java

@@ -5,8 +5,8 @@
 import customer.action.CustomerStateSubscriptionAction;
 import customer.action.CustomerStateSubscriptionActionTestKit;
 import customer.domain.CustomerDomain;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-customer-registry-kafka-quickstart/src/test/java/customer/domain/CustomerTest.java

@@ -12,10 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.jdk.javaapi.CollectionConverters;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CustomerTest {
 

samples/java-protobuf-customer-registry-quickstart/src/it/java/customer/api/CustomerIntegrationTest.java

@@ -5,11 +5,11 @@
 import customer.Main;
 import customer.api.CustomerApi;
 import customer.api.CustomerService;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 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.
 //
@@ -23,7 +23,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());
 

samples/java-protobuf-customer-registry-quickstart/src/test/java/customer/domain/CustomerTest.java

@@ -12,10 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.jdk.javaapi.CollectionConverters;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CustomerTest {
 

samples/java-protobuf-customer-registry-views-quickstart/src/it/java/customer/api/CustomerIntegrationTest.java

@@ -5,11 +5,11 @@
 import customer.Main;
 import customer.api.CustomerApi;
 import customer.api.CustomerService;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 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.
 //
@@ -23,7 +23,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());
 

samples/java-protobuf-customer-registry-views-quickstart/src/it/java/customer/view/CustomerByEmailIntegrationTest.java

@@ -8,14 +8,14 @@
 import customer.Main;
 import customer.api.CustomerApi;
 import customer.api.CustomerService;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.util.UUID;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -24,7 +24,7 @@ public class CustomerByEmailIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
           new KalixTestKitResource(Main.createKalix());
 

samples/java-protobuf-customer-registry-views-quickstart/src/it/java/customer/view/CustomerByNameIntegrationTest.java

@@ -9,8 +9,8 @@
 import customer.Main;
 import customer.api.CustomerApi;
 import customer.api.CustomerService;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -19,7 +19,7 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -28,7 +28,7 @@ public class CustomerByNameIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
           new KalixTestKitResource(Main.createKalix());
 

samples/java-protobuf-customer-registry-views-quickstart/src/test/java/customer/domain/CustomerTest.java

@@ -12,10 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.jdk.javaapi.CollectionConverters;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CustomerTest {
 

samples/java-protobuf-doc-snippets/src/it/java/com/example/JwtIntegrationTest.java

@@ -8,16 +8,16 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import kalix.javasdk.Metadata;
 import kalix.javasdk.testkit.junit.KalixTestKitResource;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.util.Base64;
 import java.util.Map;
 import java.util.concurrent.CompletionStage;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -26,7 +26,7 @@ public class JwtIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
       new KalixTestKitResource(Main.createKalix());
 

samples/java-protobuf-doc-snippets/src/test/java/com/example/json/MyServiceActionTest.java

@@ -7,8 +7,8 @@
 import com.example.json.MyServiceApi;
 import com.google.protobuf.Any;
 import com.google.protobuf.Empty;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class MyServiceActionTest {
 

samples/java-protobuf-eventsourced-counter/src/it/java/com/example/CounterIntegrationTest.java

@@ -10,13 +10,13 @@
 import com.example.CounterApi;
 import com.example.CounterService;
 import com.example.Main;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.CompletionStage;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -25,7 +25,7 @@ public class CounterIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
       new KalixTestKitResource(Main.createKalix());
 

samples/java-protobuf-eventsourced-counter/src/it/java/com/example/CounterTopicIntegrationTest.java

@@ -13,13 +13,13 @@
 // ...
 // end::test-topic[]
 import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.net.URI;
 import java.time.Duration;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -30,7 +30,7 @@ public class CounterTopicIntegrationTest {
   /**
    * 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
           // end::test-topic[]

samples/java-protobuf-eventsourced-counter/src/test/java/com/example/actions/CounterCommandFromTopicActionTest.java

@@ -7,8 +7,8 @@
 import com.google.protobuf.Empty;
 import kalix.javasdk.testkit.ActionResult;
 import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-eventsourced-counter/src/test/java/com/example/actions/CounterJournalToTopicActionTest.java

@@ -12,8 +12,8 @@
 import com.example.domain.CounterDomain;
 import com.google.protobuf.Any;
 import com.google.protobuf.Empty;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 
 public class CounterJournalToTopicActionTest {

samples/java-protobuf-eventsourced-counter/src/test/java/com/example/actions/CounterJournalToTopicWithMetaActionTest.java

@@ -7,8 +7,8 @@
 import com.example.domain.CounterDomain;
 import kalix.javasdk.testkit.ActionResult;
 import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-eventsourced-counter/src/test/java/com/example/actions/CounterTopicSubscriptionActionTest.java

@@ -7,8 +7,8 @@
 import com.google.protobuf.Empty;
 import kalix.javasdk.testkit.ActionResult;
 import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-eventsourced-counter/src/test/java/com/example/domain/CounterTest.java

@@ -9,9 +9,9 @@
 import kalix.javasdk.testkit.DeferredCallDetails;
 import com.example.CounterApi;
 import com.google.protobuf.Empty;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CounterTest {
 

samples/java-protobuf-eventsourced-customer-registry-subscriber/src/test/java/customer/action/CustomerActionImplTest.java

@@ -1,7 +1,7 @@
 package customer.action;
 
 import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-eventsourced-customer-registry/src/it/java/customer/api/CustomerEntityIntegrationTest.java

@@ -4,8 +4,8 @@
 import com.google.protobuf.Empty;
 import customer.Main;
 import customer.domain.CustomerDomain;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import static java.util.concurrent.TimeUnit.*;
 
@@ -21,7 +21,7 @@ public class CustomerEntityIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
     new KalixTestKitResource(Main.createKalix());
 

samples/java-protobuf-eventsourced-customer-registry/src/test/java/customer/api/CustomerEventsServiceActionTest.java

@@ -7,8 +7,8 @@
 import customer.domain.CustomerDomain;
 import kalix.javasdk.testkit.ActionResult;
 import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 
 // This class was initially generated based on the .proto definition by Kalix tooling.
 //

samples/java-protobuf-eventsourced-customer-registry/src/test/java/customer/domain/CustomerEntityTest.java

@@ -24,10 +24,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import scala.jdk.javaapi.CollectionConverters;
 
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class CustomerEntityTest {
 

samples/java-protobuf-eventsourced-shopping-cart/src/it/java/com/example/shoppingcart/ShoppingCartIntegrationTest.java

@@ -19,12 +19,12 @@
 import kalix.javasdk.testkit.junit.KalixTestKitResource;
 // ...
 // end::sample-it-test[]
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 // Example of an integration test calling our service via the Kalix proxy
 // Run all test classes ending with "IntegrationTest" using `mvn verify -Pit`
@@ -35,7 +35,7 @@ public class ShoppingCartIntegrationTest {
   /**
    * The test kit starts both the service container and the Kalix proxy.
    */
-  @ClassRule
+  @RegisterExtension
   public static final KalixTestKitResource testKit =
       new KalixTestKitResource(Main.createKalix()); // <1>
 

samples/java-protobuf-eventsourced-shopping-cart/src/test/java/com/example/shoppingcart/domain/ShoppingCartTest.java

@@ -3,12 +3,12 @@
 import kalix.javasdk.testkit.EventSourcedResult;
 import com.example.shoppingcart.ShoppingCartApi;
 import com.google.protobuf.Empty;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.NoSuchElementException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ShoppingCartTest {