make default test parameters unique

wildfly-extras · Apr 19, 2023 · 7be4aa2 · 7be4aa2
1 parent 79c6293
commit 7be4aa2
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 41 deletions.
diff --git a/aws-wildfly/src/test/java/aws/cloudformation/AwsTestConstants.java b/aws-wildfly/src/test/java/aws/cloudformation/AwsTestConstants.java
@@ -5,7 +5,7 @@ public class AwsTestConstants {
     public static final String TAG = "sunstoneKeyTag";
     public static final String NAME_1 = "sunstoneKeyName1";
     public static final String NAME_2 = "sunstoneKeyName2";
-    public static final String instanceName = "${non.existing:eapSunstoneInjectInstance}";
+    public static final String instanceName = "${test.instance.name:eapSunstoneInjectInstance}";
     // must be same as in MP Config
     public static final String region = "${ec2.region:us-east-1}";
     public static final String mgmtUser = "${non.existing:admin}";

diff --git a/aws/src/test/java/aws/cloudformation/AwsTestConstants.java b/aws/src/test/java/aws/cloudformation/AwsTestConstants.java
@@ -5,7 +5,7 @@ public class AwsTestConstants {
     public static final String TAG = "sunstoneKeyTag";
     public static final String NAME_1 = "sunstoneKeyName1";
     public static final String NAME_2 = "sunstoneKeyName2";
-    public static final String instanceName = "${non.existing:eapSunstoneInjectInstance}";
+    public static final String instanceName = "${test.instance.name:eapSunstoneInjectInstance}";
     // must be same as in MP Config
     public static final String region = "${ec2.region:us-east-1}";
     public static final String mgmtUser = "${non.existing:admin}";

diff --git a/aws/src/test/java/aws/cloudformation/di/suitetests/AwsHostnameTests.java b/aws/src/test/java/aws/cloudformation/di/suitetests/AwsHostnameTests.java
@@ -50,4 +50,4 @@ public void resourceCreated() {
         assertThat(hostname.get()).isNotBlank();
         assertThat(hostnameWithRegion.get()).isNotBlank();
     }
-}
+}
diff --git a/aws/src/test/resources/sunstone.properties b/aws/src/test/resources/sunstone.properties
@@ -1,3 +1,3 @@
 sunstone.aws.accessKeyID=${aws.accessKeyID}
 sunstone.aws.secretAccessKey=${aws.secretAccessKey}
