Replace TestFrameManager with a mock, make the WritableFrameContainer

harness close windows properly

test/com/dmdirc/harness/TestConfigSource.java

@@ -31,8 +31,8 @@ public class TestConfigSource extends ConfigSource {
         return option;
     }
 
-    @Override @Deprecated
-    public boolean hasOption(String domain, String option) {
+    @Override
+    protected boolean hasOption(String domain, String option) {
         return Boolean.parseBoolean(domain);
     }
 }

test/com/dmdirc/harness/TestFrameManager.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006-2009 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;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_dummy.DummyFrameManager;
-
-public class TestFrameManager extends DummyFrameManager {
-
-    public int orphans = 0;
-    public int children = 0;
-
-    @Override
-    public void addWindow(FrameContainer window) {
-        orphans++;
-    }
-
-    @Override
-    public void addWindow(FrameContainer parent, FrameContainer window) {
-        children++;
-    }
-
-    @Override
-    public void delWindow(FrameContainer window) {
-        orphans--;
-    }
-
-    @Override
-    public void delWindow(FrameContainer parent, FrameContainer window) {
-        children--;
-    }
-}

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -26,6 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 public class TestWritableFrameContainer extends WritableFrameContainer {
@@ -60,7 +61,8 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
     }
 
     public void windowClosing() {
-        // Do nothing
+        System.out.println("windowClosing");
+        WindowManager.removeWindow(window);
     }
 
     public Server getServer() {

test/com/dmdirc/ui/WindowManagerTest.java

@@ -21,52 +21,94 @@
  */
 package com.dmdirc.ui;
 
-import com.dmdirc.harness.TestFrameManager;
+import com.dmdirc.FrameContainer;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.addons.ui_dummy.DummyInputWindow;
+import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.Window;
 
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class WindowManagerTest {
 
     @Test
-    public void testFrameManagers() {
-        final TestFrameManager tfm = new TestFrameManager();
+    public void testAddRoot() {
+        final FrameManager tfm = mock(FrameManager.class);
         final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
         
         WindowManager.addFrameManager(tfm);
-        
-        assertEquals(0, tfm.orphans);
-        assertEquals(0, tfm.children);
+
+        verify(tfm, never()).addWindow((FrameContainer) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
         
         WindowManager.addWindow(parent);
         
-        assertEquals(1, tfm.orphans);
-        assertEquals(0, tfm.children);
+        verify(tfm).addWindow(same(parent.getContainer()));
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
+    }
+
+    @Test
+    public void testAddChild() {
+        final FrameManager tfm = mock(FrameManager.class);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        WindowManager.addWindow(parent);
+        WindowManager.addFrameManager(tfm);
         
         WindowManager.addWindow(parent, child);
         
-        assertEquals(1, tfm.orphans);
-        assertEquals(1, tfm.children);
-        
+        verify(tfm, never()).addWindow((FrameContainer) anyObject());
+        verify(tfm).addWindow(same(parent.getContainer()), same(child.getContainer()));
+    }
+
+    @Test
+    public void testRemoveRoot() {
+        final FrameManager tfm = mock(FrameManager.class);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        WindowManager.addWindow(parent);
+        WindowManager.addFrameManager(tfm);
+
         WindowManager.removeWindow(parent);
         
-        assertEquals(0, tfm.orphans);
-        assertEquals(0, tfm.children);  
-        
+        verify(tfm).delWindow(same(parent.getContainer()));
+    }
+
+    @Test
+    public void testRemoveChild() {
+        final FrameManager tfm = mock(FrameManager.class);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent, child);
+        WindowManager.addFrameManager(tfm);
+
         WindowManager.removeWindow(child);
+
+        verify(tfm, never()).addWindow((FrameContainer) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
+        verify(tfm, never()).delWindow((FrameContainer) anyObject());
+        verify(tfm).delWindow(same(parent.getContainer()), same(child.getContainer()));
+    }
+
+    @Test
+    public void testRemoveFrameManager() {
+        final FrameManager tfm = mock(FrameManager.class);
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512), null);
+        WindowManager.addWindow(parent);
         
-        assertEquals(0, tfm.orphans);
-        assertEquals(0, tfm.children);       
-        
+        WindowManager.addFrameManager(tfm);
+
         WindowManager.removeFrameManager(tfm);
-        WindowManager.addWindow(parent);
+        WindowManager.addWindow(parent, child);
         
-        assertEquals(0, tfm.orphans);
-        assertEquals(0, tfm.children);       
+        verify(tfm, never()).addWindow((FrameContainer) anyObject());
+        verify(tfm, never()).addWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
+        verify(tfm, never()).delWindow((FrameContainer) anyObject());
+        verify(tfm, never()).delWindow((FrameContainer) anyObject(), (FrameContainer) anyObject());
     }
     
     @Test