#1066 update UI test automation in mac

.github/workflows/build.yaml

@@ -44,23 +44,34 @@ on:
   pull_request:
     branches: [ main, intellij-2024.2-support ]
 
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        runtime: [ linux, mac, windows ]
+        os: [ macOS-latest ]
+        iteration: [ 1, 2, 3, 4, 5, 6 ]
         include:
-          - runtime: linux
-            os: ubuntu-latest
-            reportName: linux-test-report
-          - runtime: mac
-            os: macOS-latest
-            reportName: mac-test-report
-          - runtime: windows
-            os: windows-latest
-            reportName: windows-test-report
+          - os: macOS-latest
+            iteration: 1
+            reportName: mac-test-report-1
+          - os: macOS-latest
+            iteration: 2
+            reportName: mac-test-report-2
+          - os: macOS-latest
+            iteration: 3
+            reportName: mac-test-report-3
+          - os: macOS-latest
+            iteration: 4
+            reportName: mac-test-report-4
+          - os: macOS-latest
+            iteration: 5
+            reportName: mac-test-report-5
+          - os: macOS-latest
+            iteration: 6
+            reportName: mac-test-report-6
     env:
       USE_LOCAL_PLUGIN: ${{ inputs.useLocalPlugin || false }}
       REF_LSP4IJ: ${{ inputs.refLsp4ij }}

build.gradle

@@ -1,4 +1,5 @@
 import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 plugins {
     id 'java'
     id 'org.jetbrains.intellij.platform' version '2.1.0'
@@ -157,37 +158,52 @@ task copyDeps(type: Copy) {
     rename '^(.*)(-[0-9]+[.[0-9]+]+(-SNAPSHOT)?)(.*)$', '$1$4'
 }
 
-runIde {
-    jvmArgumentProviders.add({
-        [
-                "--add-exports",
-                "java.base/jdk.internal.vm=ALL-UNNAMED",
-        ]
-    } as CommandLineArgumentProvider)
+intellijPlatformTesting.runIde {
+    runIdeLocally {
+        version = providers.gradleProperty("ideTargetVersion")
+        type = IntelliJPlatformType.IntellijIdeaCommunity
+        task {
+            jvmArgumentProviders.add({
+                [
+                        "--add-exports",
+                        "java.base/jdk.internal.vm=ALL-UNNAMED"
+                ]
+            } as CommandLineArgumentProvider)
+        }
+    }
 }
 
 test {
     useJUnitPlatform()
-
     testLogging {
         showStandardStreams = true
         exceptionFormat = 'full'
     }
 }
-downloadRobotServerPlugin {
-    version.set(remoteRobotVersion)
-}
+intellijPlatformTesting.runIde {
 
-runIdeForUiTests {
-    systemProperty "robot-server.port", "8082"
-    systemProperty "ide.mac.message.dialogs.as.sheets", "false"
-    systemProperty "jb.privacy.policy.text", "<!--999.999-->"
-    systemProperty "jb.consents.confirmation.enabled", "false"
-    systemProperty "idea.trust.all.projects", "true"
-    systemProperty "ide.show.tips.on.startup.default.value", "false"
-    systemProperty "ide.mac.file.chooser.native", "false"
-    systemProperty "jbScreenMenuBar.enabled", "false"
-    systemProperty "apple.laf.useScreenMenuBar", "false"
+    runIdeForUiTests {
+        task {
+            version = providers.gradleProperty("ideTargetVersion")
+            type = IntelliJPlatformType.IntellijIdeaCommunity
+            jvmArgumentProviders.add({
+                [
+                        "-Drobot-server.port=8082",
+                        "-Dide.mac.message.dialogs.as.sheets=false",
+                        "-Djb.privacy.policy.text=<!--999.999-->",
+                        "-Djb.consents.confirmation.enabled=false",
+                        "-Didea.trust.all.projects=true",
+                        "-Dide.show.tips.on.startup.default.value=false",
+                        "-Dide.mac.file.chooser.native=false",
+                        "-DjbScreenMenuBar.enabled=false",
+                        "-Dapple.laf.useScreenMenuBar=false",
+                ]
+            } as CommandLineArgumentProvider)
+        }
+        plugins {
+            robotServerPlugin(remoteRobotVersion)
+        }
+    }
 }
 
 intellijPlatform {

gradle.properties

@@ -1,13 +1,16 @@
 useLocal=false
 pluginSinceBuild=241
-pluginUntilBuild=242.*
+pluginUntilBuild=243.*
 
 javaVersion=17
 javaTargetVersion=17
 
 # Target IntelliJ Community by default
 platformType=IC
 platformVersion=2024.1.7
+ideTargetVersion=2024.3
+
 
 # Example: platformBundledPlugins = com.intellij.java
-platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
+platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
+kotlin.stdlib.default.dependency=false

src/test/java/io/openliberty/tools/intellij/it/SingleModJakartaLSTestCommon.java

@@ -93,7 +93,8 @@ public void testInsertJakartaCodeSnippetIntoJavaPart() {
 
     /**
      * Tests Jakarta Language Server diagnostic support in a Java source file
-     */
+     *
+     **/
     @Test
     @Video
     public void testJakartaDiagnosticsInJavaPart() {