Merge remote-tracking branch 'upstream/main' into shared-restsnippet-suite

Author: sharma1208

src/test/Gradle9TestDevModeActions.ts

@@ -165,8 +165,6 @@ describe('Gradle-specific devmode action tests', () => {
         }
     }).timeout(30000);
 
-    // Based on the UI testing code, it sometimes selects the wrong command in "command palette", such as choosing "Liberty: Start ..." instead of "Liberty: Start" from the recent suggestions. This discrepancy occurs because we specifically need "Liberty: Start" at that moment.
-    // Now, clear the command history of the "command palette" to avoid receiving "recently used" suggestions. This action should be performed at the end of Gradle Project tests.
     it('Clear Command Palette', async () => {
         logger.testStart('Clear Command Palette');
         try {
@@ -179,6 +177,13 @@ describe('Gradle-specific devmode action tests', () => {
             throw error;
         }
     }).timeout(100000);
-});
-
 
+    /**
+     * The following after hook closes the workspace and copies screenshots.
+     * Closing the workspace ensures the next test file starts with a clean slate.
+     */
+    after(async function() {
+        this.timeout(10000);
+        await utils.closeWorkspace();
+    });
+});

src/test/GradleInitProject.ts

@@ -28,15 +28,6 @@ describe('Maven-specific devmode action tests', () => {
         dashboard = new DashboardPage();
     });
 
-    after(async function() {
-        this.timeout(10000);
-        try {
-            await new EditorView().closeAllEditors();
-        } catch (error) {
-            logger.error('Failed to close editors after Maven-specific suite', error);
-        }
-    });
-
     it('Start Maven with options from Liberty Tools', async () => {
         logger.testStart('Start Maven with options from Liberty Tools');
         try {
@@ -204,6 +195,12 @@ describe('Maven-specific devmode action tests', () => {
             throw error;
         }
     }).timeout(90000);
-});
 
-// Made with Bob
+    /**
+     * The following after hook closes the workspace so the next test file starts with a clean slate.
+     */
+    after(async function() {
+        this.timeout(10000);
+        await utils.closeWorkspace();
+    });
+});

src/test/GradleTestDevModeActions.ts

@@ -1,4 +1,4 @@
 import * as utils from './utils/testUtils';
 import { runRestSnippetSuite } from './shared/restSnippetSuite';
 
-runRestSnippetSuite({ buildTool: 'maven', getProjectPath: utils.getMvnProjectPath });
+runRestSnippetSuite({ buildTool: 'maven', getProjectPath: utils.getMvnProjectPath });

src/test/MavenInitProject.ts

@@ -5,6 +5,7 @@
 
 export const MAVEN_PROJECT = "liberty-maven-test-wrapper-app";
 export const GRADLE_PROJECT= "liberty-gradle-test-wrapper-app";
+export const GRADLE_9_PROJECT= "liberty-gradle-9-test-wrapper-app";
 export const START_DASHBOARD_ACTION = "Start";
 export const STOP_DASHBOARD_ACTION = "Stop";
 export const START_DASHBOARD_MAC_ACTION = "Liberty: Start";
@@ -29,6 +30,7 @@ export const ITR_DASHBOARD_MAC_ACTION = "Liberty: View integration test report";
 export const SUREFIRE_REPORT_TITLE = "liberty-maven-test-wrapper-app surefire report";
 export const FAILSAFE_REPORT_TITLE = "liberty-maven-test-wrapper-app failsafe report";
 export const GRADLE_TEST_REPORT_TITLE = "liberty-gradle-test-wrapper-app test report";
+export const GRADLE_9_TEST_REPORT_TITLE = "liberty-gradle-9-test-wrapper-app test report";
 export const ATTACH_DEBUGGER_DASHBOARD_ACTION = "Attach debugger";
 export const ATTACH_DEBUGGER_DASHBOARD_MAC_ACTION = "Liberty: Attach debugger";
 /** Maven: Dev mode debug port argument key. */

src/test/MavenTestDevModeActions.ts

@@ -138,28 +138,29 @@ startDisplayAndDocker() {
 
 #find current vscode version
 setVscodeVersionToTest() {
-        latest_version=$(curl -s https://code.visualstudio.com/updates)
-        current_version=$(echo $latest_version | cut -d"v" -f2 | sed 's/_/./g')
-
-        if echo "$current_version" | grep -qE '^[1-9]+\.[0-9]+$'; then
-                echo "The string is a version string."
-                previous_version=$(awk -F. '{print $1"."$2-1}' <<<$current_version)
-                previousMinusOne=$(awk -F. '{print $1"."$2-2}' <<<$current_version)
-                echo $current_version $previous_version $previousMinusOne
-        else
-                echo "The string is not a version string."
-                current_version='latest'
-                previous_version='latest'
-                previousMinusOne='latest'
+        if [[ $VSCODE_VERSION_TO_RUN == 'latest' ]]; then
+                return
         fi
 
-        if [[ $VSCODE_VERSION_TO_RUN = 'latest' ]]; then
-                VSCODE_VERSION_TO_RUN='latest'
-        elif [[ $VSCODE_VERSION_TO_RUN = 'previous' ]]; then
-                VSCODE_VERSION_TO_RUN="$previous_version.0"
-        else
-                VSCODE_VERSION_TO_RUN="$previousMinusOne.0"
+        local versions_json
+        versions_json=$(curl -sf "https://update.code.visualstudio.com/api/releases/stable")
+
+        if [[ -z "$versions_json" ]]; then
+                echo "ERROR: Failed to fetch VS Code release list."
+                exit 1
         fi
+
+        local all_versions latest_minor previous_version
+        all_versions=$(echo "$versions_json" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
+        latest_minor=$(echo "$all_versions" | head -1 | grep -oE '^[0-9]+\.[0-9]+')
+        previous_version=$(echo "$all_versions" | grep -v "^${latest_minor}\." | head -1)
+
+        if [[ -z "$previous_version" ]]; then
+                echo "ERROR: Could not extract previous VS Code version from release list."
+                exit 1
+        fi
+
+        VSCODE_VERSION_TO_RUN="$previous_version"
 }
 
 # Finding the exit status of a command and updating failure boolean.

src/test/MavenTestLSPRestSnippetAndDiagnostic.ts

@@ -0,0 +1,3 @@
+FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
+COPY --chown=1001:0  build/wlp/usr/servers/defaultServer/server.xml /config/
+RUN features.sh

src/test/definitions/constants.ts

@@ -0,0 +1,46 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'io.openliberty.tools:liberty-gradle-plugin:4.0.0'
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'liberty'
+apply plugin: 'war'
+
+version '1.0'
+group 'liberty-gradle-test-wrapper-app'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding = 'UTF-8'
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+     // provided dependencies
+     providedCompile 'javax.servlet:javax.servlet-api:3.1.0' 
+     providedCompile 'org.eclipse.microprofile:microprofile:5.0'
+     
+     // test dependencies
+     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1' 
+     testImplementation 'org.apache.httpcomponents.client5:httpclient5:5.6.1'
+}
+
+liberty {
+    server{
+        verifyAppStartTimeout = 150
+    }
+}
+
+clean.dependsOn 'libertyStop'