Get rid of TestConfigListener in favour of mocking them when needed

test/com/dmdirc/config/ConfigManagerTest.java

@@ -21,10 +21,11 @@
  */
 package com.dmdirc.config;
 
-import com.dmdirc.harness.TestConfigListener;
 import com.dmdirc.interfaces.ConfigChangeListener;
+
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class ConfigManagerTest {
     
@@ -44,31 +45,31 @@ public class ConfigManagerTest {
     
     @Test
     public void testDomainListener() {
-        final TestConfigListener listener = new TestConfigListener();
+        final ConfigChangeListener listener = mock(ConfigChangeListener.class);
         final ConfigManager cm = new ConfigManager("", "", "");
         cm.addChangeListener("unit-test", listener);
         
         cm.configChanged("foo", "bar");
-        assertEquals(0, listener.count);
+        verify(listener, never()).configChanged(anyString(), anyString());
         
         cm.configChanged("unit-test", "bar");
-        assertEquals(1, listener.count);
+        verify(listener).configChanged("unit-test", "bar");
     }
     
     @Test
     public void testDomainKeyListener() {
-        final TestConfigListener listener = new TestConfigListener();
+        final ConfigChangeListener listener = mock(ConfigChangeListener.class);
         final ConfigManager cm = new ConfigManager("", "", "");
         cm.addChangeListener("unit-test", "foo", listener);
         
         cm.configChanged("foo", "bar");
-        assertEquals(0, listener.count);
+        verify(listener, never()).configChanged(anyString(), anyString());
         
         cm.configChanged("unit-test", "bar");
-        assertEquals(0, listener.count);
+        verify(listener, never()).configChanged(anyString(), anyString());
         
         cm.configChanged("unit-test", "foo");
-        assertEquals(1, listener.count);        
+        verify(listener).configChanged("unit-test", "foo");
     }    
     
 }

test/com/dmdirc/config/IdentityTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.harness.TestConfigListener;
+import com.dmdirc.interfaces.ConfigChangeListener;
 
 import java.io.IOException;
 import java.util.Map;
@@ -31,6 +31,7 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class IdentityTest {
     
@@ -180,28 +181,27 @@ public class IdentityTest {
     
     @Test
     public void testSetListener() {
-        final TestConfigListener listener = new TestConfigListener();
+        final ConfigChangeListener listener = mock(ConfigChangeListener.class);
         myIdent.addListener(listener);
-        assertEquals(0, listener.count);
+
+        verify(listener, never()).configChanged(anyString(), anyString());
         
         myIdent.setOption("unit", "test", "meep");        
 
-        assertEquals(1, listener.count);
-        assertEquals("unit", listener.domain);
-        assertEquals("test", listener.key);
+        verify(listener).configChanged("unit", "test");
     }    
     
     @Test
     public void testUnsetListener() {
-        final TestConfigListener listener = new TestConfigListener();
+        final ConfigChangeListener listener = mock(ConfigChangeListener.class);
         myIdent.setOption("unit", "test", "meep");
         myIdent.addListener(listener);
+
+        verify(listener, never()).configChanged(anyString(), anyString());
         
-        assertEquals(0, listener.count);
         myIdent.unsetOption("unit", "test");
-        assertEquals(1, listener.count);
-        assertEquals("unit", listener.domain);
-        assertEquals("test", listener.key);
+
+        verify(listener).configChanged("unit", "test");
     }
     
 }

test/com/dmdirc/harness/TestConfigListener.java

@@ -1,37 +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.interfaces.ConfigChangeListener;
-
-public class TestConfigListener implements ConfigChangeListener {
-
-    public int count = 0;
-    public String domain, key;
-
-    public void configChanged(String domain, String key) {
-        count++;
-        this.domain = domain;
-        this.key = key;
-    }
-}