chore: fix integration tests

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

Author: sbouchet

.github/workflows/ci.yml

@@ -29,11 +29,8 @@ jobs:
           name: prInfo
           path: prInfo/
 
-  mainidewindow_idestatusbar_screenshot:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+  run_on_linux:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
@@ -42,216 +39,99 @@ jobs:
           java-version: 17
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          sleep 10
-          cd src/test-project
-          mkdir -p build/reports
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.idestatusbar.*
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.mainidewindow.idestatusbar.*
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
-        run: |
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.mainidewindow.idestatusbar.*
-        if: runner.os == 'macOS'
-      - name: Archiving tests reports
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-mainidewindow-idestatusbar-test-reports
-          path: src/test-project/build/reports/tests/*
-        if: always()
-      - name: Archiving screenshots
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-mainidewindow-idestatusbar-screenshots
-          path: src/test-project/build/screenshots/*
-        if: always()
-      - name: Archiving StepLogger logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-mainidewindow-idestatusbar-steplogger-logs
-          path: src/test-project/build/test-results/*
-        if: always()
-
-  dialogs_information_settings:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 11 # Java 11 is only used for test NewProjectDialogTest/setProjectSdkIfAvailableTest
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
+      - name: Prepare build
         run: |
           cd src/test-project
+          mkdir -p build/reports
           chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
-        if: runner.os == 'macOS'
+      - name: Run mainidewindow_idestatusbar_screenshot integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.idestatusbar.*
+      - name: Run dialogs_information_settings integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
+      - name: Run dialogs_project_manipulation integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
+      - name: Run dialogs integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
+      - name: Run mainidewindow-menubar integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
+      - name: Run mainidewindow-toolwindowspane integration tests
+        run: xvfb-run --server-args="-screen 0 1920x1080x24" ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
       - name: Archiving tests reports
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-dialogs-information-settings-test-reports
+          name: linux-test-reports
           path: src/test-project/build/reports/tests/*
         if: always()
       - name: Archiving screenshots
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-dialogs-information-settings-screenshots
+          name: linux-screenshots
           path: src/test-project/build/screenshots/*
+          if-no-files-found: ignore
         if: always()
       - name: Archiving StepLogger logs
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-dialogs-information-settings-steplogger-logs
+          name: linux-steplogger-logs
           path: src/test-project/build/test-results/*
         if: always()
 
-  dialogs_project_manipulation:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
+  run_on_windows:
+    runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11 # Java 11 is only used for test NewProjectDialogTest/setProjectSdkIfAvailableTest
-        uses: actions/setup-java@v4
-        with:
-          java-version: 11
-          distribution: 'temurin'
-          cache: 'gradle'
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
-        run: |
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
-        if: runner.os == 'macOS'
-      - name: Archiving tests reports
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-dialogs-project-manipulation-test-reports
-          path: src/test-project/build/reports/tests/*
-        if: always()
-      - name: Archiving screenshots
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-dialogs-project-manipulation-screenshots
-          path: src/test-project/build/screenshots/*
-        if: always()
-      - name: Archiving StepLogger logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ matrix.os }}-dialogs-project-manipulation-steplogger-logs
-          path: src/test-project/build/test-results/*
-        if: always()
-
-  dialogs:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 11 # Java 11 is only used for test NewProjectDialogTest/setProjectSdkIfAvailableTest
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
-        run: |
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
-        if: runner.os == 'macOS'
+      - name: Run mainidewindow_idestatusbar_screenshot integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.idestatusbar.*
+      - name: Run dialogs_information_settings integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
+      - name: Run dialogs_project_manipulation integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
+      - name: Run dialogs integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
+      - name: Run mainidewindow-menubar integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
+      - name: Run mainidewindow-toolwindowspane integration tests
+        run: ./gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
       - name: Archiving tests reports
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-dialogs-test-reports
+          name: windows-test-reports
           path: src/test-project/build/reports/tests/*
         if: always()
       - name: Archiving screenshots
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-dialogs-screenshots
+          name: windows-screenshots
           path: src/test-project/build/screenshots/*
+          if-no-files-found: ignore
         if: always()
       - name: Archiving StepLogger logs
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-dialogs-steplogger-logs
+          name: windows-steplogger-logs
           path: src/test-project/build/test-results/*
         if: always()
 
-  mainidewindow-menubar:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-
+  run_on_macos:
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
@@ -260,95 +140,40 @@ jobs:
           java-version: 17
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
-        run: |
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
-        if: runner.os == 'macOS'
-      - name: Archiving tests reports
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ runner.os }}-mainidewindow-menubar-test-reports
-          path: src/test-project/build/reports/tests/*
-        if: always()
-      - name: Archiving screenshots
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ runner.os }}-mainidewindow-menubar-screenshots
-          path: src/test-project/build/screenshots/*
-        if: always()
-      - name: Archiving StepLogger logs
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ runner.os }}-mainidewindow-menubar-steplogger-logs
-          path: src/test-project/build/test-results/*
-        if: always()
-
-
-  mainidewindow-toolwindowspane:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK 11 # Java 11 is only used for test NewProjectDialogTest/setProjectSdkIfAvailableTest
         uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 11
           distribution: 'temurin'
           cache: 'gradle'
-      - name: Run integration tests on Linux
-        run: |
-          export DISPLAY=:99.0
-          Xvfb -ac :99 -screen 0 1920x1080x24 &
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
-        if: runner.os == 'Linux'
-      - name: Run integration tests on Windows
-        run: |
-          cd src\test-project
-          chmod +x gradlew.bat
-          .\gradlew.bat integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
-        if: runner.os == 'Windows'
-      - name: Run integration tests on MacOS
-        run: |
-          cd src/test-project
-          chmod +x gradlew
-          ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
-        if: runner.os == 'macOS'
+      - name: Run mainidewindow_idestatusbar_screenshot integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.utils.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.idestatusbar.*
+      - name: Run dialogs_information_settings integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.information.* --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.settings.*
+      - name: Run dialogs_project_manipulation integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.project_manipulation.*
+      - name: Run dialogs integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.dialogs.FlatWelcomeFrameTest
+      - name: Run mainidewindow-menubar integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.menubar.*
+      - name: Run mainidewindow-toolwindowspane integration tests
+        run: ./gradlew integrationUITest --warning-mode none --tests com.redhat.devtools.intellij.commonuitest.fixtures.test.mainidewindow.toolwindowspane.*
       - name: Archiving tests reports
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-mainidewindow-toolwindowspane-test-reports
+          name: macos-test-reports
           path: src/test-project/build/reports/tests/*
         if: always()
       - name: Archiving screenshots
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-mainidewindow-toolwindowspane-screenshots
+          name: macos-screenshots
           path: src/test-project/build/screenshots/*
+          if-no-files-found: ignore
         if: always()
       - name: Archiving StepLogger logs
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ runner.os }}-mainidewindow-toolwindowspane-steplogger-logs
+          name: macos-steplogger-logs
           path: src/test-project/build/test-results/*
         if: always()