fix: fix failed tests screenshot comment

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

Author: sbouchet

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

@@ -21,7 +21,6 @@
 import com.intellij.remoterobot.fixtures.JListFixture;
 import com.intellij.remoterobot.fixtures.JPopupMenuFixture;
 import com.intellij.remoterobot.fixtures.JTextFieldFixture;
-import com.intellij.remoterobot.fixtures.dataExtractor.RemoteText;
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import com.redhat.devtools.intellij.commonuitest.UITestRunner;
 import com.redhat.devtools.intellij.commonuitest.utils.constants.XPathDefinitions;
@@ -47,8 +46,8 @@
 @DefaultXpath(by = "MyDialog type", xpath = XPathDefinitions.DIALOG_ROOT_PANE)
 @FixtureName(name = "New Project Dialog")
 public class NewProjectFirstPage extends AbstractNewProjectFinalPage {
-    private final RemoteRobot remoteRobot;
-    private int projectSdkItemsCount = -1;
+    protected final RemoteRobot remoteRobot;
+    private boolean isProjectSdkItemsLoaded = false;
     private final int ideaVersion;
 
     public NewProjectFirstPage(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent remoteComponent) {
@@ -184,12 +183,8 @@ public void setProjectSdkIfAvailable(String targetSdkName) {
     private kotlin.Pair<Boolean, CommonContainerFixture> didProjectSdkListLoadAllItems() {
         return step("Test whether the 'Project SDK' list has loaded all items", () -> {
             CommonContainerFixture parentFixture = remoteRobot.find(CommonContainerFixture.class, byXpath(XPathDefinitions.MY_DIALOG));
-            JPopupMenuFixture projectSdkList = parentFixture.jPopupMenus(byXpath(XPathDefinitions.HEAVY_WEIGHT_WINDOW)).get(0); // issue https://github.com/JetBrains/intellij-ui-test-robot/issues/104
-            List<RemoteText> sdkItems = projectSdkList.findAllText();
-            int currentSdkItemsCount = sdkItems.size();
-
-            if ((projectSdkItemsCount == -1) || (projectSdkItemsCount != currentSdkItemsCount)) {
-                projectSdkItemsCount = currentSdkItemsCount;
+            if (!isProjectSdkItemsLoaded) {
+                isProjectSdkItemsLoaded = true;
                 return new kotlin.Pair<>(false, parentFixture);
             }
             return new kotlin.Pair<>(true, parentFixture);

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/idestatusbar/IdeStatusBar.java

@@ -46,7 +46,7 @@ public IdeStatusBar(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent r
      * @return fixture for the InlineProgressPanel
      */
     public ComponentFixture inlineProgressPanel() {
-        return find(ComponentFixture.class, byXpath(XPathDefinitions.INLINE_PROGRESS_PANEL));
+        return find(ComponentFixture.class, byXpath(XPathDefinitions.INLINE_PROGRESS_PANEL), Duration.ofSeconds(5));
     }
 
     /**

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/AbstractToolWinPane.java

@@ -114,16 +114,8 @@ protected void togglePane(String label, Class<? extends Fixture> fixtureClass, b
     }
 
     private boolean isPaneOpened(Class<? extends Fixture> fixtureClass) {
-        AbstractToolWinPane toolWinPane;
-        if (UITestRunner.getIdeaVersionInt() >= 20221) {
-            toolWinPane = remoteRobot.find(ToolWindowPane.class, Duration.ofSeconds(10));
-        } else {
-            toolWinPane = remoteRobot.find(ToolWindowsPane.class, Duration.ofSeconds(10));
-        }
-
         try {
-            toolWinPane.find(fixtureClass, Duration.ofSeconds(10));
-            return true;
+            return find(fixtureClass, Duration.ofSeconds(10)).isShowing();
         } catch (WaitForConditionTimeoutException e) {
             return false;
         }

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/mainidewindow/toolwindowspane/buildtoolpane/MavenBuildToolPane.java

@@ -59,7 +59,6 @@ public void reloadAllMavenProjects() {
     public void collapseAll() {
         if (UITestRunner.getIdeaVersionInt() >= 20242) {
             actionButton(byXpath(XPathDefinitions.MY_ICON_COLLAPSE_ALL_2024_2), Duration.ofSeconds(2)).click();
-
         } else {
             actionButton(byXpath(XPathDefinitions.MY_ICON_COLLAPSE_ALL_FOR), Duration.ofSeconds(2)).click();
         }

src/main/java/com/redhat/devtools/intellij/commonuitest/utils/testextension/ScreenshotAfterTestFailExtension.java

@@ -52,8 +52,10 @@ public void afterTestExecution(ExtensionContext extensionContext) {
                 LOGGER.log(Level.SEVERE, "Can't take a screenshot, remoteRobot is null!");
                 return;
             }
+            String testClass = extensionContext.getRequiredTestClass().getName();
+            String testMethod = extensionContext.getRequiredTestMethod().getName();
             step("Take a screenshot after a test has failed",
-                () -> ScreenshotUtils.takeScreenshot(remoteRobot)
+                () -> ScreenshotUtils.takeScreenshot(remoteRobot, testClass+"_"+testMethod)
             );
             step("Return to the 'Welcome Frame' dialog",
                 () -> cleanAfterTestFail(remoteRobot)

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/toolwindowspane/BuildViewTest.java

@@ -44,7 +44,7 @@ static void prepareProject() {
             toolWinPane = remoteRobot.find(ToolWindowsPane.class, Duration.ofSeconds(10));
         }
         toolWinPane.openMavenBuildToolPane();
-        toolWinPane.find(MavenBuildToolPane.class, Duration.ofSeconds(10)).buildProject("install");
+        toolWinPane.find(MavenBuildToolPane.class, Duration.ofSeconds(10)).buildProject("verify");
     }
 
     @AfterAll

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/toolwindowspane/ToolWindowsPaneMavenTest.java

@@ -56,6 +56,6 @@ void createToolWindowsPaneFixture() {
     void mavenBuildTest() {
         toolWinPane.openMavenBuildToolPane();
         MavenBuildToolPane mavenBuildToolPane = toolWinPane.find(MavenBuildToolPane.class, Duration.ofSeconds(10));
-        mavenBuildToolPane.buildProject("install");
+        mavenBuildToolPane.buildProject("verify");
     }
 }

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/mainidewindow/toolwindowspane/buildtoolpane/MavenBuildToolPaneTest.java

@@ -55,7 +55,7 @@ static void closeCurrentProject() {
 
     @Test
     void buildProjectTest() {
-        mavenBuildToolPane.buildProject("install");
+        mavenBuildToolPane.buildProject("verify");
         boolean isBuildSuccessful = toolWinPane.find(BuildView.class, Duration.ofSeconds(10)).isBuildSuccessful();
         assertTrue(isBuildSuccessful, "The build should be successful but is not.");
     }