Unit tests

Unit test for issue 3721

Change-Id: Ifc1e3a8c60576c0626098280d1eb93dea7fb7a3d
Reviewed-on: http://gerrit.dmdirc.com/839
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/osd/OsdWindow.java

@@ -50,7 +50,7 @@ import net.miginfocom.swing.MigLayout;
  * about events to the user.
  * @author chris
  */
-public final class OsdWindow extends JDialog implements MouseListener,
+public class OsdWindow extends JDialog implements MouseListener,
         MouseMotionListener {
     
     /**

test/com/dmdirc/addons/osd/OsdPolicyTest.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes,
+ * Simon Mott
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.osd;
+
+import java.util.ArrayList;
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+public class OsdPolicyTest {
+
+    private OsdManager manager;
+
+    @Before
+    public void setup() {
+        final ArrayList<OsdWindow> windows = new ArrayList<OsdWindow>();
+
+        OsdWindow window = mock(OsdWindow.class);
+        when(window.getY()).thenReturn(75);
+        when(window.getHeight()).thenReturn(20);
+        when(window.isVisible()).thenReturn(false);
+        windows.add(window);
+
+        window = mock(OsdWindow.class);
+        when(window.getY()).thenReturn(100);
+        when(window.getHeight()).thenReturn(20);
+        when(window.isVisible()).thenReturn(true);
+        windows.add(window);
+
+        window = mock(OsdWindow.class);
+        when(window.getY()).thenReturn(125);
+        when(window.getHeight()).thenReturn(20);
+        when(window.isVisible()).thenReturn(true);
+        windows.add(window);
+
+        window = mock(OsdWindow.class);
+        when(window.getY()).thenReturn(150);
+        when(window.getHeight()).thenReturn(20);
+        when(window.isVisible()).thenReturn(true);
+        windows.add(window);
+
+        window = mock(OsdWindow.class);
+        when(window.getY()).thenReturn(175);
+        when(window.getHeight()).thenReturn(20);
+        when(window.isVisible()).thenReturn(false);
+        windows.add(window);
+
+        manager = mock(OsdManager.class);
+        when(manager.getWindowList()).thenReturn(windows);
+    }
+
+    @Test
+    public void testOnTop() {
+        assertEquals(42, OsdPolicy.ONTOP.getYPosition(manager, 42));
+    }
+
+    @Test
+    public void testClose() {
+        assertEquals(42, OsdPolicy.CLOSE.getYPosition(manager, 42));
+        verify(manager).closeAll();
+    }
+
+    @Test
+    public void testDown() {
+        assertTrue(OsdPolicy.DOWN.getYPosition(manager, 75) > 170);
+    }
+
+    @Test
+    public void testUp() {
+        assertTrue(OsdPolicy.UP.getYPosition(manager, 175) < 80);
+    }
+
+}

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanelTest.java

@@ -26,23 +26,23 @@ import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.harness.ui.WindowButtonHandler;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.junit.Before;
 import org.junit.Test;
 import org.uispec4j.Panel;
 import org.uispec4j.Table;
-import org.uispec4j.Trigger;
 import org.uispec4j.UISpecTestCase;
-import org.uispec4j.Window;
-import org.uispec4j.interception.WindowHandler;
 import org.uispec4j.interception.WindowInterceptor;
-import static org.junit.Assume.*;
 import static org.mockito.Mockito.*;
 
 public class ActionsGroupPanelTest extends UISpecTestCase {
 
-    private static Action action1, action2, action3, action4;
+    private Action action1, action2, action3, action4;
+    private ActionGroup group;
+    private Panel panel;
+    private Table table;
     
     @Before
     @Override
@@ -52,7 +52,7 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
         when(action1.getTriggers()).thenReturn(new ActionType[] {
             CoreActionType.ACTION_CREATED, CoreActionType.ACTION_DELETED,
         });
-        when(action1.getResponse()).thenReturn(new String[0]);
+        when(action1.getResponse()).thenReturn(new String[] { "A" });
                 
         action2 = mock(Action.class);
         when(action2.getName()).thenReturn("name 2");
@@ -80,128 +80,95 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
         when(action4.getResponse()).thenReturn(new String[] {
             "Response line 1",
             "Response line 2",
-            "Response line 3",
+            "Response line 4",
         });
+
+        group = mock(ActionGroup.class);
+        when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
+            action1, action2, action3, action4,
+        })));
+
+        panel = new Panel(new ActionsGroupPanel(null, group));
+        table = panel.getTable();
     }
 
     @Test
     public void testTable() {
-        final ActionGroup group = mock(ActionGroup.class);
-        when(group.getActions()).thenReturn(Arrays.asList(new Action[]{
-            action1, action2, action3, action4,
-        }));
+        assertTrue(table.getHeader().contentEquals("Name", "Trigger", "Response"));
 
-        final Panel panel = new Panel(new ActionsGroupPanel(null, group));
-        final Table table = panel.getTable();
+        assertTrue(table.contentEquals(new String[][]{
+            {"name 1", "Action created", "A"},
+            {"name 2", "Action created", ""},
+            {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
+        }));
+    }
 
+    @Test
+    public void testTableSorting() {
         assertTrue(table.getHeader().contentEquals("Name", "Trigger", "Response"));
 
+        table.getHeader().click("Name");
+
+        assertTrue(table.contentEquals(new String[][]{
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
+            {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 2", "Action created", ""},
+            {"name 1", "Action created", "A"},
+        }));
+
+        table.getHeader().click("Response");
+
         assertTrue(table.contentEquals(new String[][]{
-            {"name 1", "Action created", ""},
             {"name 2", "Action created", ""},
+            {"name 1", "Action created", "A"},
             {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
-            {"name 4", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
         }));
     }
 
     @Test
     public void testDeletingCancel() {
-        final ActionGroup group = mock(ActionGroup.class);
-        when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
-            action1, action2, action3, action4,
-        })));
-
-        final Panel panel = new Panel(new ActionsGroupPanel(null, group));
-        final Table table = panel.getTable();
-
         table.selectRow(1);
 
         WindowInterceptor.init(panel.getButton("Delete").triggerClick())
-                .process(new WindowHandler() {
-
-            @Override
-            public Trigger process(final Window window) throws Exception {
-                assumeTrue("Confirm deletion".equals(window.getTitle()));
-
-                return window.getButton("No").triggerClick();
-            }
-        }).run();
+                .process(new WindowButtonHandler("Confirm deletion", "No")).run();
 
         assertTrue(table.contentEquals(new String[][]{
-            {"name 1", "Action created", ""},
+            {"name 1", "Action created", "A"},
             {"name 2", "Action created", ""},
             {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
-            {"name 4", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
         }));
         verify(group, never()).deleteAction((Action) anyObject());
     }
 
     public void testDeletingOk() {
-        final ActionGroup group = mock(ActionGroup.class);
-        when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
-            action1, action2, action3, action4,
-        })));
-
-        final Panel panel = new Panel(new ActionsGroupPanel(null, group));
-        final Table table = panel.getTable();
-
         table.selectRow(1);
 
         WindowInterceptor.init(panel.getButton("Delete").triggerClick())
-                .process(new WindowHandler() {
-
-            @Override
-            public Trigger process(final Window window) throws Exception {
-                assumeTrue("Confirm deletion".equals(window.getTitle()));
-
-                return window.getButton("Yes").triggerClick();
-            }
-        }).run();
+                .process(new WindowButtonHandler("Confirm deletion", "Yes")).run();
 
         verify(group).deleteAction(same(action2));
     }
 
     public void testDeletingSorted() {
-        final ActionGroup group = mock(ActionGroup.class);
-        when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
-            action1, action2, action3, action4,
-        })));
-
-        final Panel panel = new Panel(new ActionsGroupPanel(null, group));
-        final Table table = panel.getTable();
-
         table.getHeader().click("Name");
 
         table.selectRow(1);
 
         WindowInterceptor.init(panel.getButton("Delete").triggerClick())
-                .process(new WindowHandler() {
-
-            @Override
-            public Trigger process(final Window window) throws Exception {
-                assumeTrue("Confirm deletion".equals(window.getTitle()));
-
-                return window.getButton("Yes").triggerClick();
-            }
-        }).run();
+                .process(new WindowButtonHandler("Confirm deletion", "Yes")).run();
 
         verify(group).deleteAction(same(action3));
     }
 
     public void testTableDeleting() {
-        final ActionGroup group = mock(ActionGroup.class);
-        when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
-            action1, action2, action3, action4,
-        })));
-
-        final Panel panel = new Panel(new ActionsGroupPanel(null, group));
-        final Table table = panel.getTable();
-
         assertTrue(table.contentEquals(new String[][]{
-            {"name 1", "Action created", ""},
+            {"name 1", "Action created", "A"},
             {"name 2", "Action created", ""},
             {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
-            {"name 4", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
         }));
 
         when(group.getActions()).thenReturn(new ArrayList<Action>(Arrays.asList(new Action[]{
@@ -209,11 +176,12 @@ public class ActionsGroupPanelTest extends UISpecTestCase {
         })));
 
         ((ActionsGroupPanel) panel.getAwtComponent()).actionDeleted("name 2");
+        ((ActionsGroupPanel) panel.getAwtComponent()).actionDeleted("name 7");
 
         assertTrue(table.contentEquals(new String[][]{
-            {"name 1", "Action created", ""},
+            {"name 1", "Action created", "A"},
             {"name 3", "Action created", "Response line 1, Response line 2, Response line 3"},
-            {"name 4", "Action created", "Response line 1, Response line 2, Response line 3"},
+            {"name 4", "Action created", "Response line 1, Response line 2, Response line 4"},
         }));
     }
 

test/com/dmdirc/harness/ui/WindowButtonHandler.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.harness.ui;
+
+import org.uispec4j.Trigger;
+import org.uispec4j.Window;
+import org.uispec4j.interception.WindowHandler;
+import static org.junit.Assume.*;
+
+public class WindowButtonHandler extends WindowHandler {
+
+    private final String title, button;
+
+    public WindowButtonHandler(final String title, final String button) {
+        this.title = title;
+        this.button = button;
+    }
+
+    @Override
+    public Trigger process(final Window window) throws Exception {
+        assumeTrue(title.equals(window.getTitle()));
+
+        return window.getButton(button).triggerClick();
+    }
+
+}