chore: fix integration tests

Signed-off-by: Stephane Bouchet <[email protected]>

Author: sbouchet

.github/workflows/sonar.yml

@@ -38,9 +38,9 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
           if [ '${{github.event.workflow_run.event}}' == 'pull_request' ]; then
-            PR_NUMBER=$(<build/PR)
-            BASE_REF=$(<build/base_ref)
-            HEAD_REF=$(<build/head_ref)
+            PR_NUMBER=$(<prInfo/PR)
+            BASE_REF=$(<prInfo/base_ref)
+            HEAD_REF=$(<prInfo/head_ref)
             ./gradlew sonarqube -Dsonar.pullrequest.base=$BASE_REF -Dsonar.pullrequest.branch=$HEAD_REF -Dsonar.pullrequest.key=$PR_NUMBER -Dsonar.pullrequest.provider=GitHub -Dsonar.pullrequest.github.repository=${{github.repository}}
           else
             ./gradlew sonarqube

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/project/pages/NewProjectFirstPage.java

@@ -29,8 +29,10 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Duration;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
-import java.util.Optional;
+import java.util.Map;
 
 import static com.intellij.remoterobot.search.locators.Locators.byXpath;
 import static com.intellij.remoterobot.stepsProcessing.StepWorkerKt.step;
@@ -154,8 +156,15 @@ public void setProjectSdkIfAvailable(String targetSdkName) {
             CommonContainerFixture parentFixture = waitFor(Duration.ofSeconds(20), Duration.ofSeconds(2), "Wait for the 'Project SDK' list to finish loading all items.", "The project JDK list did not load all items in 20 seconds.", this::didProjectSdkListLoadAllItems);
             JPopupMenuFixture projectSdkList = parentFixture.jPopupMenus(byXpath(XPathDefinitions.HEAVY_WEIGHT_WINDOW)).get(0); // issue https://github.com/JetBrains/intellij-ui-test-robot/issues/104
             List<String> sdkItems = projectSdkList.jList().collectItems();
-            Optional<String> item = sdkItems.stream().filter(s -> s.startsWith(targetSdkName)).findFirst();
-            item.ifPresent(s -> projectSdkList.jList().clickItem(s, true));
+            Map<String, String> foundItems = new HashMap<>();
+            sdkItems.forEach(item ->
+                Arrays.stream(item.split(" ")).filter(s ->
+                    s.startsWith(targetSdkName)).findFirst().ifPresent(s -> foundItems.put(s, item))
+            );
+            if (!foundItems.isEmpty()) {
+                String label = foundItems.values().stream().findFirst().get();
+                projectSdkList.jList().clickItem(label, true);
+            }
         });
     }