chore: migrate to intellij gradle plugin 2.x

Signed-off-by: Stephane Bouchet <[email protected]>
redhat-developer · Jan 28, 2025 · 173dafd · 173dafd
1 parent 55ab253
commit 173dafd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -253,7 +253,7 @@ val integrationTest by intellijPlatformTesting.testIde.registering {
         mustRunAfter(tasks["test"])
     }
     plugins {
-        robotServerPlugin()
+        robotServerPlugin("0.11.23")
     }
 
     dependencies {
@@ -340,17 +340,18 @@ tasks {
 // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-tasks.html#runIdeForUiTests
 val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
     task {
+        val robotServerPort = System.getProperty("robot-server.port")
         jvmArgumentProviders += CommandLineArgumentProvider {
             listOf(
-                "-Drobot-server.port=8580",
+                "-Drobot-server.port=$robotServerPort",
                 "-Dide.mac.message.dialogs.as.sheets=false",
                 "-Djb.privacy.policy.text=<!--999.999-->",
                 "-Djb.consents.confirmation.enabled=false",
             )
         }
     }
     plugins {
-        robotServerPlugin()
+        robotServerPlugin("0.11.23")
     }
 }
 

diff --git a/src/it/java/org/jboss/tools/intellij/quarkus/tests/BasicTest.java b/src/it/java/org/jboss/tools/intellij/quarkus/tests/BasicTest.java
@@ -26,7 +26,6 @@
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.buildtoolpane.GradleBuildToolPane;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.buildtoolpane.MavenBuildToolPane;
 import com.redhat.devtools.intellij.commonuitest.utils.project.CreateCloseUtils;
-import com.redhat.devtools.intellij.commonuitest.utils.screenshot.ScreenshotUtils;
 import org.jboss.tools.intellij.quarkus.fixtures.dialogs.project.pages.QuarkusNewProjectFinalPage;
 import org.jboss.tools.intellij.quarkus.fixtures.dialogs.project.pages.QuarkusNewProjectFirstPage;
 import org.jboss.tools.intellij.quarkus.fixtures.dialogs.project.pages.QuarkusNewProjectSecondPage;
@@ -112,12 +111,8 @@ private void createQuarkusProject(RemoteRobot remoteRobot, String projectName, B
         newProjectDialogWizard.next();
         newProjectDialogWizard.find(QuarkusNewProjectThirdPage.class, Duration.ofSeconds(10)); // wait for third page to be loaded
         newProjectDialogWizard.next();
-        try {
-            Thread.sleep(1000L);
-        } catch (InterruptedException e) {
-            Thread.interrupted();
-            throw new RuntimeException(e);
-        }
+
+        waitForIgnoringError(Duration.ofMillis(1000L),() -> remoteRobot.callJs("true"));
 
         QuarkusNewProjectFinalPage quarkusNewProjectFinalPage = newProjectDialogWizard.find(QuarkusNewProjectFinalPage.class, Duration.ofSeconds(10));
         quarkusNewProjectFinalPage.setProjectName(projectName);
@@ -136,7 +131,6 @@ private void createQuarkusProject(RemoteRobot remoteRobot, String projectName, B
         quarkusNewProjectFinalPage.setProjectLocation(QUARKUS_PROJECT_LOCATION);
 
         newProjectDialogWizard.finish();
-        ScreenshotUtils.takeScreenshot(remoteRobot);
 
         minimizeProjectImportPopupIfItAppears();