Fixes #282 - project detection in dashboard

package.json

@@ -234,7 +234,8 @@
 		"buildJakarta": "gulp buildJakartaJdt buildJakartaLs",
 		"test": "npm run test-compile && extest setup-and-run -o .vscode/settings.json 'out/test/*.js'",
 		"test-mac-maven":"npm run test-compile && extest setup-and-run -o .vscode/settings.json 'out/test/M*.js'",
-		"test-mac-gradle": "npm run test-compile && extest setup-and-run -o .vscode/settings.json 'out/test/G*.js'"
+		"test-mac-gradle": "npm run test-compile && extest setup-and-run -o .vscode/settings.json 'out/test/G*.js'",
+		"test-mac-dashboard": "npm run test-compile && extest setup-and-run -o .vscode/settings.json 'out/test/L*.js'"
 	},
 	"devDependencies": {
 		"@types/chai": "^4.3.4",

src/test/LibertyDashboardInitProject.ts

@@ -0,0 +1,18 @@
+import { WebDriver, VSBrowser } from 'vscode-extension-tester';
+import * as utils from './utils/testUtils';
+
+describe('Open Maven Server xml Project', () => {
+
+    let driver: WebDriver;
+
+    before(() => {
+        driver = VSBrowser.instance.driver;
+    });
+
+    it('Open Sample Maven Project with no server.xml', async () => {
+        await VSBrowser.instance.openResources(utils.getMvnServerXmlProjectPath());
+    }).timeout(15000);
+
+});
+
+

src/test/LibertyDashboardTest.ts

@@ -0,0 +1,65 @@
+import { expect } from 'chai';
+import { SideBarView, ViewItem, ViewSection, DefaultTreeItem, DebugView } from 'vscode-extension-tester';
+import * as utils from './utils/testUtils';
+import * as constants from './definitions/constants';
+import path = require('path');
+
+describe('Liberty dashboard project detection tests', () => {
+    let sidebar: SideBarView;
+    let debugView: DebugView;
+    let section: ViewSection;
+    let menu: ViewItem[];
+    let item: DefaultTreeItem;
+    let tabs: string[];
+
+    before(() => {
+        sidebar = new SideBarView();
+        debugView = new DebugView();
+    });
+
+    it('Delete server.xml from config.', async () => {
+
+        const dest = path.join(utils.getMvnServerXmlProjectPath(), "src", "main", "liberty", "config", "server.xml");
+        const deleteServerxml = await utils.deleteReports(dest);
+        expect(deleteServerxml).to.be.true;
+
+    }).timeout(80000);
+
+    it('getViewControl works with the correct label', async () => {
+
+        const contentPart = sidebar.getContent();
+        section = await contentPart.getSection('Liberty Dashboard');
+        console.log("Found Liberty Dashboard test....");
+        expect(section).not.undefined;
+
+    }).timeout(10000);
+
+    it('Liberty dashboard is empty', async () => {
+
+        await utils.delay(30000);
+        const isEmpty = await utils.isViewSectionEmpty(section);
+        expect(isEmpty).true;
+
+    }).timeout(70000);
+
+    it('Copy server.xml to config folder', async () => {
+
+        await utils.delay(50000);
+        const serverxmlPath = path.join(utils.getMvnServerXmlProjectPath(), "src", "main", "liberty", "config", "serverxml", "server.xml");
+        const dest = path.join(utils.getMvnServerXmlProjectPath(), "src", "main", "liberty", "config", "server.xml");
+        await utils.copyFile(serverxmlPath, dest);
+        console.log("Finished copying file....");
+
+    }).timeout(90000);
+
+    it('Open dasboard shows items - Maven', async () => {
+
+        await utils.delay(50000);
+        const menu = await section.getVisibleItems();
+        expect(menu).not.empty;
+        item = await section.findItem(constants.MAVEN_SERVERXML_PROJECT) as DefaultTreeItem;
+        expect(item).not.undefined;
+
+    }).timeout(80000);
+
+});

src/test/definitions/constants.ts

@@ -9,6 +9,7 @@
  */
 
 export const MAVEN_PROJECT = "liberty.maven.test.wrapper.app";
+export const MAVEN_SERVERXML_PROJECT = "liberty.maven.serverxml.test.wrapper.app";
 export const GRADLE_PROJECT= "liberty.gradle.test.wrapper.app";
 export const START_DASHBOARD_ACTION = "Start";
 export const STOP_DASHBOARD_ACTION = "Stop";

src/test/resources/maven-serverxml/liberty.maven.serverxml.test.wrapper.app/.classpath

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="target/generated-sources/annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+			<attribute name="optional" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="ignore_optional_problems" value="true"/>
+			<attribute name="m2e-apt" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

src/test/resources/maven-serverxml/liberty.maven.serverxml.test.wrapper.app/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar

src/test/resources/maven-serverxml/liberty.maven.serverxml.test.wrapper.app/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

src/test/resources/maven-serverxml/liberty.maven.serverxml.test.wrapper.app/Dockerfile

@@ -0,0 +1,9 @@
+FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
+
+COPY --chown=1001:0 /src/main/liberty/config /config
+
+RUN features.sh
+
+COPY --chown=1001:0 target/*.war /config/apps
+
+RUN configure.sh