Integrated services case

danilo-ambrosio · danilo-ambrosio · commit c78791cf05ba · 2021-09-15T07:02:30.000-03:00
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/Project.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/Project.java
@@ -30,6 +30,7 @@ public class Project {
   public final GenerationPath generationPath;
   public final GenerationSettingsData generationSettings;
   private static List<Project> all =  new ArrayList<>();
+  private boolean stopped;
 
   public static Project from(final String directory,
                              final String modelFilename) {
@@ -73,14 +74,18 @@ private String resolveGenerationPath(final String model) {
   }
 
   public static void stopAll(final Logger logger, final PortDriver portDriver) {
-    all.forEach(project -> {
-      if(!portDriver.release(project.appPort)) {
-        logger.warn("Unable to release port " + project.appPort);
+    all.forEach(project -> project.stop(logger, portDriver));
+  }
+
+  private void stop(final Logger logger, final PortDriver portDriver) {
+    if(!stopped) {
+      if (!portDriver.release(appPort)) {
+        logger.warn("Unable to release port " + appPort);
       } else {
-        logger.info("Port " + project.appPort + " released");
+        this.stopped = true;
+        logger.info("Port " + appPort + " released");
       }
-    });
-    all.clear();
+    }
   }
 
   public String toString() {
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/ProjectGenerationTest.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/ProjectGenerationTest.java
@@ -101,7 +101,8 @@ public static void clear() throws Exception {
     Infrastructure.clear();
     ComponentRegistry.clear();
     Profile.disableTestProfile();
-    XoomInitializer.instance().stopServer();
+    XoomInitializer.instance().stopServer().await();
+    XoomInitializer.instance().terminateWorld();
   }
 
   public static void onShutdown() {
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/ComponentData.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/ComponentData.java
@@ -1,4 +1,4 @@
-package io.vlingo.xoom.designer.codegen.e2e.java.integratedservices;
+package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/FreighterPartData.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/FreighterPartData.java
@@ -1,4 +1,4 @@
-package io.vlingo.xoom.designer.codegen.e2e.java.integratedservices;
+package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/IntegratedServicesGenerationTest.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/IntegratedServicesGenerationTest.java
@@ -4,7 +4,7 @@
 // Mozilla Public License, v. 2.0. If a copy of the MPL
 // was not distributed with this file, You can obtain
 // one at https://mozilla.org/MPL/2.0/.
-package io.vlingo.xoom.designer.codegen.e2e.java.integratedservices;
+package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
 import io.vlingo.xoom.designer.codegen.e2e.Project;
 import io.vlingo.xoom.designer.codegen.e2e.java.JavaProjectGenerationTest;
diff --git a/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/MechanicalIncidentData.java b/src/test/java/io/vlingo/xoom/designer/codegen/e2e/java/cargoshippingservices/MechanicalIncidentData.java
@@ -1,4 +1,4 @@
-package io.vlingo.xoom.designer.codegen.e2e.java.integratedservices;
+package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;
 
 import org.apache.commons.lang3.builder.EqualsBuilder;
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,8 @@ public static void clear() throws Exception {`
`101`	`101`	`Infrastructure.clear();`
`102`	`102`	`ComponentRegistry.clear();`
`103`	`103`	`Profile.disableTestProfile();`
`104`		`- XoomInitializer.instance().stopServer();`
	`104`	`+ XoomInitializer.instance().stopServer().await();`
	`105`	`+ XoomInitializer.instance().terminateWorld();`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`public static void onShutdown() {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.vlingo.xoom.designer.codegen.e2e.java.integratedservices;`
	`1`	`+package io.vlingo.xoom.designer.codegen.e2e.java.cargoshippingservices;`
`2`	`2`
`3`	`3`	`import org.apache.commons.lang3.builder.EqualsBuilder;`
`4`	`4`	`import org.apache.commons.lang3.builder.HashCodeBuilder;`