[issues-207] - Fix WildflyDeploymentApplicationConfiguration, which i…

…s building Maven additional args wrongly in generateAdditionalMavenArgs
Intersmash · Nov 25, 2024 · 2e1f196 · 2e1f196
1 parent c160b26
commit 2e1f196
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java b/...java/org/jboss/intersmash/test/deployments/WildflyDeploymentApplicationConfiguration.java
@@ -101,13 +101,22 @@ default String bomsEeServerVersionPropertyName() {
 		return WILDFLY_BOMS_EE_SERVER_VERSION;
 	}
 
+	/**
+	 * This must match the property name in the pom.xml file used to set the "wildfly-galleon-pack" feature pack GAV
+	 *
+	 * @return property name in the pom.xml file used to set the feature pack GAV
+	 */
+	default String featurePackLocationPropertyName() {
+		return WILDFLY_FEATURE_PACK_LOCATION;
+	}
+
 	/**
 	 * This must match the property name in the pom.xml file used to set the "wildfly-ee-galleon-pack" feature pack GAV
 	 *
 	 * @return property name in the pom.xml file used to set the feature pack GAV
 	 */
 	default String eeFeaturePackLocationPropertyName() {
-		return WILDFLY_FEATURE_PACK_LOCATION;
+		return WILDFLY_EE_FEATURE_PACK_LOCATION;
 	}
 
 	/**
@@ -206,7 +215,7 @@ default String generateAdditionalMavenArgs() {
 				: (" -D" + this.eeFeaturePackLocationPropertyName() + "="
 						+ this.eeFeaturePackLocation())))
 				+ ((Strings.isNullOrEmpty(this.featurePackLocation()) ? ""
-						: (" -D" + this.featurePackLocation() + "="
+						: (" -D" + this.featurePackLocationPropertyName() + "="
 								+ this.featurePackLocation())))
 				+ ((Strings.isNullOrEmpty(this.cloudFeaturePackLocation()) ? ""
 						: (" -D" + this.cloudFeaturePackLocationPropertyName() + "="

diff --git a/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java b/...java/org/jboss/intersmash/testsuite/provision/openshift/OpenShiftProvisionerTestBase.java
@@ -53,7 +53,6 @@
 import org.jboss.intersmash.test.deployments.DeploymentsProvider;
 import org.jboss.intersmash.test.deployments.TestDeploymentProperties;
 import org.jboss.intersmash.test.deployments.WildflyDeploymentApplicationConfiguration;
-import org.jboss.intersmash.testsuite.IntersmashTestsuiteProperties;
 import org.jboss.intersmash.testsuite.junit5.categories.OpenShiftTest;
 import org.jboss.intersmash.util.CommandLineBasedKeystoreGenerator;
 import org.jboss.intersmash.util.openshift.WildflyOpenShiftUtils;