Tests are now compatible with older JUnit style

git-svn-id: http://svn.dmdirc.com/trunk@1845 00569f92-eb28-0410-84fd-f71c24880f

test/com/dmdirc/ServerManagerTest.java

@@ -8,6 +8,7 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -18,7 +19,7 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class ServerManagerTest {
+public class ServerManagerTest extends TestCase {
     
     public ServerManagerTest() {
         IdentityManager.load();
@@ -38,7 +39,7 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void getServerManager() {
+    public void testGetServerManager() {
         final ServerManager resultA = ServerManager.getServerManager();
         final ServerManager resultB = ServerManager.getServerManager();
         
@@ -48,7 +49,7 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void registerServer() {
+    public void testRegisterServer() {
         final Server server = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         
         final ServerManager instance = ServerManager.getServerManager();
@@ -59,7 +60,7 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void unregisterServer() {
+    public void testUnregisterServer() {
         final Server server = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         
         server.close();
@@ -70,7 +71,7 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void numServers() {
+    public void testNumServers() {
         final ServerManager instance = ServerManager.getServerManager();
         
         assertEquals(instance.getServers().size(), instance.numServers());
@@ -85,7 +86,7 @@ public class ServerManagerTest {
     }
     
     @Test
-    public void getServerFromFrame() {
+    public void testGetServerFromFrame() {
         final Server serverA = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         final Server serverB = new Server("127.0.0.2", 6667, "", false, IdentityManager.getProfiles().get(0));
         

test/com/dmdirc/StringTranscoderTest.java

@@ -8,6 +8,7 @@
 package com.dmdirc;
 
 import java.nio.charset.Charset;
+import junit.framework.TestCase;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -19,7 +20,7 @@ import static org.junit.Assert.*;
  *
  * @author Chris
  */
-public class StringTranscoderTest {
+public class StringTranscoderTest extends TestCase {
     
     public StringTranscoderTest() {
     }
@@ -41,7 +42,7 @@ public class StringTranscoderTest {
     }
 
     @Test
-    public void transcode() {
+    public void testTranscode() {
         String string = new String(new byte[]{(byte) 0xCA, (byte) 0xAE});
         
         StringTranscoder instance = new StringTranscoder(Charset.forName("UTF-8"));

test/com/dmdirc/actions/ActionManagerTest.java

@@ -9,6 +9,7 @@ package com.dmdirc.actions;
 
 import com.dmdirc.Config;
 import com.dmdirc.config.IdentityManager;
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -19,28 +20,29 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class ActionManagerTest {
+public class ActionManagerTest extends TestCase {
     
     public ActionManagerTest() {
-    }
-
-    @BeforeClass
-    public static void setUpClass() throws Exception {
         IdentityManager.load();
         ActionManager.init();
         Config.init();
     }
-
+    
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        
+    }
+    
     @AfterClass
     public static void tearDownClass() throws Exception {
     }
-
+    
     @Before
     public void setUp() throws Exception {
     }
-
+    
     @Test
-    public void substituteVars() {
+    public void testSubstituteVars() {
         final Object[] args = new Object[]{
             "foo", "someCommand", new String[]{"a", "b", "c", "d"}
         };

test/com/dmdirc/actions/CoreActionMetaTypeTest.java

@@ -7,6 +7,7 @@
 
 package com.dmdirc.actions;
 
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -17,7 +18,7 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class CoreActionMetaTypeTest {
+public class CoreActionMetaTypeTest extends TestCase {
     
     public CoreActionMetaTypeTest() {
     }
@@ -35,14 +36,14 @@ public class CoreActionMetaTypeTest {
     }
 
     @Test
-    public void checkArgTypeSize() {
+    public void testCheckArgTypeSize() {
         for (CoreActionMetaType type : CoreActionMetaType.values()) {
             assertEquals(type.getArity(), type.getArgTypes().length);
         }
     }
     
     @Test
-    public void checkArgNameSize() {
+    public void testCheckArgNameSize() {
         for (CoreActionMetaType type : CoreActionMetaType.values()) {
             assertEquals(type.getArity(), type.getArgNames().length);
         }

test/com/dmdirc/commandparser/GlobalCommandParserTest.java

@@ -9,6 +9,7 @@ package com.dmdirc.commandparser;
 
 import com.dmdirc.Config;
 import com.dmdirc.config.IdentityManager;
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -19,7 +20,7 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class GlobalCommandParserTest {
+public class GlobalCommandParserTest extends TestCase {
     
     public GlobalCommandParserTest() {
     }
@@ -39,7 +40,7 @@ public class GlobalCommandParserTest {
     }
 
     @Test
-    public void getGlobalCommandParser() {
+    public void testGetGlobalCommandParser() {
         final GlobalCommandParser p1 = GlobalCommandParser.getGlobalCommandParser();
         
         final GlobalCommandParser p2 = GlobalCommandParser.getGlobalCommandParser();

test/com/dmdirc/parser/IRCParserTest.java

@@ -8,6 +8,7 @@ package com.dmdirc.parser;
 
 import com.dmdirc.parser.callbacks.CallbackNotFound;
 import com.dmdirc.parser.callbacks.interfaces.IAwayState;
+import junit.framework.TestCase;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -15,13 +16,13 @@ import static org.junit.Assert.*;
  *
  * @author Chris
  */
-public class IRCParserTest {
+public class IRCParserTest extends TestCase {
     
     public IRCParserTest() {
     }
     
     @Test
-    public void Issue042test() {
+    public void testIssue042() {
         boolean res = false;
         
         try {

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -12,6 +12,7 @@ import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import java.io.File;
 import java.util.Set;
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -22,15 +23,16 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class FormatterTest {
+public class FormatterTest extends TestCase {
     
     public FormatterTest() {
+        IdentityManager.load();
+        Config.init();
     }
 
     @BeforeClass
     public static void setUpClass() throws Exception {
-        IdentityManager.load();
-        Config.init();
+
     }
 
     @AfterClass
@@ -42,7 +44,7 @@ public class FormatterTest {
     }
 
     @Test
-    public void formatMessage() {
+    public void testFormatMessage() {
         Formatter.registerDefault("unitTest", "abc %2$s %1$s def");
         
         // Standard format test
@@ -58,7 +60,7 @@ public class FormatterTest {
     }
 
     @Test
-    public void getFormats() {
+    public void testGetFormats() {
         final Set<String> s1 = Formatter.getFormats();
         Formatter.registerDefault("unitTest3", "abc");
         final Set<String> s2 = Formatter.getFormats();
@@ -69,7 +71,7 @@ public class FormatterTest {
     }
 
     @Test
-    public void hasFormat() {
+    public void testHasFormat() {
         final String[] targets = new String[]{"unknown", "abc", "def", "unittestfail"};
         
         for (String target : targets) {
@@ -82,11 +84,11 @@ public class FormatterTest {
     }
 
     @Test
-    public void registerDefault() {
+    public void testRegisterDefault() {
     }
 
     @Test
-    public void saveAndLoad() {
+    public void testSaveAndLoad() {
         Formatter.registerDefault("unitTest_saveLoad", "");
         
         final String fileName = "unittest_formatter";
@@ -110,7 +112,7 @@ public class FormatterTest {
     }
 
     @Test
-    public void reload() {
+    public void testReload() {
         Formatter.reload();
         
         final Set<String> s1 = Formatter.getFormats();

test/com/dmdirc/ui/messages/StyliserTest.java

@@ -8,12 +8,6 @@
 package com.dmdirc.ui.messages;
 
 import junit.framework.*;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.SimpleAttributeSet;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 
 /**
  *

test/com/dmdirc/updater/UpdateTest.java

@@ -7,6 +7,7 @@
 
 package com.dmdirc.updater;
 
+import junit.framework.TestCase;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -17,7 +18,7 @@ import static org.junit.Assert.*;
  *
  * @author chris
  */
-public class UpdateTest {
+public class UpdateTest extends TestCase {
     
     private final String subject = "outofdate component rversion lversion url";
     
@@ -40,22 +41,22 @@ public class UpdateTest {
     }
 
     @Test
-    public void getComponent() {
+    public void testGetComponent() {
         assertEquals("component", update.getComponent());
     }
 
     @Test
-    public void getLocalVersion() {
+    public void testGetLocalVersion() {
         assertEquals("lversion", update.getLocalVersion());
     }
 
     @Test
-    public void getRemoteVersion() {
+    public void testGetRemoteVersion() {
         assertEquals("rversion", update.getRemoteVersion());
     }
 
     @Test
-    public void getUrl() {
+    public void testGetUrl() {
         assertEquals("url", update.getUrl());
     }