-sunstone.aws.region=${aws.region:us-east-1}
+sunstone.aws.region=${aws.region:us-east-1}
diff --git a/azure-wildfly/src/test/java/sunstone/azure/armTemplates/AzureTestConstants.java b/azure-wildfly/src/test/java/sunstone/azure/armTemplates/AzureTestConstants.java
@@ -8,7 +8,9 @@ public class AzureTestConstants {
     public static final String VNET_NAME_2 = "sunstoneVnet2";
 
     public static final String IMAGE_REF = "${image.ref:/subscriptions/7dee6f21-9f05-414e-99fa-08d3215fb420/resourceGroups/istraka-test/providers/Microsoft.Compute/images/eap-test-image}";
-    public static final String instanceName = "${non.existing:eapSunstoneInjectInstance}";
+    public static final String instanceName = "${test.instance.name:eapSunstoneInjectInstance}";
+
+    public static final String deployGroup = "${azure.group:sunstoneDeployGroup}";
 
     public static final String mgmtUser = "${non.existing:admin}";
     public static final String mgmtPassword = "${non.existing:pass.1234}";

diff --git a/...ildfly/src/test/java/sunstone/azure/armTemplates/archiveDeploy/vm/VmDeploySuiteTests.java b/...ildfly/src/test/java/sunstone/azure/armTemplates/archiveDeploy/vm/VmDeploySuiteTests.java
@@ -13,5 +13,4 @@
 @Suite
 @SelectClasses({AzureVmDeployFirstTest.class, AzureVmUndeployedSecondTest.class})
 public class VmDeploySuiteTests {
-    public static final String vmDeployGroup = "deploytestVM";
 }
diff --git a/.../java/sunstone/azure/armTemplates/archiveDeploy/vm/suitetests/AzureVmDeployFirstTest.java b/.../java/sunstone/azure/armTemplates/archiveDeploy/vm/suitetests/AzureVmDeployFirstTest.java
@@ -18,23 +18,23 @@
 
 import java.io.IOException;
 
-import static sunstone.azure.armTemplates.archiveDeploy.vm.VmDeploySuiteTests.vmDeployGroup;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 @WithAzureArmTemplate(parameters = {
         @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
         @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
 },
-        template = "sunstone/azure/armTemplates/eap.json", group = vmDeployGroup, perSuite = true)
+        template = "sunstone/azure/armTemplates/eap.json", group = deployGroup, perSuite = true)
 public class AzureVmDeployFirstTest {
 
     @Deployment(name = "testapp.war")
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     static WebArchive deploy() {
         return ShrinkWrap.create(WebArchive.class)
                 .addAsWebResource(new StringAsset("Hello World"), "index.jsp");
     }
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     Hostname hostname;
 
     @Test

diff --git a/.../sunstone/azure/armTemplates/archiveDeploy/vm/suitetests/AzureVmUndeployedSecondTest.java b/.../sunstone/azure/armTemplates/archiveDeploy/vm/suitetests/AzureVmUndeployedSecondTest.java
@@ -2,7 +2,6 @@
 
 
 import sunstone.azure.armTemplates.AzureTestConstants;
-import sunstone.azure.armTemplates.archiveDeploy.vm.VmDeploySuiteTests;
 import sunstone.azure.annotation.AzureVirtualMachine;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -14,6 +13,7 @@
 import sunstone.annotation.inject.Hostname;
 
 import java.io.IOException;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 /**
  * The test is supposed to run after AzureWebAppDeployFirstTest and verifies undeploy operation
@@ -22,9 +22,9 @@
         @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
         @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
 },
-        template = "sunstone/azure/armTemplates/eap.json", group = VmDeploySuiteTests.vmDeployGroup, perSuite = true)
+        template = "sunstone/azure/armTemplates/eap.json", group = deployGroup, perSuite = true)
 public class AzureVmUndeployedSecondTest {
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = VmDeploySuiteTests.vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     Hostname hostname;
 
     @Test

diff --git a/...est/java/sunstone/azure/armTemplates/archiveDeploy/vmDomain/VmDomainDeploySuiteTests.java b/...est/java/sunstone/azure/armTemplates/archiveDeploy/vmDomain/VmDomainDeploySuiteTests.java
@@ -13,5 +13,4 @@
 @Suite
 @SelectClasses({AzureDomainVmDeployFirstTest.class, AzureDomainVmUndeployedSecondTest.class})
 public class VmDomainDeploySuiteTests {
-    public static final String vmDeployGroup = "deploytestVM";
 }
diff --git a/...ne/azure/armTemplates/archiveDeploy/vmDomain/suitetests/AzureDomainVmDeployFirstTest.java b/...ne/azure/armTemplates/archiveDeploy/vmDomain/suitetests/AzureDomainVmDeployFirstTest.java
@@ -18,24 +18,24 @@
 import sunstone.azure.annotation.AzureVirtualMachine;
 import sunstone.azure.annotation.WithAzureArmTemplate;
 import sunstone.azure.armTemplates.AzureTestConstants;
-import static sunstone.azure.armTemplates.archiveDeploy.vm.VmDeploySuiteTests.vmDeployGroup;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 @WithAzureArmTemplate(parameters = {
         @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
         @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
 },
-        template = "sunstone/azure/armTemplates/eapDomain.json", group = vmDeployGroup, perSuite = true)
+        template = "sunstone/azure/armTemplates/eapDomain.json", group = deployGroup, perSuite = true)
 public class AzureDomainVmDeployFirstTest {
 
     @Deployment(name = "testapp.war")
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     @WildFly(mode = OperatingMode.DOMAIN)
     static WebArchive deploy() {
         return ShrinkWrap.create(WebArchive.class)
                 .addAsWebResource(new StringAsset("Hello World"), "index.jsp");
     }
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     @WildFly(mode = OperatingMode.DOMAIN)
     Hostname hostname;
 

diff --git a/...ure/armTemplates/archiveDeploy/vmDomain/suitetests/AzureDomainVmUndeployedSecondTest.java b/...ure/armTemplates/archiveDeploy/vmDomain/suitetests/AzureDomainVmUndeployedSecondTest.java
@@ -13,7 +13,7 @@
 import sunstone.azure.annotation.AzureVirtualMachine;
 import sunstone.azure.annotation.WithAzureArmTemplate;
 import sunstone.azure.armTemplates.AzureTestConstants;
-import sunstone.azure.armTemplates.archiveDeploy.vmDomain.VmDomainDeploySuiteTests;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 /**
  * The test is supposed to run after AzureWebAppDeployFirstTest and verifies undeploy operation
@@ -22,9 +22,9 @@
         @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
         @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
 },
-        template = "sunstone/azure/armTemplates/eapDomain.json", group = VmDomainDeploySuiteTests.vmDeployGroup, perSuite = true)
+        template = "sunstone/azure/armTemplates/eapDomain.json", group = deployGroup, perSuite = true)
 public class AzureDomainVmUndeployedSecondTest {
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = VmDomainDeploySuiteTests.vmDeployGroup)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = deployGroup)
     @WildFly(mode = OperatingMode.DOMAIN)
     Hostname hostname;
 

diff --git a/...rc/test/java/sunstone/azure/armTemplates/archiveDeploy/webapp/WebAppDeploySuiteTests.java b/...rc/test/java/sunstone/azure/armTemplates/archiveDeploy/webapp/WebAppDeploySuiteTests.java
@@ -14,5 +14,4 @@
 @Suite
 @SelectClasses({AzureWebAppDeployFirstTest.class, AzureWebAppUndeployedSecondTest.class})
 public class WebAppDeploySuiteTests {
-    public static final String webAppDeployGroup = "deploytestWebApp";
 }
diff --git a/...nstone/azure/armTemplates/archiveDeploy/webapp/suitetests/AzureWebAppDeployFirstTest.java b/...nstone/azure/armTemplates/archiveDeploy/webapp/suitetests/AzureWebAppDeployFirstTest.java
@@ -2,7 +2,6 @@
 
 
 import sunstone.azure.armTemplates.AzureTestConstants;
-import sunstone.azure.armTemplates.archiveDeploy.webapp.WebAppDeploySuiteTests;
 import sunstone.azure.annotation.AzureWebApplication;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -18,18 +17,19 @@
 import sunstone.annotation.inject.Hostname;
 
 import java.io.IOException;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 @WithAzureArmTemplate(template = "sunstone/azure/armTemplates/eapWebApp.json",
-        parameters = {@Parameter(k = "appName", v = AzureTestConstants.instanceName)}, group = WebAppDeploySuiteTests.webAppDeployGroup, perSuite = true)
+        parameters = {@Parameter(k = "appName", v = AzureTestConstants.instanceName)}, group = deployGroup, perSuite = true)
 public class AzureWebAppDeployFirstTest {
     @Deployment
-    @AzureWebApplication(name = AzureTestConstants.instanceName, group = WebAppDeploySuiteTests.webAppDeployGroup)
+    @AzureWebApplication(name = AzureTestConstants.instanceName, group = deployGroup)
     static WebArchive deploy() {
         return ShrinkWrap.create(WebArchive.class)
                 .addAsWebResource(new StringAsset("Hello World"), "index.jsp");
     }
 
-    @AzureWebApplication(name = AzureTestConstants.instanceName, group = WebAppDeploySuiteTests.webAppDeployGroup)
+    @AzureWebApplication(name = AzureTestConstants.instanceName, group = deployGroup)
     Hostname hostname;
 
     @Test

diff --git a/...e/azure/armTemplates/archiveDeploy/webapp/suitetests/AzureWebAppUndeployedSecondTest.java b/...e/azure/armTemplates/archiveDeploy/webapp/suitetests/AzureWebAppUndeployedSecondTest.java
@@ -2,7 +2,6 @@
 
 
 import sunstone.azure.armTemplates.AzureTestConstants;
-import sunstone.azure.armTemplates.archiveDeploy.webapp.WebAppDeploySuiteTests;
 import sunstone.azure.annotation.AzureWebApplication;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -14,15 +13,16 @@
 import sunstone.annotation.inject.Hostname;
 
 import java.io.IOException;
+import static sunstone.azure.armTemplates.AzureTestConstants.deployGroup;
 
 /**
  * The test is supposed to run after AzureWebAppDeployFirstTest and verifies undeploy operation
  */
 @WithAzureArmTemplate(template = "sunstone/azure/armTemplates/eapWebApp.json",
-        parameters = {@Parameter(k = "appName", v = AzureTestConstants.instanceName)}, group = WebAppDeploySuiteTests.webAppDeployGroup, perSuite = true)
+        parameters = {@Parameter(k = "appName", v = AzureTestConstants.instanceName)}, group = deployGroup, perSuite = true)
 public class AzureWebAppUndeployedSecondTest {
 
-    @AzureWebApplication(name = AzureTestConstants.instanceName, group = WebAppDeploySuiteTests.webAppDeployGroup)
+    @AzureWebApplication(name = AzureTestConstants.instanceName, group = deployGroup)
     Hostname hostname;
 
     @Test

diff --git a/...e-wildfly/src/test/java/sunstone/azure/armTemplates/di/AzDomainManagementClientTests.java b/...e-wildfly/src/test/java/sunstone/azure/armTemplates/di/AzDomainManagementClientTests.java
@@ -19,24 +19,21 @@
             @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
             @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
         },
