LGP 4.0.0 and Gradle 9.0 test

src/test/GradleTestDevModeActions.ts

@@ -475,9 +475,12 @@ describe('Devmode action tests for Gradle Project', () => {
     }).timeout(100000);
 
     /**
-     * The following after hook copies the screenshot from the temporary folder in which it is saved to a known permanent location in the project folder.
+     * The following after hook closes the workspace and copies screenshots.
+     * Closing the workspace ensures the next test file starts with a clean slate.
      */
-    after(() => {
+    after(async function() {
+        this.timeout(10000);
+        await utils.closeWorkspace();
         utils.copyScreenshotsToProjectFolder('gradle');
     });
 });

src/test/GradleTestLSPHover.ts

@@ -12,13 +12,11 @@ describe('LSP Hover tests for Gradle Project', () => {
     let editorView: EditorView;
     let editor: TextEditor;
     let wait: any;
-    let driver: WebDriver;
 
     before(async function() {
         this.timeout(60000);
         logger.info('Setting up Gradle LSP Hover tests');
 
-        driver = VSBrowser.instance.driver;
         await VSBrowser.instance.openResources(utils.getGradleProjectPath());
 
         // Wait for workbench to be ready
@@ -57,13 +55,8 @@ describe('LSP Hover tests for Gradle Project', () => {
 
     after(async function() {
         this.timeout(10000); // Increase timeout for cleanup operations
-        // Close editor after all tests complete
-        try {
-            await editorView.closeAllEditors();
-            logger.info('Closed all editors after test suite');
-        } catch (error) {
-            logger.error('Failed to close editors in after hook', error);
-        }
+        // Close workspace and editors after all tests complete
+        await utils.closeWorkspace();
 
         utils.copyScreenshotsToProjectFolder('gradle');
     });
@@ -218,4 +211,3 @@ describe('LSP Hover tests for Gradle Project', () => {
 
 });
 
-// Made with Bob

src/test/GradleTestLSPRestSnippetAndDiagnostic.ts

@@ -72,16 +72,11 @@ describe('Rest Class Snippet Test for Gradle Project', () => {
                 logger.error('Failed to reset TestRest.java', error);
             }
 
-            try {
-                await editorView.closeAllEditors();
-                await wait.sleep(500);
-                logger.info('Closed all editors after test suite');
-            } catch (error) {
-                logger.error('Failed to close editors in after hook', error);
-            }
+            // Close workspace to prepare for next test file
+            await utils.closeWorkspace();
 
             try {
-                utils.copyScreenshotsToProjectFolder('maven');
+                utils.copyScreenshotsToProjectFolder('gradle');
             } catch (error) {
                 // Ignore screenshot errors
             }

src/test/MavenTestDevModeActions.ts

@@ -499,9 +499,12 @@ describe('Devmode action tests for Maven Project', () => {
     }).timeout(350000);
 
     /**
-     * The following after hook copies the screenshot from the temporary folder in which it is saved to a known permanent location in the project folder.
+     * The following after hook closes the workspace and copies screenshots.
+     * Closing the workspace ensures the next test file starts with a clean slate.
      */
-    after(() => {
+    after(async function() {
+        this.timeout(10000);
+        await utils.closeWorkspace();
         utils.copyScreenshotsToProjectFolder('maven');
     });
 });

src/test/MavenTestLSPHover.ts

@@ -12,12 +12,10 @@ describe('LSP Hover tests for Maven Project', () => {
     let editorView: EditorView;
     let editor: TextEditor;
     let wait: any;
-    let driver: WebDriver;
 
 
     before(async function() {
         this.timeout(60000);
-        driver = VSBrowser.instance.driver;
         await VSBrowser.instance.openResources(utils.getMvnProjectPath());
         logger.info('Setting up Maven LSP Hover tests');
 
@@ -57,13 +55,8 @@ describe('LSP Hover tests for Maven Project', () => {
 
     after(async function() {
         this.timeout(10000); // Increase timeout for cleanup operations
-        // Close editor after all tests complete
-        try {
-            await editorView.closeAllEditors();
-            logger.info('Closed all editors after test suite');
-        } catch (error) {
-            logger.error('Failed to close editors in after hook', error);
-        }
+        // Close workspace and editors after all tests complete
+        await utils.closeWorkspace();
 
         utils.copyScreenshotsToProjectFolder('maven');
     });

src/test/MavenTestLSPRestSnippetAndDiagnostic.ts

@@ -72,13 +72,8 @@ describe('Rest Class Snippet Test for Maven Project', () => {
             logger.error('Failed to reset TestRest.java', error);
         }
 
-        try {
-            await editorView.closeAllEditors();
-            await wait.sleep(500);
-            logger.info('Closed all editors after test suite');
-        } catch (error) {
-            logger.error('Failed to close editors in after hook', error);
-        }
+        // Close workspace to prepare for next test file
+        await utils.closeWorkspace();
 
         try {
             utils.copyScreenshotsToProjectFolder('maven');

src/test/definitions/constants.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/resources/gradle/liberty-gradle-9-test-wrapper-app/Dockerfile

@@ -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/resources/gradle/liberty-gradle-9-test-wrapper-app/build.gradle

@@ -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'

src/test/resources/gradle/liberty-gradle-9-test-wrapper-app/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,9 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+networkTimeout=10000
+retries=0
+retryBackOffMs=500
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists