fix: fix maven import

Signed-off-by: Stephane Bouchet <sbouchet@redhat.com>

Author: sbouchet

.github/workflows/IJ-latest.yml

@@ -33,9 +33,9 @@ jobs:
       - name: Build with Gradle
         run: |
           LATEST_EAP_SNAPSHOT=$(./gradlew printProductsReleases | grep 'IC-' | head -n 1 | cut -d'-' -f2)
+          echo "building using latest EAP version $LATEST_EAP_SNAPSHOT"
           ./gradlew check --continue -PplatformVersion=$LATEST_EAP_SNAPSHOT
 
-
       - name: Collect Tests Result
         uses: actions/upload-artifact@v4
         if: always()

.github/workflows/itests.yml

@@ -36,31 +36,32 @@ jobs:
         path: build/screenshots/
         if-no-files-found: 'ignore'
       if: always()
-      
-  build-macos:
-    runs-on: macos-latest
 
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up JDK 17
-      uses: actions/setup-java@v4
-      with:
-        distribution: temurin
-        java-version: 17
-    - name: Run integration tests
-      run: ./gradlew integrationTest
-    - uses: actions/upload-artifact@v4
-      with:
-        name: ${{ runner.os }}-integration-test-reports
-        path: build/reports/tests/integrationTest
-      if: always()
-    - name: Archiving screenshots
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ runner.os }}-screenshots
-        path: build/screenshots/
-        if-no-files-found: 'ignore'
-      if: always()
+# disabled. see https://github.com/redhat-developer/intellij-quarkus/issues/1350
+#  build-macos:
+#    runs-on: macos-latest
+#
+#    steps:
+#    - uses: actions/checkout@v4
+#    - name: Set up JDK 17
+#      uses: actions/setup-java@v4
+#      with:
+#        distribution: temurin
+#        java-version: 17
+#    - name: Run integration tests
+#      run: ./gradlew integrationTest
+#    - uses: actions/upload-artifact@v4
+#      with:
+#        name: ${{ runner.os }}-integration-test-reports
+#        path: build/reports/tests/integrationTest
+#      if: always()
+#    - name: Archiving screenshots
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: ${{ runner.os }}-screenshots
+#        path: build/screenshots/
+#        if-no-files-found: 'ignore'
+#      if: always()
 
   build-windows:
     runs-on: windows-latest

build.gradle.kts

@@ -57,10 +57,8 @@ sourceSets {
         java.srcDir("intellij-community/platform/external-system-impl/testSrc")
         java.srcDir("intellij-community/platform/lang-impl/testSources")
         java.srcDir("intellij-community/platform/testFramework/extensions/src")
-        java.srcDir("intellij-community/plugins/gradle/src")
         java.srcDir("intellij-community/plugins/gradle/testSources")
         java.srcDir("intellij-community/plugins/gradle/tooling-extension-impl/testSources")
-        java.srcDir("intellij-community/plugins/maven/src/test/java")
         java.srcDir("intellij-community/plugins/maven/testFramework/src")
         resources.srcDir("src/test/resources")
     }
@@ -69,7 +67,7 @@ sourceSets {
         java.srcDir("src/it/java")
         resources.srcDir("src/it/resources")
         compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.test.get().compileClasspath
-        runtimeClasspath += output + compileClasspath + sourceSets.test.get().runtimeClasspath + sourceSets.test.get().runtimeClasspath
+        runtimeClasspath += output + compileClasspath + sourceSets.test.get().runtimeClasspath
     }
 }
 
@@ -102,7 +100,6 @@ dependencies {
         println("bundledPlugins: $platformBundledPlugins")
         println("marketplacePlugins: $platformPlugins")
         pluginVerifier()
-        instrumentationTools()
         testFramework(TestFrameworkType.Plugin.Java)
     }
 
@@ -151,21 +148,7 @@ dependencies {
         builtBy("copyDeps")
     })
 
-    implementation(libs.annotations) // to build against platform <= 2023.2 and gradle intellij plugin > 2.0
-
-    // And now for some serious HACK!!!
-    // Starting with 2023.1, all gradle tests fail importing projects with a:
-    // com.intellij.openapi.externalSystem.model.ExternalSystemException: Unable to load class 'org.codehaus.plexus.logging.Logger'
-    // Hence adding a jar containing the missing class, to the test classpath
-    // The version matches the jar found in the IJ version used to compile the project
-    // This is so wrong/ridiculous!
-    testImplementation("org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.4")
-
-    testImplementation("org.assertj:assertj-core:3.19.0")
-
-    testImplementation("org.opentest4j:opentest4j:1.3.0")
-
-    testImplementation("junit:junit:4.13.2")
+    testImplementation(libs.junit)
 }
 
 // Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
