Mock SettingChangeListener instead of using a harness

test/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -21,17 +21,16 @@
  */
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.harness.TestSettingChangeListener;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
 import com.dmdirc.config.prefs.validator.PermissiveValidator;
 import com.dmdirc.config.prefs.validator.StringLengthValidator;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
 public class PreferencesSettingTest {
     
@@ -137,14 +136,13 @@ public class PreferencesSettingTest {
         IdentityManager.getConfigIdentity().setOption("domain", "option", "fallback");
         final PreferencesSetting ps = new PreferencesSetting(PreferencesType.TEXT, "domain",
                 "option", "title", "helptext");
-        final TestSettingChangeListener tl = new TestSettingChangeListener();
+        final SettingChangeListener tl = mock(SettingChangeListener.class);
         ps.registerChangeListener(tl);
         ps.setValue("newvalue");
         ps.dismiss();
         ps.dismiss();
 
-        assertEquals(2, tl.count);
-        assertSame(ps, tl.setting);
+        verify(tl, times(2)).settingChanged(ps);
     }
     
     @Test

test/com/dmdirc/harness/TestSettingChangeListener.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.config.prefs.*;
-
-public class TestSettingChangeListener implements SettingChangeListener {
-
-    public int count;
-
-    public PreferencesSetting setting;
-
-    public void settingChanged(PreferencesSetting setting) {
-        count++;
-        this.setting = setting;
-    }
-}