chore: fix sonar issues

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

Author: sbouchet

build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     id("java-library")
     id("maven-publish")
     alias(libs.plugins.gradleNexusPublishPlugin)
+    id("jacoco") // Code coverage
     alias(libs.plugins.sonarqube) // SonarQube
 }
 
@@ -40,6 +41,14 @@ tasks {
         useJUnitPlatform()
     }
 
+    jacocoTestReport {
+        executionData.setFrom(fileTree(layout.buildDirectory).include("/jacoco/*.exec"))
+        //classDirectories.setFrom(instrumentCode)
+        reports {
+            xml.required = true
+        }
+    }
+
     sonar {
         properties {
             property("sonar.projectKey", "redhat-developer_intellij-common-ui-test-library")

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

@@ -14,7 +14,6 @@
 import com.intellij.remoterobot.data.RemoteComponent;
 import com.intellij.remoterobot.fixtures.ComboBoxFixture;
 import com.intellij.remoterobot.fixtures.CommonContainerFixture;
-import com.intellij.remoterobot.fixtures.ContainerFixture;
 import com.intellij.remoterobot.fixtures.DefaultXpath;
 import com.intellij.remoterobot.fixtures.FixtureName;
 import com.intellij.remoterobot.fixtures.HeavyWeightWindowFixture;
@@ -167,10 +166,13 @@ public void setProjectSdkIfAvailable(String targetSdkName) {
                 String label = foundItems.values().stream().findFirst().get();
                 projectSdkList.jList().clickItem(label, true);
                 // wait for 'resolving JDK' progressmonitor to end
+                // TODO for now don't know what kind of dialog is the 'resolving' so just pausing thread
                 try {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
-                    throw new RuntimeException(e);
+                    ScreenshotUtils.takeScreenshot(remoteRobot, "interrupted while waiting for " + targetSdkName);
+                    /* Clean up whatever needs to be handled before interrupting  */
+                    Thread.currentThread().interrupt();
                 }
             } else {
                 ScreenshotUtils.takeScreenshot(remoteRobot, "No SDK found starting with " + targetSdkName);

src/main/java/com/redhat/devtools/intellij/commonuitest/utils/constants/XPathDefinitions.java

@@ -91,9 +91,11 @@ public class XPathDefinitions {
     @Language("XPath")
     public static final String MY_LIST = "//div[@class='MyList']";
     public static final String CODE_WITH_ME_JPANEL = "//div[@class='Wrapper'][.//div[@class='JBLabel']]//div[@class='JPanel']";
+    @Language("XPath")
     public static final String BREAD_CRUMBS = "//div[@class='Breadcrumbs']";
     @Language("XPath")
     public static final String EMPTY_PROJECT = "//div[@visible_text='Empty Project']";
+    @Language("XPath")
     public static final String SINGLE_HEIGHT_LABEL = "//div[@class='SingleHeightLabel']";
     public static final String COLLAPSIBLE_TITLED_SEPARATOR = "//div[@class='CollapsibleTitledSeparator']";
     public static final String COLLAPSIBLE_TITLED_SEPARATOR_NEW = "//div[@class='CollapsibleTitledSeparatorImpl']";

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/LibraryTestBase.java

@@ -38,7 +38,7 @@ public class LibraryTestBase {
     private static final int TEST_RUNNER_PORT = 8580;
 
     @BeforeAll
-    protected static void startIntelliJ() {
+    static void startIntelliJ() {
         if (!intelliJHasStarted) {
             ideaVersionInt = communityIdeaVersion.toInt();
             remoteRobot = UITestRunner.runIde(communityIdeaVersion, TEST_RUNNER_PORT);
@@ -52,7 +52,7 @@ protected static void startIntelliJ() {
     }
 
     @AfterAll
-    protected static void finishTestRun() {
+    static void finishTestRun() {
         FlatWelcomeFrame flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10));
         flatWelcomeFrame.clearExceptions();
         flatWelcomeFrame.clearWorkspace();

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/FlatWelcomeFrameTest.java

@@ -40,21 +40,21 @@ class FlatWelcomeFrameTest extends LibraryTestBase {
     private FlatWelcomeFrame flatWelcomeFrame;
 
     @AfterEach
-    public void cleanUp() {
+    void cleanUp() {
         flatWelcomeFrame.clearWorkspace();
         flatWelcomeFrame.clearExceptions();
     }
 
     @Test
-    public void createNewProjectLinkTest() {
+    void createNewProjectLinkTest() {
         flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10));
         flatWelcomeFrame.createNewProject();
         NewProjectDialogWizard newProjectDialogWizard = remoteRobot.find(NewProjectDialogWizard.class, Duration.ofSeconds(10));
         newProjectDialogWizard.cancel();
     }
 
     @Test
-    public void clearWorkspaceTest() {
+    void clearWorkspaceTest() {
         prepareWorkspace(PROJECT_NAME);
         flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10));
         flatWelcomeFrame.clearExceptions();
@@ -71,7 +71,7 @@ public void clearWorkspaceTest() {
     }
 
     @Test
-    public void clearExceptionsTest() {
+    void clearExceptionsTest() {
         prepareWorkspace(PROJECT_NAME);
         flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10));
         flatWelcomeFrame.clearExceptions();

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/CodeWithMeDialogTest.java

@@ -39,7 +39,7 @@ class CodeWithMeDialogTest extends LibraryTestBase {
     private static final boolean IDEA_VERSION_WITH_CWM_DIALOG_OPENED = ideaVersionInt >= 20212;
 
     @BeforeAll
-    public static void prepareProject() {
+    static void prepareProject() {
         if (IDEA_VERSION_WITH_CWM_DIALOG_OPENED) {
             NewProjectDialogWizard newProjectDialogWizard = openNewProjectDialogFromWelcomeDialog(remoteRobot);
             NewProjectFirstPage newProjectFirstPage = newProjectDialogWizard.find(NewProjectFirstPage.class, Duration.ofSeconds(10));
@@ -71,14 +71,14 @@ public static void prepareProject() {
     }
 
     @AfterAll
-    public static void closeCurrentProject() {
+    static void closeCurrentProject() {
         if (IDEA_VERSION_WITH_CWM_DIALOG_OPENED) {
             CreateCloseUtils.closeProject(remoteRobot);
         }
     }
 
     @Test
-    public void closeCodeWithMe() {
+    void closeCodeWithMe() {
         if (IDEA_VERSION_WITH_CWM_DIALOG_OPENED) {
             CodeWithMeDialog.closeCodeWithMePopupIfItAppears(remoteRobot);
         }

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/ProjectStructureDialogTest.java

@@ -31,21 +31,21 @@
  *
  * @author [email protected], [email protected]
  */
-public class ProjectStructureDialogTest extends LibraryTestBase {
+class ProjectStructureDialogTest extends LibraryTestBase {
     private static final String PROJECT_NAME = "tip_dialog_java_project";
 
     @BeforeAll
-    public static void prepareProject() {
+    static void prepareProject() {
         CreateCloseUtils.createNewProject(remoteRobot, PROJECT_NAME, CreateCloseUtils.NewProjectType.PLAIN_JAVA);
     }
 
     @AfterAll
-    public static void closeProject() {
+    static void closeProject() {
         CreateCloseUtils.closeProject(remoteRobot);
     }
 
     @Test
-    public void projectStructureDialogTest() {
+    void projectStructureDialogTest() {
         dialogTest(() -> {
             ProjectStructureDialog projectStructureDialog = remoteRobot.find(ProjectStructureDialog.class, Duration.ofSeconds(10));
             projectStructureDialog.cancel();

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/information/TipDialogTest.java

@@ -33,11 +33,11 @@
  *
  * @author [email protected]
  */
-public class TipDialogTest extends LibraryTestBase {
+class TipDialogTest extends LibraryTestBase {
     private TipDialog tipDialog;
 
     @AfterAll
-    public static void cleanUp() {
+    static void cleanUp() {
         if (ideaVersionInt >= 20213) {
             JTreeFixture jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(XPathDefinitions.TREE));
             jTreeFixture.findText("Projects").click();
@@ -48,24 +48,25 @@ public static void cleanUp() {
     }
 
     @BeforeEach
-    public void prepareTipDialog() {
+    void prepareTipDialog() {
         tipDialog = remoteRobot.find(FlatWelcomeFrame.class).openTipDialog();
     }
 
     @Test
-    public void closeButtonTest() {
-        remoteRobot.find(TipDialog.class, Duration.ofSeconds(5));
+    void closeButtonTest() {
+        Duration timeout = Duration.ofSeconds(5);
+        remoteRobot.find(TipDialog.class, timeout);
         tipDialog.close();
         try {
-            remoteRobot.find(TipDialog.class, Duration.ofSeconds(5));
+            remoteRobot.find(TipDialog.class, timeout);
             fail("The 'Tif of the Day' dialog should be closed but is not.");
         } catch (WaitForConditionTimeoutException e) {
             LOGGER.log(Level.INFO, e.getMessage(), e);
         }
     }
 
     @Test
-    public void dontShowTipsCheckBoxTest() {
+    void dontShowTipsCheckBoxTest() {
         boolean checkboxStateBefore = tipDialog.dontShowTipsCheckBox().isSelected();
         tipDialog.dontShowTipsCheckBox().setValue(!checkboxStateBefore);
         boolean checkboxStateAfter = tipDialog.dontShowTipsCheckBox().isSelected();