chore: fix integration tests

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

Author: sbouchet

.github/workflows/ci.yml

@@ -88,6 +88,14 @@ jobs:
           name: linux-steplogger-logs
           path: src/test-project/build/test-results/*
         if: always()
+      - name: Archiving coverage for sonar
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: sonar-coverage
+          path: |
+            src/test-project/build/test-results/**/*.xml
+            src/test-project/build/jacoco/
 
   run_on_windows:
     runs-on: windows-latest

.github/workflows/sonar.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: reports
-          pattern: -test-reports
+          pattern: sonar-coverage
           github-token: ${{ secrets.GITHUB_TOKEN }}
           run-id: ${{github.event.workflow_run.id}}
       - name: Download PrInfo
@@ -37,13 +37,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
+          mkdir build
+          ls reports
+          cp -r reports/* build/
           if [ '${{github.event.workflow_run.event}}' == 'pull_request' ]; then
             PR_NUMBER=$(<prInfo/PR)
             BASE_REF=$(<prInfo/base_ref)
             HEAD_REF=$(<prInfo/head_ref)
-            ./gradlew build sonar -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}}
+            ./gradlew jacocoTestReport sonar -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 build sonar
+            ./gradlew jacocoTestReport sonar
           fi
         shell: bash
 

build.gradle.kts

@@ -46,6 +46,7 @@ tasks {
             property("sonar.organization", "redhat-developer")
             property("sonar.host.url", "https://sonarcloud.io")
             property("sonar.junit.reportsPath", layout.buildDirectory.dir("test-results").get().asFile.absolutePath)
+            property("sonar.gradle.skipCompile", "true")
         }
     }
 }

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

@@ -167,7 +167,7 @@ public void setProjectSdkIfAvailable(String targetSdkName) {
                 String label = foundItems.values().stream().findFirst().get();
                 projectSdkList.jList().clickItem(label, true);
                 // wait for 'resolving JDK' progressmonitor to end
-                waitForIgnoringError(Duration.ofSeconds(5), () -> remoteRobot.callJs("true"));
+                waitForIgnoringError(Duration.ofSeconds(10), () -> remoteRobot.callJs("true"));
             } else {
                 ScreenshotUtils.takeScreenshot(remoteRobot, "No SDK found starting with " + targetSdkName);
             }

src/test-project/build.gradle.kts

@@ -26,7 +26,6 @@ repositories {
 dependencies {
     intellijPlatform {
         create(IntelliJPlatformType.IntellijIdeaCommunity, platformVersion)
-        instrumentationTools()
     }
     testImplementation("com.redhat.devtools.intellij:intellij-common-ui-test-library")
     testImplementation("org.junit.platform:junit-platform-launcher:1.10.3")
@@ -44,6 +43,25 @@ tasks {
         from("idea_license_token/idea.key")
         into("build/idea-sandbox/config-uiTest")
     }
+
+    withType<Test> {
+        configure<JacocoTaskExtension> {
+            isIncludeNoLocationClasses = true
+            excludes = listOf("jdk.internal.*")
+        }
+    }
+
+    jacocoTestReport {
+        executionData.setFrom(fileTree(layout.buildDirectory).include("/jacoco/*.exec"))
+        classDirectories.setFrom(instrumentCode)
+        reports {
+            xml.required = true
+        }
+    }
+
+    jacocoTestCoverageVerification {
+        classDirectories.setFrom(instrumentCode)
+    }
 }
 
 val integrationUITestUltimate by intellijPlatformTesting.testIde.registering {