fix cancel action on StudioWindow closure

dzmipt · Dec 30, 2023 · 74ec51d · 74ec51d
1 parent 7910a2f
commit 74ec51d
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/src/studio/ui/StudioWindow.java b/src/studio/ui/StudioWindow.java
@@ -833,8 +833,9 @@ public void close() {
         if (allWindows.size() == 1) {
             quit();
         } else {
-            execute(editorTab -> editorTab.getEditorsPanel().closeTab(editorTab));
-            //  closing the last tab would triger this code again
+            boolean result = execute(editorTab -> editorTab.getEditorsPanel().closeTab(editorTab));
+            if (!result) return;
+            //  closing the last tab would trigger this code again
             if (allWindows.contains(this)) {
                 allWindows.remove(this);
                 dispose();

diff --git a/test-integration/studio/ui/EditorTest.java b/test-integration/studio/ui/EditorTest.java
@@ -1,5 +1,8 @@
 package studio.ui;
 
+import org.assertj.swing.core.GenericTypeMatcher;
+import org.assertj.swing.finder.WindowFinder;
+import org.assertj.swing.fixture.FrameFixture;
 import org.assertj.swing.fixture.JMenuItemFixture;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -94,6 +97,26 @@ public void testUndoActionEnable() {
 
         frameFixture.menuItem("Undo").requireEnabled();
         frameFixture.button("toolbarUndo").requireEnabled();
+    }
 
+    @Test
+    public void testCancelOnFrameClosure() {
+        frameFixture.menuItem("New Window").click();
+        FrameFixture newFrameFixture = WindowFinder.findFrame(
+                new GenericTypeMatcher<StudioWindow>(StudioWindow.class, true) {
+                        @Override
+                        protected boolean isMatching(StudioWindow f) {
+                            return f != studioWindow;
+                        }
+        }).using(robot());
+        newFrameFixture.textBox("editor1").enterText("x");
+        newFrameFixture.menuItem("Close Window").click();
+        optionPaneButtonClick("Cancel");
+        newFrameFixture.requireVisible();
+
+        //tear down
+        newFrameFixture.close();
+        optionPaneButtonClick("No");
+        newFrameFixture.requireNotVisible();
     }
 }
diff --git a/test-integration/studio/ui/StudioTest.java b/test-integration/studio/ui/StudioTest.java
@@ -4,7 +4,9 @@
 import org.assertj.swing.annotation.GUITest;
 import org.assertj.swing.core.EmergencyAbortListener;
 import org.assertj.swing.core.MouseButton;
+import org.assertj.swing.finder.JOptionPaneFinder;
 import org.assertj.swing.fixture.FrameFixture;
+import org.assertj.swing.fixture.JOptionPaneFixture;
 import org.assertj.swing.fixture.JTabbedPaneFixture;
 import org.assertj.swing.fixture.JTextComponentFixture;
 import org.assertj.swing.junit.runner.GUITestRunner;
@@ -235,4 +237,15 @@ protected void waitForQueryExecution(Runnable runQuery) {
         waitForQueryExecution(runQuery,1);
     }
 
+
+    protected void optionPaneButtonClick(FrameFixture frameFixture, String btnText) {
+        JOptionPaneFixture optionPane = JOptionPaneFinder.findOptionPane().using(robot());
+        optionPane.buttonWithText(btnText).click();
+
+    }
+
+    protected void optionPaneButtonClick(String btnText) {
+        optionPaneButtonClick(frameFixture, btnText);
+    }
+
 }