@@ -251,17 +234,13 @@ val integrationTest by intellijPlatformTesting.testIde.registering {
         classpath = sourceSets["integrationTest"].runtimeClasspath
         outputs.upToDateWhen { false }
         mustRunAfter(tasks["test"])
-        systemProperty ("debug-retrofit", "enable")
-    }
-    plugins {
-        robotServerPlugin("0.11.23")
     }
 
     dependencies {
-        testImplementation("com.redhat.devtools.intellij:intellij-common-ui-test-library:0.4.4-SNAPSHOT")
-        testImplementation("com.squareup.retrofit2:retrofit:2.11.0")
-        testImplementation("com.squareup.retrofit2:converter-gson:2.11.0")
-        testImplementation("com.squareup.okhttp3:logging-interceptor:4.12.0")
+        testRuntimeOnly(libs.junit.jupiter.engine)
+        testImplementation(libs.junit.platform.launcher)
+        testImplementation(libs.junit.jupiter.api)
+        testImplementation(libs.devtools.common.ui.test)
     }
 }
 
@@ -344,7 +323,6 @@ tasks {
 // https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-tasks.html#runIdeForUiTests
 val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
     task {
-        systemProperty ("debug-retrofit", "enable")
         jvmArgumentProviders += CommandLineArgumentProvider {
             listOf(
                 "-Drobot-server.port=8580",
@@ -355,7 +333,7 @@ val runIdeForUiTests by intellijPlatformTesting.runIde.registering {
         }
     }
     plugins {
-        robotServerPlugin("0.11.23")
+        robotServerPlugin()
     }
 }
 

gradle/libs.versions.toml

@@ -1,16 +1,22 @@
 [versions]
 # libraries
-annotations = "24.0.1"
+junit = "4.13.2"
+junit-platform = "1.11.3"
+junit-jupiter = "5.11.3"
+devtools-common-ui-test = "0.4.4-SNAPSHOT"
 
 # plugins
 testlogger = "4.0.0"
 kotlin = "2.0.20"
 changelog = "2.2.0"
 gradleIntelliJPlugin = "2.2.1"
 
-
 [libraries]
-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+junit = { group = "junit", name = "junit", version.ref = "junit" }
+junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junit-platform" }
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter" }
+devtools-common-ui-test = { group = "com.redhat.devtools.intellij", name = "intellij-common-ui-test-library", version.ref = "devtools-common-ui-test" }
 
 [plugins]
 changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }

src/it/java/org/jboss/tools/intellij/quarkus/fixtures/dialogs/project/pages/QuarkusNewProjectFirstPage.java

@@ -12,12 +12,18 @@
 
 import com.intellij.remoterobot.RemoteRobot;
 import com.intellij.remoterobot.data.RemoteComponent;
+import com.intellij.remoterobot.fixtures.ComboBoxFixture;
 import com.intellij.remoterobot.fixtures.DefaultXpath;
 import com.intellij.remoterobot.fixtures.FixtureName;
+import com.redhat.devtools.intellij.commonuitest.UITestRunner;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.pages.NewProjectFirstPage;
 import org.jboss.tools.intellij.quarkus.utils.XPathDefinitions;
 import org.jetbrains.annotations.NotNull;
 
+import java.time.Duration;
+
+import static com.intellij.remoterobot.search.locators.Locators.byXpath;
+
 /**
  * New project dialog fixture
  *
@@ -29,4 +35,12 @@ public class QuarkusNewProjectFirstPage extends NewProjectFirstPage {
     public QuarkusNewProjectFirstPage(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
         super(remoteRobot, remoteComponent);
     }
+
+    @Override
+    public ComboBoxFixture getProjectJdkComboBox() {
+        if (UITestRunner.getIdeaVersionInt() >= 20241) {
+            return comboBox(byXpath(XPathDefinitions.PROJECT_SDK_COMBOBOX_PROJECT_WIZARD), Duration.ofSeconds(10));
+        }
+        throw new UnsupportedOperationException("Get Project SDK ComboBox is not supported yet for IDEA version " + UITestRunner.getIdeaVersionInt());
+    }
 }

src/it/java/org/jboss/tools/intellij/quarkus/tests/AbstractQuarkusTest.java

@@ -26,14 +26,14 @@
  * @author zcervink@redhat.com
  */
 @ExtendWith(ScreenshotAfterTestFailExtension.class)
-abstract public class AbstractQuarkusTest {
+public abstract class AbstractQuarkusTest {
     protected static RemoteRobot remoteRobot;
     private static boolean intelliJHasStarted = false;
 
     @BeforeAll
     protected static void startIntelliJ() {
         if (!intelliJHasStarted) {
-            remoteRobot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2023_2, 8580);
+            remoteRobot = UITestRunner.runIde(IntelliJVersion.COMMUNITY_V_2024_3, 8580);
             intelliJHasStarted = true;
             Runtime.getRuntime().addShutdownHook(new CloseIntelliJBeforeQuit());
 

src/it/java/org/jboss/tools/intellij/quarkus/tests/BasicTest.java

@@ -11,25 +11,18 @@
 package org.jboss.tools.intellij.quarkus.tests;
 
 import com.intellij.remoterobot.RemoteRobot;
-import com.intellij.remoterobot.fixtures.CommonContainerFixture;
 import com.intellij.remoterobot.fixtures.ComponentFixture;
-import com.intellij.remoterobot.fixtures.JButtonFixture;
 import com.intellij.remoterobot.fixtures.JTextFieldFixture;
-import com.intellij.remoterobot.fixtures.JTreeFixture;
-import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
-import com.redhat.devtools.intellij.commonuitest.UITestRunner;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.FlatWelcomeFrame;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.project.NewProjectDialogWizard;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.MainIdeWindow;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.BuildView;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowPane;
-import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowsPane;
 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.constants.ProjectLocation;
 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;
@@ -48,8 +41,6 @@
 import java.time.Duration;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
-import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitFor;
-import static com.intellij.remoterobot.utils.RepeatUtilsKt.waitForIgnoringError;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
@@ -76,7 +67,7 @@ public void createBuildQuarkusMavenTest() {
         ToolWindowPane toolWindowPane = remoteRobot.find(ToolWindowPane.class, Duration.ofSeconds(10));
         toolWindowPane.openMavenBuildToolPane();
         MavenBuildToolPane mavenBuildToolPane = toolWindowPane.find(MavenBuildToolPane.class, Duration.ofSeconds(10));
-        mavenBuildToolPane.buildProject("install");
+        mavenBuildToolPane.buildProject("verify");
         boolean isBuildSuccessful = toolWindowPane.find(BuildView.class, Duration.ofSeconds(10)).isBuildSuccessful();
         assertTrue(isBuildSuccessful, "The build should be successful but is not.");
     }
@@ -99,29 +90,27 @@ private void createQuarkusProject(RemoteRobot remoteRobot, String projectName, B
         NewProjectDialogWizard newProjectDialogWizard = remoteRobot.find(NewProjectDialogWizard.class, Duration.ofSeconds(10));
         QuarkusNewProjectFirstPage quarkusNewProjectFirstPage = newProjectDialogWizard.find(QuarkusNewProjectFirstPage.class, Duration.ofSeconds(10));
         quarkusNewProjectFirstPage.selectNewProjectType("Quarkus");
-
         if (endpointURLType == EndpointURLType.CUSTOM) {
             ComponentFixture customEndpointURLJBRadioButton = remoteRobot.findAll(ComponentFixture.class, byXpath(XPathDefinitions.CUSTOM_ENDPOINT_URL_RADIO_BUTTON)).get(0);
             customEndpointURLJBRadioButton.click();
             JTextFieldFixture customEndpointURLJTextField = remoteRobot.findAll(JTextFieldFixture.class, byXpath(XPathDefinitions.CUSTOM_ENDPOINT_URL_TEXT_FIELD)).get(0);
             customEndpointURLJTextField.setText("https://code.quarkus.io");
         }
+        quarkusNewProjectFirstPage.setProjectSdkIfAvailable(JAVA_VERSION_FOR_QUARKUS_PROJECT);
         newProjectDialogWizard.next();
 
         QuarkusNewProjectSecondPage quarkusNewProjectSecondPage = newProjectDialogWizard.find(QuarkusNewProjectSecondPage.class, Duration.ofSeconds(10));
         quarkusNewProjectSecondPage.setBuildTool(buildTool);
         quarkusNewProjectSecondPage.setJavaVersion(JAVA_VERSION_FOR_QUARKUS_PROJECT);
         newProjectDialogWizard.next();
+
         newProjectDialogWizard.find(QuarkusNewProjectThirdPage.class, Duration.ofSeconds(10)); // wait for third page to be loaded
         newProjectDialogWizard.next();
 
-        waitForIgnoringError(Duration.ofMillis(1000L),() -> remoteRobot.callJs("true"));
-
         QuarkusNewProjectFinalPage quarkusNewProjectFinalPage = newProjectDialogWizard.find(QuarkusNewProjectFinalPage.class, Duration.ofSeconds(10));
         quarkusNewProjectFinalPage.setProjectName(projectName);
-
-        String QUARKUS_PROJECT_LOCATION = ProjectLocation.PROJECT_LOCATION + File.separator + projectName;
-        Path quarkusProjectDir = Paths.get(QUARKUS_PROJECT_LOCATION);
+        String quarkusProjectLocation = ProjectLocation.PROJECT_LOCATION + File.separator + projectName;
+        Path quarkusProjectDir = Paths.get(quarkusProjectLocation);
         boolean doesProjectDirExists = Files.exists(quarkusProjectDir);
         if (!doesProjectDirExists) {
             try {
@@ -130,52 +119,14 @@ private void createQuarkusProject(RemoteRobot remoteRobot, String projectName, B
                 throw new RuntimeException(e);
             }
         }
-
-        quarkusNewProjectFinalPage.setProjectLocation(QUARKUS_PROJECT_LOCATION);
-
+        quarkusNewProjectFinalPage.setProjectLocation(quarkusProjectLocation);
         newProjectDialogWizard.finish();
 
-        //minimizeProjectImportPopupIfItAppears();
-
         IdeStatusBar ideStatusBar = remoteRobot.find(IdeStatusBar.class, Duration.ofSeconds(10));
-        waitFor(Duration.ofSeconds(30), Duration.ofSeconds(3), "The project import did not finish in 5 minutes.", this::didProjectImportFinish);
+        ideStatusBar.waitUntilProjectImportIsComplete();
 
-        //ideStatusBar.waitUntilProjectImportIsComplete();
-        ScreenshotUtils.takeScreenshot(remoteRobot);
         MainIdeWindow mainIdeWindow = remoteRobot.find(MainIdeWindow.class, Duration.ofSeconds(5));
         mainIdeWindow.maximizeIdeWindow();
-        ideStatusBar.waitUntilAllBgTasksFinish(500);
     }
 
-    private boolean didProjectImportFinish() {
-        try {
-            remoteRobot.find(ComponentFixture.class, byXpath(com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions.ENGRAVED_LABEL), Duration.ofSeconds(1));
-        } catch (WaitForConditionTimeoutException e) {
-            return true;
-        }
-        return false;
-    }
-
-    private void minimizeProjectImportPopupIfItAppears() {
-        try {
-            waitForIgnoringError(Duration.ofSeconds(30), Duration.ofMillis(200), "Close the project import popup if it appears...", () -> {
-                remoteRobot.find(JButtonFixture.class, byXpath(XPathDefinitions.PROJECT_IMPORT_POPUP_MINIMIZE_BUTTON)).click();
-                return true;
-            });
-        } catch (Exception e) {
-            //suppress non-existing popup timeout
-        }
-    }
-
-    private void buildGradleProject(GradleBuildToolPane gradleBuildToolPane) {
-        gradleBuildToolPane.find(JTreeFixture.class, JTreeFixture.Companion.byType(), Duration.ofSeconds(30));
-        gradleBuildToolPane.expandAll();
-        gradleBuildToolPane.gradleTaskTree().findAllText("build").get(1).doubleClick();
-        if (UITestRunner.getIdeaVersionInt() >= 20221) {
-            remoteRobot.find(ToolWindowPane.class).find(BuildView.class).waitUntilBuildHasFinished();
-        } else {
-            remoteRobot.find(ToolWindowsPane.class).find(BuildView.class).waitUntilBuildHasFinished();
-        }
-        remoteRobot.find(IdeStatusBar.class, Duration.ofSeconds(10)).waitUntilAllBgTasksFinish();
-    }
 }

src/it/java/org/jboss/tools/intellij/quarkus/utils/XPathDefinitions.java

@@ -11,17 +11,27 @@
 
 package org.jboss.tools.intellij.quarkus.utils;
 
+import org.intellij.lang.annotations.Language;
+
 /**
  * XPath definitions
  *
  * @author zcervink@redhat.com
  */
 public class XPathDefinitions {
-    public static final String PROJECT_IMPORT_POPUP_MINIMIZE_BUTTON = "//div[@text='Background']";
+    @Language("XPath")
     public static final String DIALOG_ROOT_PANE = "//div[@class='DialogRootPane']";
+    @Language("XPath")
     public static final String CUSTOM_ENDPOINT_URL_RADIO_BUTTON = "//div[@accessiblename='Custom:' and @class='JBRadioButton' and @text='Custom:']";
+    @Language("XPath")
     public static final String CUSTOM_ENDPOINT_URL_TEXT_FIELD = "//div[@class='BorderlessTextField']";
+    @Language("XPath")
     public static final String SET_BUILD_TOOL_COMBO_BOX = "//div[@accessiblename='Tool:' and @class='ComboBox']";
+    @Language("XPath")
     public static final String PROJECT_SETTINGS_COMPONENTS = "//div[@class='NamePathComponent']/*";
+    @Language("XPath")
     public static final String JAVA_VERSION_COMBO_BOX = "//div[@accessiblename='Java version:' and @class='ComboBox']";
+    @Language("XPath")
+    public static final String PROJECT_SDK_COMBOBOX_PROJECT_WIZARD = "//div[@class='JdkComboBox']";
+
 }