diff --git a/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/FeatureUtilityToolTest.java b/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/FeatureUtilityToolTest.java index 16abbcfdefa4..9dfb635cdca7 100644 --- a/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/FeatureUtilityToolTest.java +++ b/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/FeatureUtilityToolTest.java @@ -372,8 +372,8 @@ protected ProgramOutput runFeatureUtility(String testcase, String[] params) thro protected ProgramOutput runFeatureUtility(String testcase, String[] params, boolean debug) throws Exception { Properties envProps = new Properties(); - // add beta property here - // envProps.put("JVM_ARGS", "-Dbeta.property=true"); + //add beta property here + envProps.put("JVM_ARGS", "-Dbeta.property=true"); return runFeatureUtility(testcase, params, envProps); } diff --git a/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/InstallServerTest.java b/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/InstallServerTest.java index 0d8f73f79963..2916c3180960 100644 --- a/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/InstallServerTest.java +++ b/dev/com.ibm.ws.install.featureUtility_fat/fat/src/com/ibm/ws/install/featureUtility/fat/InstallServerTest.java @@ -158,24 +158,41 @@ public void testInvalidMultiVersionFeatures() throws Exception { } /** - * Test the install of versionless servlet from maven central. Multi-version is not - * supported with installServerFeature as it cannot be installed to same - * resource. + * Test the install of versionless with bogus platform name xxx from maven central. Should throw expected platform name not found * * @throws Exception */ - @Ignore @Test - public void testVersionlessWithPlatformFeatures() throws Exception { - final String METHOD_NAME = "testInvalidMultiVersionFeatures"; + public void testVersionlessWithBadPlatformFeatures() throws Exception { + final String METHOD_NAME = "testVersionlessWithBadPlatformFeatures"; Log.entering(c, METHOD_NAME); - copyFileToMinifiedRoot("usr/servers/serverX", "publish/tmp/versionlessWPlatform/server.xml"); + copyFileToMinifiedRoot("usr/servers/serverX", "publish/tmp/versionlessBadPlatform/server.xml"); + + String[] param1s = { "installServerFeatures", "serverX", "--verbose" }; + + ProgramOutput po = runFeatureUtility(METHOD_NAME, param1s); + + checkCommandOutput(po, 21, "CWWKF1515E", null); //UnKnown platform error + Log.exiting(c, METHOD_NAME); + } + + /** + * Test the install of versionless with no platform defined. Should throw expected platform can't be determined error + * + * @throws Exception + */ + @Test + public void testVersionlessWithNoPlatformFeatures() throws Exception { + final String METHOD_NAME = "testVersionlessWithNoPlatformFeatures"; + Log.entering(c, METHOD_NAME); + + copyFileToMinifiedRoot("usr/servers/serverX", "publish/tmp/versionlessNoPlatform/server.xml"); String[] param1s = { "installServerFeatures", "serverX", "--verbose" }; ProgramOutput po = runFeatureUtility(METHOD_NAME, param1s); - checkCommandOutput(po, 21, "CWWKF1405E", null); + checkCommandOutput(po, 21, "CWWKF1516E", null); //Platform not determined Log.exiting(c, METHOD_NAME); } diff --git a/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessWPlatform/server.xml b/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessBadPlatform/server.xml similarity index 82% rename from dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessWPlatform/server.xml rename to dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessBadPlatform/server.xml index c3076b4451e6..914eec43ead0 100644 --- a/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessWPlatform/server.xml +++ b/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessBadPlatform/server.xml @@ -3,7 +3,7 @@ - jakartaee-10.0 + xxx servlet diff --git a/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessNoPlatform/server.xml b/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessNoPlatform/server.xml new file mode 100644 index 000000000000..315aa08e45a3 --- /dev/null +++ b/dev/com.ibm.ws.install.featureUtility_fat/publish/tmp/versionlessNoPlatform/server.xml @@ -0,0 +1,9 @@ + + + + + + servlet + + +