Mock MessageTargets instead of using a harness

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,13 +21,14 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.MessageTarget;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.harness.TestMessageTarget;
-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 MeTest {
 
@@ -40,16 +41,17 @@ public class MeTest {
 
     @Test
     public void testUsage() {
-        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 testSend() {
-        final TestMessageTarget mtt = new TestMessageTarget();
+        final MessageTarget mtt = mock(MessageTarget.class);
         command.execute(null, null, mtt, false, new CommandArguments("/foo hello meep moop"));
-        assertEquals("hello meep moop", mtt.action);
+
+        verify(mtt).sendAction("hello meep moop");
     }
 }

test/com/dmdirc/harness/TestMessageTarget.java

@@ -1,70 +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.MessageTarget;
-import com.dmdirc.Server;
-import com.dmdirc.config.IdentityManager;
-import com.dmdirc.ui.interfaces.InputWindow;
-
-public class TestMessageTarget extends MessageTarget {
-
-    public String action;
-
-    public TestMessageTarget() {
-        super("", IdentityManager.getGlobalConfig());
-    }
-
-    @Override
-    public void sendAction(String action) {
-        this.action = action;
-    }
-
-    @Override
-    public void sendLine(String line) {
-    }
-
-    @Override
-    public InputWindow getFrame() {
-        return null;
-    }
-
-    @Override
-    public int getMaxLineLength() {
-        return 0;
-    }
-
-    @Override
-    public String toString() {
-        return null;
-    }
-
-    @Override
-    public Server getServer() {
-        return null;
-    }
-
-    @Override
-    public void windowClosing() {
-    }
-}