toolchain-install-feature-it location changed so to fix the errors

Author: Sajeer

liberty-maven-plugin/src/it/kernel-install-feature-test/pom.xml

@@ -45,6 +45,7 @@
         <module>install-usr-feature-ext-it</module>
         <module>install-usr-feature-old-version</module>
         <module>install-features-override-server-dir-it</module>
+        <module>toolchain-install-feature-it</module>
     </modules>
 
     <!-- Profiles for WLP vs OL -->

liberty-maven-plugin/src/it/kernel-install-feature-test/toolchain-install-feature-it/pom.xml

@@ -0,0 +1,65 @@
+<?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>kernel-install-feature-tests</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>toolchain-install-feature-it</artifactId>
+  <packaging>jar</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>io.openliberty.tools</groupId>
+        <artifactId>liberty-maven-plugin</artifactId>
+        <version>@pom.version@</version>
+        <configuration>
+            <jdkToolchain>
+                <version>11</version>
+            </jdkToolchain>
+            <assemblyArtifact>
+                <groupId>${runtimeGroupId}</groupId>
+                <artifactId>${runtimeKernelId}</artifactId>
+                <version>${runtimeVersion}</version>
+                <type>zip</type>
+            </assemblyArtifact>
+            <serverName>toolchainTestServer</serverName>
+            <serverXmlFile>src/test/resources/server.xml</serverXmlFile>
+        </configuration>
+        <executions>
+            <execution>
+                <id>install-liberty</id>
+                <phase>compile</phase>
+                <goals>
+                    <goal>install-server</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>create-liberty-server</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                    <goal>create</goal>
+                </goals>
+            </execution>
+            <execution>
+                <id>install-features</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                    <goal>install-feature</goal>
+                </goals>
+                <configuration>
+                    <features>
+                        <acceptLicense>true</acceptLicense>
+                    </features>
+                </configuration>
+            </execution>
+         </executions>
+       </plugin>
+    </plugins>
+  </build>
+</project>

…est/app/ToolchainInstallFeatureTest.java …est/app/ToolchainInstallFeatureTest.javaliberty-maven-plugin/src/it/toolchain-install-feature-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainInstallFeatureTest.java renamed to liberty-maven-plugin/src/it/kernel-install-feature-test/toolchain-install-feature-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainInstallFeatureTest.java liberty-maven-plugin/src/it/toolchain-install-feature-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainInstallFeatureTest.java renamed to liberty-maven-plugin/src/it/kernel-install-feature-test/toolchain-install-feature-it/src/test/java/net/wasdev/wlp/maven/test/app/ToolchainInstallFeatureTest.java

@@ -537,7 +537,7 @@ protected Map<String, String> getToolchainEnvVar() {
         }
         // 1. Read existing config files
         List<String> serverEnvLines = readConfigFileLines(getServerEnvFile());
-        if (mergeServerEnv && serverEnvFile != null && serverEnvFile.exists() && configDirectory.exists()) {
+        if (mergeServerEnv && serverEnvFile != null && serverEnvFile.exists() && configDirectory != null && configDirectory.exists()) {
                 File configDirServerEnv = new File(configDirectory, "server.env");
                 if (configDirServerEnv.exists()) {
                     serverEnvLines.addAll(readConfigFileLines(configDirServerEnv));
@@ -571,6 +571,9 @@ private File getServerEnvFile() {
         if (serverEnvFile != null && serverEnvFile.exists()) {
             return serverEnvFile;
         }
+        if (configDirectory == null) {
+            return null;
+        }
         File defaultServerEnv = new File(configDirectory, "server.env");
         if (defaultServerEnv.exists()) {
             return defaultServerEnv;