Make integration tests more robust

oracle · May 6, 2024 · fb08554 · fb08554
1 parent 21cd896
commit fb08554
Show file tree

Hide file tree

Showing 25 changed files with 202 additions and 45 deletions.
diff --git a/...s/src/test/java/com/oracle/coherence/examples/sockshop/spring/carts/CartMetricsTests.java b/...s/src/test/java/com/oracle/coherence/examples/sockshop/spring/carts/CartMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -40,6 +40,10 @@
 @SpringBootTest(
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1",
 				"management.tracing.sampling.probability=1.0",
 				"coherence.metrics.http.enabled=true"
 		}

diff --git a/...java/com/oracle/coherence/examples/sockshop/spring/carts/controller/CartControllerIT.java b/...java/com/oracle/coherence/examples/sockshop/spring/carts/controller/CartControllerIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -27,7 +27,14 @@
 /**
  * Integration tests for {@link CartRepository}.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 public class CartControllerIT {
 
     protected CartRepository carts;

diff --git a/...a/com/oracle/coherence/examples/sockshop/spring/carts/repository/CartResourceAsyncIT.java b/...a/com/oracle/coherence/examples/sockshop/spring/carts/repository/CartResourceAsyncIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -15,7 +15,14 @@
 /**
  * Integration tests for {@link CartControllerAsync}.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 public class CartResourceAsyncIT extends CartControllerIT {
 
     protected String getBasePath() {

diff --git a/...e/coherence/examples/sockshop/spring/carts/repository/CoherenceCartRepositoryAsyncIT.java b/...e/coherence/examples/sockshop/spring/carts/repository/CoherenceCartRepositoryAsyncIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -13,7 +13,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 class CoherenceCartRepositoryAsyncIT extends CartRepositoryTest {
 
     /**

diff --git a/...oracle/coherence/examples/sockshop/spring/carts/repository/CoherenceCartRepositoryIT.java b/...oracle/coherence/examples/sockshop/spring/carts/repository/CoherenceCartRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -13,7 +13,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 class CoherenceCartRepositoryIT extends CartRepositoryTest {
 
     /**

diff --git a/.../test/java/com/oracle/coherence/examples/sockshop/spring/catalog/CatalogMetricsTests.java b/.../test/java/com/oracle/coherence/examples/sockshop/spring/catalog/CatalogMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -42,7 +42,11 @@
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
 				"management.tracing.sampling.probability=1.0",
-				"coherence.metrics.http.enabled=true"
+				"coherence.metrics.http.enabled=true",
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1"
 		}
 )
 @AutoConfigureObservability

diff --git a/...rc/test/java/com/oracle/coherence/examples/sockshop/spring/catalog/CatalogResourceIT.java b/...rc/test/java/com/oracle/coherence/examples/sockshop/spring/catalog/CatalogResourceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024 Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -22,7 +22,14 @@
 /**
  * Integration tests for {@link CatalogController}.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 public class CatalogResourceIT {
 
     @LocalServerPort

diff --git a/...a/com/oracle/coherence/examples/sockshop/spring/catalog/CoherenceCatalogRepositoryIT.java b/...a/com/oracle/coherence/examples/sockshop/spring/catalog/CoherenceCatalogRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -12,7 +12,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 class CoherenceCatalogRepositoryIT extends CatalogRepositoryTest {
 
     @BeforeAll

diff --git a/...java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderRepositoryIT.java b/...java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -21,7 +21,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 @DirtiesContext
 class CoherenceOrderRepositoryIT {
     @Autowired

diff --git a/...t/java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderResourceIT.java b/...t/java/com/oracle/coherence/examples/sockshop/spring/orders/CoherenceOrderResourceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -37,7 +37,14 @@
  * Integration tests for {@link OrderController},
  * using Coherence for persistence.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 @DirtiesContext
 public class CoherenceOrderResourceIT {
 

diff --git a/...rc/test/java/com/oracle/coherence/examples/sockshop/spring/orders/OrdersMetricsTests.java b/...rc/test/java/com/oracle/coherence/examples/sockshop/spring/orders/OrdersMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -45,6 +45,10 @@
 				"management.tracing.sampling.probability=1.0",
 				"coherence.metrics.http.enabled=true",
 				"management.endpoints.web.exposure.include=*",
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1"
 		}
 )
 @AutoConfigureObservability

diff --git a/.../test/java/com/oracle/coherence/examples/sockshop/spring/payment/PaymentMetricsTests.java b/.../test/java/com/oracle/coherence/examples/sockshop/spring/payment/PaymentMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -40,6 +40,10 @@
 @SpringBootTest(
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1",
 				"management.tracing.sampling.probability=1.0",
 				"coherence.metrics.http.enabled=true"
 		}

diff --git a/...cle/coherence/examples/sockshop/spring/payment/controller/CoherencePaymentResourceIT.java b/...cle/coherence/examples/sockshop/spring/payment/controller/CoherencePaymentResourceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -12,6 +12,13 @@
  * Integration tests for {@link PaymentController},
  * using Coherence for persistence.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+		properties = {
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1"
+		}
+)
 public class CoherencePaymentResourceIT extends PaymentResourceIT {
 }
diff --git a/...a/com/oracle/coherence/examples/sockshop/spring/payment/controller/PaymentResourceIT.java b/...a/com/oracle/coherence/examples/sockshop/spring/payment/controller/PaymentResourceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -31,7 +31,14 @@
 /**
  * Integration tests for {@link PaymentController}.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 public class PaymentResourceIT {
 
     @LocalServerPort

diff --git a/...e/coherence/examples/sockshop/spring/payment/repository/CoherencePaymentRepositoryIT.java b/...e/coherence/examples/sockshop/spring/payment/repository/CoherencePaymentRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -13,7 +13,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 class CoherencePaymentRepositoryIT extends PaymentRepositoryTest {
 	@Autowired
     TestPaymentRepository testPaymentRepository;

diff --git a/...com/oracle/coherence/examples/sockshop/spring/shipping/CoherenceShipmentRepositoryIT.java b/...com/oracle/coherence/examples/sockshop/spring/shipping/CoherenceShipmentRepositoryIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -13,7 +13,14 @@
 /**
  * Tests for Coherence repository implementation.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 class CoherenceShipmentRepositoryIT extends ShipmentRepositoryTest {
 	@Autowired
     TestShipmentRepository shipmentRepository;

diff --git a/...est/java/com/oracle/coherence/examples/sockshop/spring/shipping/ShippingMetricsTests.java b/...est/java/com/oracle/coherence/examples/sockshop/spring/shipping/ShippingMetricsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -41,6 +41,10 @@
 @SpringBootTest(
 		webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
 		properties = {
+				"coherence.localhost=127.0.0.1",
+				"coherence.ttl=0",
+				"java.net.preferIPv4Stack=true",
+				"coherence.wka=127.0.0.1",
 				"management.tracing.sampling.probability=1.0",
 				"coherence.metrics.http.enabled=true"
 		}

diff --git a/.../test/java/com/oracle/coherence/examples/sockshop/spring/shipping/ShippingResourceIT.java b/.../test/java/com/oracle/coherence/examples/sockshop/spring/shipping/ShippingResourceIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2021, 2024, Oracle and/or its affiliates.
  *
  * Licensed under the Universal Permissive License v 1.0 as shown at
  * https://oss.oracle.com/licenses/upl.
@@ -29,7 +29,14 @@
 /**
  * Integration tests for {@link ShippingController}.
  */
-@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
+        properties = {
+                "coherence.localhost=127.0.0.1",
+                "coherence.ttl=0",
+                "java.net.preferIPv4Stack=true",
+                "coherence.wka=127.0.0.1"
+        }
+)
 public class ShippingResourceIT {
 
     @LocalServerPort