-        template = "sunstone/azure/armTemplates/eapDomain.json", group = AzDomainManagementClientTests.group, perSuite = true)
+        template = "sunstone/azure/armTemplates/eapDomain.json", group = AzureTestConstants.deployGroup, perSuite = true)
 public class AzDomainManagementClientTests {
-
-    public static final String group = "${azure.group:sunstone-testing-group}";
-
     @AzureVirtualMachine(name = AzureTestConstants.instanceName)
     @WildFly(mode = OperatingMode.DOMAIN)
     static OnlineManagementClient staticMgmtClient;
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzDomainManagementClientTests.group)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzureTestConstants.deployGroup)
     @WildFly(mode = OperatingMode.DOMAIN, domain = @DomainMode(user = AzureTestConstants.mgmtUser, password = AzureTestConstants.mgmtPassword, port = AzureTestConstants.mgmtPort, host = AzureTestConstants.mgmtHost, profile = AzureTestConstants.mgmtProfile))
     static OnlineManagementClient staticMgmtClientSpecified;
 
     @AzureVirtualMachine(name = AzureTestConstants.instanceName)
     @WildFly(mode = OperatingMode.DOMAIN)
     OnlineManagementClient mgmtClient;
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzDomainManagementClientTests.group)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzureTestConstants.deployGroup)
     @WildFly(mode = OperatingMode.DOMAIN, domain = @DomainMode(user = AzureTestConstants.mgmtUser, password = AzureTestConstants.mgmtPassword, port = AzureTestConstants.mgmtPort, host = AzureTestConstants.mgmtHost, profile = AzureTestConstants.mgmtProfile))
     OnlineManagementClient mgmtClientSpecified;
 

