fix testSuccessNotificationAfterInstalled test

Signed-off-by: Stelios Mavrommatakis <[email protected]> Co-authored-by: Yorgos Saslis <[email protected]> Signed-off-by: Yorgos Saslis <[email protected]>
cytechmobile · Dec 21, 2023 · 5deb39e · 5deb39e
1 parent e1c1d39
commit 5deb39e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/...etwork/radicle/jetbrains/radiclejetbrainsplugin/config/RadicleProjectSettingsHandler.java b/...etwork/radicle/jetbrains/radiclejetbrainsplugin/config/RadicleProjectSettingsHandler.java
@@ -30,7 +30,7 @@ public String getRadHome() {
         return getApplicationProperties().getValue(RAD_HOME_KEY, "");
     }
 
-    private String getPath() {
+    public String getPath() {
         return getApplicationProperties().getValue(PATH_KEY, "");
     }
 

diff --git a/...va/network/radicle/jetbrains/radiclejetbrainsplugin/listeners/RadicleManagerListener.java b/...va/network/radicle/jetbrains/radiclejetbrainsplugin/listeners/RadicleManagerListener.java
@@ -25,7 +25,7 @@ public Object execute(@NotNull Project project, @NotNull Continuation<? super Un
 
     private void showSuccessNotification(Project project) {
         var radicleSettingsHandler = new RadicleProjectSettingsHandler(project);
-        final String radPath = project.getService(RadicleProjectService.class).detectRadPath();
+        final String radPath = detectRadPath(project);
         radicleSettingsHandler.savePath(radPath);
         radicleSettingsHandler.saveRadHome(project.getService(RadicleProjectService.class).detectRadHome(radPath));
 //        radicleSettingsHandler.savePath("");
@@ -36,4 +36,9 @@ private void showSuccessNotification(Project project) {
                     List.of(new RadAction.ConfigureRadCliNotificationAction(project, RadicleBundle.lazyMessage("configure"))));
         }
     }
+
+    public String detectRadPath(Project project) {
+        return project.getService(RadicleProjectService.class).detectRadPath();
+    }
+
 }
diff --git a/src/test/java/network/radicle/jetbrains/radiclejetbrainsplugin/ActionsTest.java b/src/test/java/network/radicle/jetbrains/radiclejetbrainsplugin/ActionsTest.java
@@ -1,6 +1,7 @@
 package network.radicle.jetbrains.radiclejetbrainsplugin;
 
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
 import git4idea.repo.GitRepository;
 import network.radicle.jetbrains.radiclejetbrainsplugin.actions.RadicleSyncAction;
 import network.radicle.jetbrains.radiclejetbrainsplugin.actions.RadicleSyncFetchAction;
@@ -113,18 +114,23 @@ public void radFetchAction() throws InterruptedException {
 
     @Test
     public void testSuccessNotificationAfterInstalled() throws InterruptedException {
-        radicleProjectSettingsHandler.savePath("");
         var rm = new RadicleManagerListener();
         rm.execute(getProject(), NoopContinuation.NOOP);
 
         var not = notificationsQueue.poll(10, TimeUnit.SECONDS);
-        assertThat(not).isNotNull();
-        assertThat(not.getContent()).contains(RadicleBundle.message("installedSuccessfully"));
-
-        radicleProjectSettingsHandler.savePath(RAD_PATH);
-        rm.execute(getProject(), NoopContinuation.NOOP);
-        not = notificationsQueue.poll(100, TimeUnit.MILLISECONDS);
         assertThat(not).isNull();
+        assertThat(radicleProjectSettingsHandler.getRadHome()).isEqualTo(RAD_HOME);
+        assertThat(radicleProjectSettingsHandler.getPath()).isEqualTo(RAD_PATH);
+
+        rm = new RadicleManagerListener() {
+            @Override
+            public String detectRadPath(Project project) {
+                return "";
+            }
+        };
+        rm.execute(getProject(), NoopContinuation.NOOP);
+        not = notificationsQueue.poll(10, TimeUnit.SECONDS);
+        assertThat(not.getContent()).contains(RadicleBundle.message("installedSuccessfully"));
     }
 
     @Test