(camel-quarkus) branch main updated: Make HazelcastInstanceTest wait and verify new cluster member is shutdown

[jamesnetherton]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new c7e592f4bd Make HazelcastInstanceTest wait and verify new cluster 
member is shutdown
c7e592f4bd is described below

commit c7e592f4bd6a9ee97d70d87878c9e820ef8a3ecf
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Nov 24 10:43:29 2023 +0000

    Make HazelcastInstanceTest wait and verify new cluster member is shutdown
    
    Fixes #4989
    Fixes #5081
---
 .../component/hazelcast/it/HazelcastInstanceTest.java      | 14 +++++++++++---
 .../quarkus/component/hazelcast/it/HazelcastListTest.java  |  2 --
 .../component/hazelcast/it/HazelcastTestResource.java      | 12 +++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceTest.java
 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceTest.java
index 1385e674b9..dab61d881c 100644
--- 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceTest.java
+++ 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastInstanceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.hazelcast.it;
 
 import java.util.concurrent.TimeUnit;
 
+import com.hazelcast.core.HazelcastInstance;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
@@ -33,8 +34,15 @@ public class HazelcastInstanceTest {
 
     @Test
     public void testInstance() {
-        HazelcastTestResource.addMemberToCluster();
-        await().atMost(10L, TimeUnit.SECONDS)
-                .until(() -> 
RestAssured.get("/added").then().extract().body().asString().equals("1"));
+        HazelcastInstance newMember = 
HazelcastTestResource.addMemberToCluster();
+        try {
+            await().atMost(10L, TimeUnit.SECONDS)
+                    .until(() -> 
RestAssured.get("/added").then().extract().body().asString().equals("1"));
+        } finally {
+            newMember.shutdown();
+
+            await().atMost(10L, TimeUnit.SECONDS)
+                    .until(() -> 
RestAssured.get("/deleted").then().extract().body().asString().equals("1"));
+        }
     }
 }
diff --git 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastListTest.java
 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastListTest.java
index 66a8b57e5f..a5e4c60e3f 100644
--- 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastListTest.java
+++ 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastListTest.java
@@ -25,7 +25,6 @@ import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import static io.restassured.RestAssured.given;
@@ -37,7 +36,6 @@ import static org.hamcrest.Matchers.equalTo;
 @QuarkusTestResource(HazelcastTestResource.class)
 public class HazelcastListTest {
 
-    @Disabled("https://github.com/apache/camel-quarkus/issues/4989";)
     @SuppressWarnings("unchecked")
     @Test
     public void testList() {
diff --git 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTestResource.java
 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTestResource.java
index c73c9d952e..9e6257599f 100644
--- 
a/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTestResource.java
+++ 
b/integration-tests/hazelcast/src/test/java/org/apache/camel/quarkus/component/hazelcast/it/HazelcastTestResource.java
@@ -24,11 +24,10 @@ import 
io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
 
 public class HazelcastTestResource implements 
QuarkusTestResourceLifecycleManager {
     private volatile HazelcastInstance member;
-    private static volatile HazelcastInstance member2;
 
     @Override
     public Map<String, String> start() {
-        member = Hazelcast.newHazelcastInstance();
+        member = addMemberToCluster();
         return null;
     }
 
@@ -37,17 +36,12 @@ public class HazelcastTestResource implements 
QuarkusTestResourceLifecycleManage
         if (member != null) {
             member.shutdown();
         }
-
-        if (member2 != null) {
-            member.shutdown();
-        }
     }
 
     /**
      * this is used to test new instance in the same cluster
      */
-    public static void addMemberToCluster() {
-        member2 = Hazelcast.newHazelcastInstance();
+    public static HazelcastInstance addMemberToCluster() {
+        return Hazelcast.newHazelcastInstance();
     }
-
 }