diff --git a/...ldfly/src/test/java/sunstone/azure/armTemplates/di/AzStandaloneManagementClientTests.java b/...ldfly/src/test/java/sunstone/azure/armTemplates/di/AzStandaloneManagementClientTests.java
@@ -22,21 +22,19 @@
         @Parameter(k = "virtualMachineName", v = AzureTestConstants.instanceName),
         @Parameter(k = "imageRefId", v = AzureTestConstants.IMAGE_REF)
 },
-        template = "sunstone/azure/armTemplates/eap.json", group = AzStandaloneManagementClientTests.group, perSuite = true)
+        template = "sunstone/azure/armTemplates/eap.json", group = AzureTestConstants.deployGroup, perSuite = true)
 public class AzStandaloneManagementClientTests {
-    public static final String group = "${azure.group:sunstone-testing-group}";
-
     @AzureVirtualMachine(name = AzureTestConstants.instanceName)
     static OnlineManagementClient staticMgmtClient;
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzStandaloneManagementClientTests.group)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzureTestConstants.deployGroup)
     @WildFly(mode = OperatingMode.STANDALONE, standalone = @StandaloneMode(user = AzureTestConstants.mgmtUser, password = AzureTestConstants.mgmtPassword, port = AzureTestConstants.mgmtPort))
     static OnlineManagementClient staticMgmtClientSpecified;
 
     @AzureVirtualMachine(name = AzureTestConstants.instanceName)
     OnlineManagementClient mgmtClient;
 
