fix: Override default test Hazelcast network configuration (#259)

* fix: add Hazelcast configuration * fix: enable log level INFO * fix: revert hazecastConfig updates * fix: add argLine -Xmx2048m -XX:MaxPermSize=256m for maven-failsafe-plugin * fix: update mafen-failsafe configuration * fix: update DirtiesContext for tests * fix: update hazelcast network config * fix: add config per hazelcast instance * fix: refactor hazelcast instance destroy * fix: add prototype scope to Hz config * fix: use tcp config to form Hazelcast cluster * fix: clean up test config * fix: clean up changes * Revert "fix: update mafen-failsafe configuration" This reverts commit 4b923f8. * Revert "fix: add argLine -Xmx2048m -XX:MaxPermSize=256m for maven-failsafe-plugin " This reverts commit 87678e4. * Update HazelcastMessageStoreIT.java * Use constant to define the bean scope Co-authored-by: Elias Ricken de Medeiros <26007058+erdemedeiros@users.noreply.github.com>
Activiti · Dec 31, 2020 · 7830049 · 7830049
1 parent 03959d9
commit 7830049
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 13 deletions.
diff --git a/...java/org/activiti/cloud/services/messages/tests/AbstractMessagesCoreIntegrationTests.java b/...java/org/activiti/cloud/services/messages/tests/AbstractMessagesCoreIntegrationTests.java
@@ -36,7 +36,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import org.activiti.api.process.model.builders.MessageEventPayloadBuilder;
 import org.activiti.api.process.model.events.BPMNMessageEvent.MessageEvents;
 import org.activiti.api.process.model.events.MessageDefinitionEvent.MessageDefinitionEvents;
@@ -73,6 +72,7 @@
 import org.springframework.transaction.PlatformTransactionManager;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 

diff --git a/...org/activiti/cloud/starter/messages/hazelcast/HazelcastMessageStoreAutoConfiguration.java b/...org/activiti/cloud/starter/messages/hazelcast/HazelcastMessageStoreAutoConfiguration.java
@@ -46,8 +46,7 @@ public Config hazelcastConfig() {
         Config config = new Config();
 
         config.getCPSubsystemConfig()
-              .setCPMemberCount(3)
-              .setGroupSize(3);
+              .setCPMemberCount(3);
 
         return config;
     }

diff --git a/...test/java/org/activiti/cloud/starter/messages/test/hazelcast/HazelcastMessageStoreIT.java b/...test/java/org/activiti/cloud/starter/messages/test/hazelcast/HazelcastMessageStoreIT.java
@@ -18,17 +18,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.activiti.cloud.services.messages.tests.AbstractMessagesCoreIntegrationTests;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Scope;
 import org.springframework.integration.hazelcast.store.HazelcastMessageStore;
 
 import com.hazelcast.config.Config;
+import com.hazelcast.config.JoinConfig;
+import com.hazelcast.config.NetworkConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.instance.HazelcastInstanceFactory;
 
 public class HazelcastMessageStoreIT extends AbstractMessagesCoreIntegrationTests {
 
@@ -41,27 +43,55 @@ static class MessagesApplication {
     static class HazelcastConfiguration {
 
         @Bean
+        @Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
+        public Config hazelcastConfig() {
+            Config config = new Config();
+
+            config.getCPSubsystemConfig()
+                  .setCPMemberCount(3);
+
+            NetworkConfig network = config.getNetworkConfig()
+                                          .setPortAutoIncrement(true);
+            network.setPort(5701)
+                   .setPortCount(20);
+
+            JoinConfig join = network.getJoin();
+
+            join.getMulticastConfig()
+                .setEnabled(false);
+
+            join.getTcpIpConfig()
+                .setEnabled(true)
+                .addMember("localhost");
+
+            return config;
+        }
+
+        @Bean(destroyMethod = "shutdown")
         public HazelcastInstance hazelcastInstance(Config hazelcastConfig) {
+            hazelcastConfig.getNetworkConfig()
+                           .setPublicAddress("localhost:5701");
+
             return Hazelcast.newHazelcastInstance(hazelcastConfig);
         }
 
-        @Bean
+        @Bean(destroyMethod = "shutdown")
         public HazelcastInstance hazelcastInstance2(Config hazelcastConfig) {
+            hazelcastConfig.getNetworkConfig()
+                           .setPublicAddress("localhost:5702");
+
             return Hazelcast.newHazelcastInstance(hazelcastConfig);
         }
 
-        @Bean
+        @Bean(destroyMethod = "shutdown")
         public HazelcastInstance hazelcastInstance3(Config hazelcastConfig) {
+            hazelcastConfig.getNetworkConfig()
+                           .setPublicAddress("localhost:5703");
+
             return Hazelcast.newHazelcastInstance(hazelcastConfig);
         }
     }
 
-    @AfterAll
-    public static void afterAll() {
-        HazelcastInstanceFactory.terminateAll();
-    }
-
-
     @Test
     public void testMessageStore() throws Exception {
         assertThat(this.aggregatingMessageHandler.getMessageStore()).isInstanceOf(HazelcastMessageStore.class);