From 045e5354157b6991f07a1dca87e8d5994e5785fa Mon Sep 17 00:00:00 2001
From: Cheryl King <cheryllk@us.ibm.com>
Date: Sat, 21 Sep 2024 12:10:45 -0500
Subject: [PATCH] Add negative tests for versionless feature support

---
 liberty-maven-plugin/pom.xml                  |   2 +-
 .../invoker.properties                        |   1 +
 .../pom.xml                                   | 110 ++++++++++++++++++
 .../src/test/resources/server.xml             |   7 ++
 .../invoker.properties                        |   1 +
 .../pom.xml                                   | 110 ++++++++++++++++++
 .../src/test/resources/server.xml             |   6 +
 .../checkErrorVersionlessFeature.bsh          |  38 ++++++
 .../src/test/resources/cleanTest.bsh          |   9 +-
 9 files changed, 282 insertions(+), 2 deletions(-)
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/invoker.properties
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/pom.xml
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/src/test/resources/server.xml
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/invoker.properties
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/pom.xml
 create mode 100644 liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/src/test/resources/server.xml
 create mode 100644 liberty-maven-plugin/src/test/resources/checkErrorVersionlessFeature.bsh

diff --git a/liberty-maven-plugin/pom.xml b/liberty-maven-plugin/pom.xml
index 0dbb48850..915c8dc25 100644
--- a/liberty-maven-plugin/pom.xml
+++ b/liberty-maven-plugin/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-ant-tasks</artifactId>
-            <version>1.9.15</version>
+            <version>1.9.16-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/invoker.properties b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/invoker.properties
new file mode 100644
index 000000000..62359c56d
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/invoker.properties
@@ -0,0 +1 @@
+invoker.buildResult = failure
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/pom.xml
new file mode 100644
index 000000000..84431db1e
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.openliberty.tools.it</groupId>
+        <artifactId>tests</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>kernel-install-versionless-feature-fail-bad-platform-it</artifactId>
+    <packaging>jar</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>  
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>@pom.version@</version>
+                <configuration>
+                    <assemblyArtifact>
+                        <groupId>${runtimeGroupId}</groupId>
+                        <artifactId>${runtimeKernelId}</artifactId>
+                        <version>${runtimeVersion}</version>
+                        <type>zip</type>
+                    </assemblyArtifact>
+                    <serverName>test</serverName>
+                    <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install-liberty-server</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>install-server</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>create-server</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>install-feature</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>install-feature</goal>
+                        </goals>
+                        <configuration>
+                            <features>
+                                <acceptLicense>true</acceptLicense>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <workingDirectory>${project.build.directory}</workingDirectory>
+                    <argLine>-enableassertions</argLine>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+  
+</project>
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/src/test/resources/server.xml b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/src/test/resources/server.xml
new file mode 100644
index 000000000..5976a6b36
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-bad-platform-it/src/test/resources/server.xml
@@ -0,0 +1,7 @@
+<server description="default server">
+    <featureManager>    
+        <feature>appSecurityClient-1.0</feature>
+        <feature>jaxws</feature>
+        <platform>badname</platform>
+    </featureManager>     
+</server>
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/invoker.properties b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/invoker.properties
new file mode 100644
index 000000000..62359c56d
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/invoker.properties
@@ -0,0 +1 @@
+invoker.buildResult = failure
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/pom.xml b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/pom.xml
new file mode 100644
index 000000000..09fed6481
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/pom.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.openliberty.tools.it</groupId>
+        <artifactId>tests</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>kernel-install-versionless-feature-fail-no-platform-it</artifactId>
+    <packaging>jar</packaging>
+    
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.1</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+    </dependencies>  
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.openliberty.tools</groupId>
+                <artifactId>liberty-maven-plugin</artifactId>
+                <version>@pom.version@</version>
+                <configuration>
+                    <assemblyArtifact>
+                        <groupId>${runtimeGroupId}</groupId>
+                        <artifactId>${runtimeKernelId}</artifactId>
+                        <version>${runtimeVersion}</version>
+                        <type>zip</type>
+                    </assemblyArtifact>
+                    <serverName>test</serverName>
+                    <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install-liberty-server</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>install-server</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>create-server</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>install-feature</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>install-feature</goal>
+                        </goals>
+                        <configuration>
+                            <features>
+                                <acceptLicense>true</acceptLicense>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <workingDirectory>${project.build.directory}</workingDirectory>
+                    <argLine>-enableassertions</argLine>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>integration-test</id>
+                        <goals>
+                            <goal>integration-test</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>verify</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+  
+</project>
diff --git a/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/src/test/resources/server.xml b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/src/test/resources/server.xml
new file mode 100644
index 000000000..9bbdc46d5
--- /dev/null
+++ b/liberty-maven-plugin/src/it/kernel-install-versionless-feature-fail-no-platform-it/src/test/resources/server.xml
@@ -0,0 +1,6 @@
+<server description="default server">
+    <featureManager>    
+        <feature>appSecurityClient-1.0</feature>
+        <feature>servlet</feature>
+    </featureManager>     
+</server>
diff --git a/liberty-maven-plugin/src/test/resources/checkErrorVersionlessFeature.bsh b/liberty-maven-plugin/src/test/resources/checkErrorVersionlessFeature.bsh
new file mode 100644
index 000000000..b4f56ecd0
--- /dev/null
+++ b/liberty-maven-plugin/src/test/resources/checkErrorVersionlessFeature.bsh
@@ -0,0 +1,38 @@
+//Check build.log content for certain tests
+boolean flag = false;
+String testname = basedir.getName();
+String expectedMessage = null;
+switch (testname) {
+    case "kernel-install-versionless-feature-fail-bad-platform-it":
+         expectedMessage = "CWWKF1515E: The badname platform could not be found.";
+         break;
+    case "kernel-install-versionless-feature-fail-no-platform-it":
+        expectedMessage = "CWWKF1516E: The platform could not be determined. The following versionless features cannot be installed: [servlet]";
+         break;
+    default:
+         return false;
+}
+File buildlog = new File(basedir,"build.log");
+if (buildlog.exists()) {
+    try {
+        InputStream buildOutput = new FileInputStream(buildlog); 
+        InputStreamReader in = new InputStreamReader(buildOutput); 
+        java.util.Scanner s = new java.util.Scanner(in);
+	    while (s.hasNextLine() && !flag) {
+	        String line = s.nextLine();
+	        if (line.contains(expectedMessage)) {
+	            flag = true;
+                System.out.println("Correct error message found for test "+testname);
+	        }
+	    }
+        s.close();
+        in.close();
+        buildOutput.close();
+	} catch (Exception e) {
+	    System.out.println("Error checking build.log " + e.getMessage());
+	}
+}
+if (!flag) {
+    System.out.println("FAILED: Expected error message ("+expectedMessage+") not found in "+buildlog.getAbsolutePath());
+}
+return flag;
\ No newline at end of file
diff --git a/liberty-maven-plugin/src/test/resources/cleanTest.bsh b/liberty-maven-plugin/src/test/resources/cleanTest.bsh
index c9b4b7ff8..d8db6aa36 100644
--- a/liberty-maven-plugin/src/test/resources/cleanTest.bsh
+++ b/liberty-maven-plugin/src/test/resources/cleanTest.bsh
@@ -1,4 +1,11 @@
+//If need to check build.log for error message, call script
+boolean flag = true;
+if (basedir.getName().contains("versionless-feature-fail-")) {
+    String errorScript = new File(basedir, "checkErrorVersionlessFeature.bsh").getAbsolutePath();
+    System.out.println("Running post-build script: "+ errorScript);
+    flag = source(errorScript);
+}
 //Runs clean in the test project directory
 Runtime.getRuntime().exec("../../../../mvnw clean", null, basedir);
 System.out.println("Cleaned target dir(s) for " + basedir);
-return true;
\ No newline at end of file
+return flag;
\ No newline at end of file