Fixes.

Signed-off-by: Zbynek Cervinka <[email protected]>

Author: zcervink

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/FlatWelcomeFrame.java

@@ -195,7 +195,7 @@ public void disableNotifications() {
         SettingsDialog settingsDialog = remoteRobot.find(SettingsDialog.class, Duration.ofSeconds(5));
         settingsDialog.navigateTo("Appearance & Behavior", "Notifications");
         NotificationsPage notificationsPage = remoteRobot.find(NotificationsPage.class, Duration.ofSeconds(5));
-        notificationsPage.disableNotifications();
+        notificationsPage.toggleNotifications(false);
         settingsDialog.ok();
 
         if (ideaVersion >= 20213) {

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/settings/SettingsDialog.java

@@ -17,6 +17,7 @@
 import com.intellij.remoterobot.fixtures.FixtureName;
 import com.intellij.remoterobot.fixtures.JButtonFixture;
 import com.intellij.remoterobot.fixtures.JTreeFixture;
+import com.redhat.devtools.intellij.commonuitest.exceptions.UITestException;
 import com.redhat.devtools.intellij.commonuitest.utils.labels.ButtonLabels;
 import org.jetbrains.annotations.NotNull;
 
@@ -39,7 +40,7 @@ public SettingsDialog(@NotNull RemoteRobot remoteRobot, @NotNull RemoteComponent
      */
     public void navigateTo(String... path) {
         if (path.length == 0) {
-            return;
+            throw new UITestException("Path is empty.");
         }
         settingsTree().expand(path);
         settingsTree().clickPath(path, true);

src/main/java/com/redhat/devtools/intellij/commonuitest/fixtures/dialogs/settings/pages/NotificationsPage.java

@@ -32,24 +32,30 @@ public NotificationsPage(@NotNull RemoteRobot remoteRobot, @NotNull RemoteCompon
 
     /**
      * Disable both balloon and system notifications
+     *
+     * @param value boolean value to toggle the checkboxes to
      */
-    public void disableNotifications() {
-        disableBalloonNotifications();
-        disableSystemNotifications();
+    public void toggleNotifications(boolean value) {
+        toggleBalloonNotifications(value);
+        toggleSystemNotifications(value);
     }
 
     /**
-     * Disable balloon notifications
+     * Toggle balloon notifications
+     *
+     * @param value boolean value to toggle the checkbox to
      */
-    public void disableBalloonNotifications() {
-        displayBalloonNotificationsCheckBox().setValue(false);
+    public void toggleBalloonNotifications(boolean value) {
+        displayBalloonNotificationsCheckBox().setValue(value);
     }
 
     /**
-     * Disable system notifications
+     * Toggle system notifications
+     *
+     * @param value boolean value to toggle the checkbox to
      */
-    public void disableSystemNotifications() {
-        displaySystemNotificationsCheckBox().setValue(false);
+    public void toggleSystemNotifications(boolean value) {
+        displaySystemNotificationsCheckBox().setValue(value);
     }
 
     /**

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

@@ -31,17 +31,17 @@
 public class LibraryTestBase {
     protected static RemoteRobot remoteRobot;
     private static boolean intelliJHasStarted = false;
-    protected static int ideaVersion;
+    private static UITestRunner.IdeaVersion ideaVersion = UITestRunner.IdeaVersion.COMMUNITY_V_2021_1;
+    protected static int ideaVersionInt = ideaVersion.toInt();
     protected static final Logger LOGGER = Logger.getLogger(LibraryTestBase.class.getName());
 
     @BeforeAll
     protected static void startIntelliJ() {
         if (!intelliJHasStarted) {
-            remoteRobot = UITestRunner.runIde(UITestRunner.IdeaVersion.COMMUNITY_V_2021_1, 8580);
+            remoteRobot = UITestRunner.runIde(ideaVersion, 8580);
             intelliJHasStarted = true;
             Runtime.getRuntime().addShutdownHook(new CloseIntelliJBeforeQuit());
 
-            ideaVersion = UITestRunner.getIdeaVersion().toInt();
             FlatWelcomeFrame flatWelcomeFrame = remoteRobot.find(FlatWelcomeFrame.class, Duration.ofSeconds(10));
             flatWelcomeFrame.disableNotifications();
             flatWelcomeFrame.preventTipDialogFromOpening();

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

@@ -39,10 +39,10 @@ public class TipDialogTest extends LibraryTestBase {
 
     @AfterAll
     public static void cleanUp() {
-        if (ideaVersion >= 20213) {
+        if (ideaVersionInt >= 20213) {
             JTreeFixture jTreeFixture = remoteRobot.find(JTreeFixture.class, byXpath(TREE_XPATH));
             jTreeFixture.findText("Projects").click();
-        } else if (ideaVersion >= 20203) {
+        } else if (ideaVersionInt >= 20203) {
             JListFixture jListFixture = remoteRobot.find(JListFixture.class, byXpath(JBLIST_XPATH));
             jListFixture.clickItem("Projects", false);
         }

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

@@ -297,7 +297,7 @@ public void setProjectSdkIfAvailableTest() {
     public void selectNewProjectTypeTest() {
         newProjectFirstPage.selectNewProjectType("Empty Project");
         boolean isEmptyProjectPageDisplayed;
-        if (ideaVersion < 20213) {
+        if (ideaVersionInt < 20213) {
             isEmptyProjectPageDisplayed = !newProjectFirstPage.findAll(JListFixture.class, byXpath("//div[@visible_text='Empty Project']")).isEmpty();
         } else {
             isEmptyProjectPageDisplayed = newProjectFirstPage.hasText("Simple project with one module");

src/test-project/src/test/java/com/redhat/devtools/intellij/commonuitest/fixtures/test/dialogs/settings/pages/NotificationsPageTest.java

@@ -15,7 +15,9 @@
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.SettingsDialog;
 import com.redhat.devtools.intellij.commonuitest.fixtures.dialogs.settings.pages.NotificationsPage;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.time.Duration;
@@ -30,6 +32,8 @@
 class NotificationsPageTest extends LibraryTestBase {
     private static SettingsDialog settingsDialog;
     private static NotificationsPage notificationsPage;
+    private boolean balloonNotificationsCheckBox;
+    private boolean systemNotificationsCheckBox;
 
     @BeforeAll
     public static void openSettingsDialog() {
@@ -45,32 +49,44 @@ public static void closeSettingsDialog() {
         settingsDialog.cancel();
     }
 
+    @BeforeEach
+    public void backupSettings() {
+        balloonNotificationsCheckBox = notificationsPage.displayBalloonNotificationsCheckBox().isSelected();
+        systemNotificationsCheckBox = notificationsPage.displaySystemNotificationsCheckBox().isSelected();
+    }
+
+    @AfterEach
+    public void restoreSettings() {
+        notificationsPage.displayBalloonNotificationsCheckBox().setValue(balloonNotificationsCheckBox);
+        notificationsPage.displaySystemNotificationsCheckBox().setValue(systemNotificationsCheckBox);
+    }
+
     @Test
-    public void disableNotificationsTest() {
+    public void toggleNotificationsTest() {
         notificationsPage.displayBalloonNotificationsCheckBox().setValue(true);
         notificationsPage.displaySystemNotificationsCheckBox().setValue(true);
         boolean balloonNotificationsEnabled = notificationsPage.displayBalloonNotificationsCheckBox().isSelected();
         boolean systemNotificationsEnabled = notificationsPage.displaySystemNotificationsCheckBox().isSelected();
         assertTrue(balloonNotificationsEnabled && systemNotificationsEnabled, "The 'Balloon Notifications' and the 'System Notifications' checkboxes should be both checked.");
 
-        notificationsPage.disableNotifications();
+        notificationsPage.toggleNotifications(false);
         balloonNotificationsEnabled = notificationsPage.displayBalloonNotificationsCheckBox().isSelected();
         systemNotificationsEnabled = notificationsPage.displaySystemNotificationsCheckBox().isSelected();
         assertTrue(!balloonNotificationsEnabled && !systemNotificationsEnabled, "The 'Balloon Notifications' and the 'System Notifications' checkboxes should be both unchecked.");
     }
 
     @Test
-    public void displayBalloonNotificationsTest() {
+    public void toggleBalloonNotificationsTest() {
         notificationsPage.displayBalloonNotificationsCheckBox().setValue(true);
-        notificationsPage.disableBalloonNotifications();
+        notificationsPage.toggleBalloonNotifications(false);
         boolean balloonNotificationsEnabled = notificationsPage.displayBalloonNotificationsCheckBox().isSelected();
         assertTrue(!balloonNotificationsEnabled, "The 'Balloon Notifications' checkbox should be unchecked.");
     }
 
     @Test
-    public void displaySystemNotificationsTest() {
+    public void toggleSystemNotificationsTest() {
         notificationsPage.displaySystemNotificationsCheckBox().setValue(true);
-        notificationsPage.disableSystemNotifications();
+        notificationsPage.toggleSystemNotifications(false);
         boolean systemNotificationsEnabled = notificationsPage.displaySystemNotificationsCheckBox().isSelected();
         assertTrue(!systemNotificationsEnabled, "The 'System Notifications' checkbox should be unchecked.");
     }