Get rid of TestInputWindow

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -24,10 +24,11 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class BanTest {
 
@@ -40,9 +41,9 @@ public class BanTest {
 
     @Test
     public void testUsage() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, null, false, new CommandArguments("/ban"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
 }

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -23,10 +23,11 @@ package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class SetNickColourTest {
 
@@ -39,26 +40,26 @@ public class SetNickColourTest {
 
     @Test
     public void testUsageNoArgs() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testUsageNicklist() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --nicklist"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    
     
     @Test
     public void testUsageText() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, null, false, new CommandArguments("/foo --text"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }       
 
 }

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -23,10 +23,11 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class AliasCommandTest {
 
@@ -39,18 +40,20 @@ public class AliasCommandTest {
 
     @Test
     public void testUsageNoArgs() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
+
         command.execute(tiw, false, new CommandArguments("/foo"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testUsageOneArg() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
+        
         command.execute(tiw, false, new CommandArguments("/foo --remove"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    
 
 }

test/com/dmdirc/commandparser/commands/global/DebugTest.java

@@ -23,10 +23,10 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class DebugTest {
 
@@ -39,17 +39,19 @@ public class DebugTest {
 
     @Test
     public void testUsage() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
+
         command.execute(tiw, false, new CommandArguments("/foo"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testInvalidArg() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
+
         command.execute(tiw, false, new CommandArguments("/foo flubadee"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }    
 }

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -23,10 +23,11 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class IfpluginTest {
 
@@ -39,18 +40,18 @@ public class IfpluginTest {
 
     @Test
     public void testUsageNoArgs() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testUsageOneArg() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo bar"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }    
 
 }

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -23,10 +23,11 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class NewServerTest {
 
@@ -39,34 +40,34 @@ public class NewServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testInvalidPort() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:abc"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort1() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:0"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort2() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, false, new CommandArguments("/foo foo:65537"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
 
 }

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -23,10 +23,11 @@ package com.dmdirc.commandparser.commands.server;
 
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestInputWindow;
+import com.dmdirc.ui.interfaces.InputWindow;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ChangeServerTest {
 
@@ -39,34 +40,34 @@ public class ChangeServerTest {
 
     @Test
     public void testUsageNoArgs() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, false, new CommandArguments("/server"));
         
-        assertTrue(tiw.lines.containsKey("commandUsage"));
+        verify(tiw).addLine(eq("commandUsage"), anyChar(), anyString(), anyString());
     }
     
     @Test
     public void testInvalidPort() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:abc"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort1() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, false, new CommandArguments("/server foo:0"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
     
     @Test
     public void testOutOfRangePort2() {
-        final TestInputWindow tiw = new TestInputWindow();
+        final InputWindow tiw = mock(InputWindow.class);
         command.execute(tiw, null, false,new CommandArguments("/server foo:65537"));
         
-        assertTrue(tiw.lines.containsKey("commandError"));
+        verify(tiw).addLine(eq("commandError"), anyString());
     }
 
 }

test/com/dmdirc/harness/TestInputWindow.java

@@ -1,42 +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.addons.ui_dummy.DummyInputWindow;
-import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.util.MapList;
-
-public class TestInputWindow extends DummyInputWindow implements InputWindow {
-    
-    public MapList<String, Object[]> lines = new MapList<String, Object[]>();
-
-    public TestInputWindow() {
-        super(null, null);
-    }
-
-    @Override
-    public void addLine(String messageType, Object... args) {
-        lines.add(messageType, args);
-    }
-
-}