-    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzStandaloneManagementClientTests.group)
+    @AzureVirtualMachine(name = AzureTestConstants.instanceName, group = AzureTestConstants.deployGroup)
     @WildFly(mode = OperatingMode.STANDALONE, standalone = @StandaloneMode(user = AzureTestConstants.mgmtUser, password = AzureTestConstants.mgmtPassword, port = AzureTestConstants.mgmtPort))
     OnlineManagementClient mgmtClientSpecified;
 

diff --git a/azure/src/test/java/sunstone/azure/armTemplates/AzureTestConstants.java b/azure/src/test/java/sunstone/azure/armTemplates/AzureTestConstants.java
@@ -8,7 +8,7 @@ public class AzureTestConstants {
     public static final String VNET_NAME_2 = "sunstoneVnet2";
 
     public static final String IMAGE_REF = "${image.ref:/subscriptions/7dee6f21-9f05-414e-99fa-08d3215fb420/resourceGroups/istraka-test/providers/Microsoft.Compute/images/eap-test-image}";
-    public static final String instanceName = "${non.existing:eapSunstoneInjectInstance}";
+    public static final String instanceName = "${test.instance.name:eapSunstoneInjectInstance}";
 
     public static final String mgmtUser = "${non.existing:admin}";
     public static final String mgmtPassword = "${non.existing:pass.1234}";

diff --git a/pom.xml b/pom.xml
@@ -96,6 +96,13 @@
 
         <version.smallrye-config>2.13.3</version.smallrye-config>
         <version.annotation-api>1.3.2</version.annotation-api>
+
+
+        <!-- to guarantee test instance Name uniqueness, supports: https://github.com/wildfly-extras/sunstone/issues/154 -->
+        <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+        <test.instance.name>eapSunstoneInjectInstance-${timestamp}</test.instance.name>
+        <azure.group>sunstoneDeployGroup-${timestamp}</azure.group>
     </properties>
 
     <build>
@@ -115,6 +122,8 @@
                         <failIfNoTests>false</failIfNoTests>
                         <systemPropertyVariables>
                             <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
+                            <test.instance.name>${test.instance.name}</test.instance.name>
+                            <azure.group>${azure.group}</azure.group>
                         </systemPropertyVariables>
 
                         <testFailureIgnore>false</testFailureIgnore>