Verify moving to level 2 after the end of level 1

Author: Arun Prasaad

.cascade

@@ -10,8 +10,6 @@ avoid_unnecessary_getters = true
 # Method ordering: helper methods after their callers
 # Test names should be propositional (e.g., "returns_true_when_condition_met")
 propositional_test_names = true
-# Test descriptions should be propositional (e.g., "returns_initial_position_after_undo")
-propositional_test_descriptions = true
 helper_methods_after_caller = true
 
 [editing]
@@ -25,6 +23,13 @@ align_related_assignments = true
 # Avoid comments that state the obvious or repeat the code
 avoid_superfluous_comments = true
 
+[testing]
+# Assertion messages should be propositional statements
+# - Should be clear, testable statements of fact
+# - Present tense is preferred (e.g., "is" instead of "should be")
+# - Should describe the expected state/behavior
+propositional_assertion_messages = true
+
 [communication]
 # Be direct and to the point
 # Don't suggest alternatives unless asked

src/main/java/ihm/SokobanWindow.java

@@ -4,7 +4,6 @@
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
-import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.*;
@@ -19,7 +18,8 @@
 public class SokobanWindow extends JFrame implements KeyListener{
 
     public static final int IMAGE_SIZE = 32;
-    private final JButton okButton;
+    private final JButton okButton = new JButton("OK");
+    private final JButton nextLevelButton = new JButton("Next level");
 
     public Controller getController() {
         return controller;
@@ -49,7 +49,6 @@ public SokobanWindow(Controller controller) {
         this.pack();
         this.setLocationRelativeTo( null );
         this.setVisible( true );
-        okButton = new JButton("OK");
     }
 
     @Override
@@ -129,24 +128,36 @@ void clickOkButton() {
         okButton.doClick();
     }
 
+    @VisibleForTesting
+    void clickNextLevelButton() {
+        nextLevelButton.doClick();
+    }
+
     private void handleNextLevel() {
-        Object[] options = {"Next level", "Quit"};
-        Image image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
-        int result = JOptionPane.showOptionDialog(this,
-                "You won!",
-                "End of level",
-                JOptionPane.YES_NO_OPTION,
-                JOptionPane.QUESTION_MESSAGE,
-                new ImageIcon(image),
-                options,
-                options[0]);
-        if (result == JOptionPane.YES_OPTION) {
+        JDialog dialog = new JDialog(this, "Level Complete!", true);
+
+        nextLevelButton.addActionListener(_ -> {
+            dialog.dispose();
             this.dispose();
             new SokobanWindow(this.controller.nextLevel());
-        }
-        else if (result == JOptionPane.NO_OPTION) {
+        });
+
+        JButton quitButton = new JButton("Quit");
+        quitButton.addActionListener(_ -> {
+            dialog.dispose();
             exitGame();
-        }
+        });
+
+        JOptionPane.showOptionDialog(
+            dialog,
+            "You won!",
+            "Level Complete!",
+            JOptionPane.DEFAULT_OPTION,
+            JOptionPane.INFORMATION_MESSAGE,
+            null,
+            new Object[]{nextLevelButton, quitButton},
+            nextLevelButton
+        );
     }
 
     @Override

src/test/java/ihm/SokobanWindowTest.java

@@ -335,8 +335,7 @@ void completing_a_custom_level_disposes_window_and_shows_home_window() {
         timer.setRepeats(false);
         SwingUtilities.invokeLater(timer::start);
 
-        // When:
-        // Single move to push the box to the target
+        // When: Perform a single move to push the box onto the target and end the level
         KeyEvent rightKey = new KeyEvent(window,
                 KeyEvent.KEY_PRESSED,
                 System.currentTimeMillis(),
@@ -353,4 +352,38 @@ void completing_a_custom_level_disposes_window_and_shows_home_window() {
                 .as("Contains a visible HomeWindow")
                 .anyMatch(w -> w instanceof HomeWindow && w.isShowing());
     }
+
+    @Test
+    void completing_level_1_loads_next_level() {
+        // given - create a test window with the simplified test level
+        window = createTestWindow("src/test/resources/levels/level1.txt");
+
+        // Simulate the user clicking Next Level to proceed to the next level
+        // This has to be done before the move to push the box to the target
+        // because the dialog will wait for user input
+        Timer timer = new Timer(10, _ -> window.clickNextLevelButton());
+        timer.setRepeats(false);
+        SwingUtilities.invokeLater(timer::start);
+
+        // When: Perform a single move to push the box onto the target and end the level
+        pressKey(KeyEvent.VK_RIGHT);
+
+        then(window.isShowing())
+                .as("Current window is disposed after level completion")
+                .isFalse();
+
+        then(Window.getWindows())
+                .as("A new window with title 'Level 2' is created")
+                .anyMatch(w -> w instanceof SokobanWindow sw && sw.getTitle().equals("Level 2"));
+    }
+
+    private void pressKey(int keyCode) {
+        KeyEvent keyEvent = new KeyEvent(window,
+                KeyEvent.KEY_PRESSED,
+                System.currentTimeMillis(),
+                0,
+                keyCode,
+                KeyEvent.CHAR_UNDEFINED);
+        window.keyPressed(keyEvent);
+    }
 }

src/test/resources/levels/level1.txt

@@ -0,0 +1,7 @@
+MMMMMMM
+M#####M
+M#####M
+M#GCT#M
+M#####M
+M#####M
+MMMMMMM