Update generate features tests

Signed-off-by: Paul Gooderham <turkeyonmarblerye@gmail.com>

Author: turkeylurkey

src/test/groovy/io/openliberty/tools/gradle/BaseDevTest.groovy

@@ -33,7 +33,7 @@ class BaseDevTest extends AbstractIntegrationTest {
     final String REGENERATE_FEATURES = "Regenerated the following features:";
     final String GENERATE_FEATURES = "Generated the following features:";
     final String GENERATED_FEATURES_FILE_NAME = "generated-features.xml";
-    final String SERVER_XML_COMMENT = "Plugin has generated Liberty features"; // the explanation added to server.xml
+    //final String SERVER_XML_COMMENT = "Plugin has generated Liberty features"; // the explanation added to server.xml
     final String NEW_FILE_INFO_MESSAGE = "This file was generated by the Liberty Gradle Plugin and will be overwritten"; // the explanation added to the generated features file
     final String SERVER_CONFIG_SUCCESS = "CWWKZ0003I:";// CWWKZ0003I: The application xxx updated in y.yyy seconds.
     final String SERVER_UPDATE_COMPLETE = "CWWKF0008I:"; // Feature update completed in 0.649 seconds.

src/test/groovy/io/openliberty/tools/gradle/BaseGenerateFeaturesTest.groovy

@@ -57,7 +57,7 @@ class BaseGenerateFeaturesTest extends AbstractIntegrationTest {
     static final String GENERATED_FEATURES_FILE_NAME = "generated-features.xml";
     static final String GENERATED_FEATURES_FILE_PATH = "/build/wlp/usr/servers/defaultServer/configDropins/overrides/" + GENERATED_FEATURES_FILE_NAME;
     static final String GENERATED_FEATURES_FILE_PATH_SRC = "/src/main/liberty/config/configDropins/overrides/" + GENERATED_FEATURES_FILE_NAME;
-    static final String GENERATED_FEATURES_FILE_PATH_TMP = "/build/.libertyFeatures/" + GENERATED_FEATURES_FILE_NAME;
+    static final String GENERATED_FEATURES_FILE_PATH_TMP = "/build/.libertyFeatures/configDropins/overrides/" + GENERATED_FEATURES_FILE_NAME;
     static final String UMBRELLA_EE = "providedCompile \"jakarta.platform:jakarta.jakartaee-api:8.0.0\"";
     static final String UMBRELLA_MP = "providedCompile \"org.eclipse.microprofile:microprofile:3.2\"";
     static final String ESA_EE_DEPENDENCY = "providedCompile 'io.openliberty.features:servlet-4.0:22.0.0.2'";

src/test/groovy/io/openliberty/tools/gradle/DevRecompileTest.groovy

@@ -57,7 +57,7 @@ class DevRecompileTest extends BaseDevTest {
         int runGenerateFeaturesCount = countOccurrences(RUNNING_GENERATE_FEATURES, logFile);
         int installedFeaturesCount = countOccurrences(SERVER_INSTALLED_FEATURES, errFile);
 
-        File newFeatureFile = new File(buildDir, "src/main/liberty/config/configDropins/overrides/"+GENERATED_FEATURES_FILE_NAME);
+        // File newFeatureFile = new File(buildDir, "src/main/liberty/config/configDropins/overrides/"+GENERATED_FEATURES_FILE_NAME);
         File newTargetFeatureFile = new File(targetDir, "wlp/usr/servers/defaultServer/configDropins/overrides/"+GENERATED_FEATURES_FILE_NAME);
         File serverXmlFile = new File(buildDir, "src/main/liberty/config/server.xml");
         assertTrue(serverXmlFile.exists());
@@ -90,11 +90,11 @@ class DevRecompileTest extends BaseDevTest {
         verifyFileExists(helloBatchObj, 15000);
         // ... and run the proper task.
         assertTrue(verifyLogMessage(10000, RUNNING_GENERATE_FEATURES, ++runGenerateFeaturesCount));
-        assertTrue(verifyFileExists(newFeatureFile, 5000)); // task created file
-        assertTrue(verifyFileExists(newTargetFeatureFile, 5000)); // dev mode copied file
-        assertTrue(verifyLogMessage(10000, "batch-1.0", newFeatureFile));
-        assertTrue(verifyLogMessage(10000, NEW_FILE_INFO_MESSAGE, newFeatureFile));
-        assertTrue(verifyLogMessage(10000, SERVER_XML_COMMENT, serverXmlFile));
+        //assertTrue(verifyFileExists(newFeatureFile, 5000));
+        assertTrue(verifyFileExists(newTargetFeatureFile, 5000)); // task created file
+        assertTrue(verifyLogMessage(10000, "batch-1.0", newTargetFeatureFile));
+        assertTrue(verifyLogMessage(10000, NEW_FILE_INFO_MESSAGE, newTargetFeatureFile));
+        //assertTrue(verifyLogMessage(10000, SERVER_XML_COMMENT, serverXmlFile)); no comment added to server.xml
         // should appear as part of the message "CWWKF0012I: The server installed the following features:"
         assertTrue(verifyLogMessage(123000, SERVER_INSTALLED_FEATURES, errFile, ++installedFeaturesCount));
 

src/test/groovy/io/openliberty/tools/gradle/DevTest.groovy

@@ -249,7 +249,7 @@ class DevTest extends BaseDevTest {
         //assertTrue(verifyFileExists(newTargetFeatureFile, 5000)); // dev mode copied file
         assertTrue(verifyLogMessage(10000, "batch-1.0", newFeatureFile));
         assertTrue(verifyLogMessage(10000, NEW_FILE_INFO_MESSAGE, newFeatureFile));
-        assertTrue(verifyLogMessage(10000, SERVER_XML_COMMENT, serverXmlFile));
+        // assertTrue(verifyLogMessage(10000, SERVER_XML_COMMENT, serverXmlFile)); no comment added to server.xml
         // should appear as part of the message "CWWKF0012I: The server installed the following features:"
         assertTrue(verifyLogMessage(123000, SERVER_INSTALLED_FEATURES, errFile, ++installedFeaturesCount));
 

src/test/groovy/io/openliberty/tools/gradle/GenerateFeaturesTest.groovy

@@ -155,7 +155,7 @@ class GenerateFeaturesTest extends BaseGenerateFeaturesTest {
     @Test
     public void serverXmlCommentNoFMTest() throws Exception {
         // initially the expected comment is not found in server.xml
-        assertFalse(verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
+        // assertFalse(verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
         // also we wish to test behaviour when there is no <featureManager> element so test that
         assertFalse(verifyLogMessageExists("<featureManager>", 10, serverXmlFile));
 
@@ -168,8 +168,8 @@ class GenerateFeaturesTest extends BaseGenerateFeaturesTest {
         Charset charset = StandardCharsets.UTF_8;
         String serverXmlContents = new String(Files.readAllBytes(serverXmlFile.toPath()), charset);
         serverXmlContents = "\n" + serverXmlContents;
-        assertTrue(serverXmlContents,
-            verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
+        // assertTrue(serverXmlContents,
+        //     verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
     }
 
     @Test
@@ -181,7 +181,7 @@ class GenerateFeaturesTest extends BaseGenerateFeaturesTest {
             "  </featureManager>\n", serverXmlFile);
 
         // initially the expected comment is not found in server.xml
-        assertFalse(verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
+        // assertFalse(verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 10, serverXmlFile));
 
         runCompileAndGenerateFeatures(null);
 
@@ -192,8 +192,8 @@ class GenerateFeaturesTest extends BaseGenerateFeaturesTest {
         Charset charset = StandardCharsets.UTF_8;
         String serverXmlContents = new String(Files.readAllBytes(serverXmlFile.toPath()), charset);
         serverXmlContents = "\n" + serverXmlContents;
-        assertTrue(serverXmlContents,
-            verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
+        // assertTrue(serverXmlContents,
+        //     verifyLogMessageExists(GenerateFeaturesTask.FEATURES_FILE_MESSAGE, 100, serverXmlFile));
     }
 
     /**