Update unit tests

TestParser now uses a URI constructor
Two parameterised tests no longer call IdentityManager.load() on every
parameter, as this tends to exhaust our file handle limit as the files
aren't closed quickly enough by Java...

Change-Id: I6a0e0992ffb409a66d06afe35e58cdf3878f7661
Reviewed-on: http://gerrit.dmdirc.com/356
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

test/com/dmdirc/harness/parser/TestParser.java

@@ -26,6 +26,7 @@ import com.dmdirc.parser.common.MyInfo;
 import com.dmdirc.parser.common.QueuePriority;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.irc.*;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
@@ -43,8 +44,8 @@ public class TestParser extends IRCParser implements Parser {
         currentSocketState = SocketState.OPEN;
     }
 
-    public TestParser(MyInfo myDetails, ServerInfo serverDetails) {
-        super(myDetails, serverDetails);
+    public TestParser(MyInfo myDetails, URI address) {
+        super(myDetails, address);
         currentSocketState = SocketState.OPEN;
     }
 

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

@@ -25,7 +25,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
 import java.util.Arrays;
 import java.util.List;
-import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -41,13 +41,13 @@ public class IntelligentLinkingTest {
         this.expected = expected;
     }
     
-    @Before
-    public void setUp() throws InvalidIdentityFileException {
+    @BeforeClass
+    public static void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();
     }    
     
     @Test
-    public void testLink() {
+    public void testLink() throws InterruptedException {
         assertEquals(expected, Styliser.doLinks(input).replace(Styliser.CODE_HYPERLINK, '~'));
     }
 

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

@@ -32,6 +32,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import javax.swing.text.DefaultStyledDocument;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -42,12 +43,15 @@ public class StyliserStylesTest {
 
     protected String input, output;
 
-    public StyliserStylesTest(String input, String output) throws InvalidIdentityFileException {
-        IdentityManager.load();
-        
+    public StyliserStylesTest(String input, String output) {
         this.input = input;
         this.output = output;
     }
+
+    @BeforeClass
+    public static void setUp() throws InvalidIdentityFileException {
+        IdentityManager.load();
+    }
         
     @Test
     public void testStyle() {