Renamed identities tests

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

test/com/dmdirc/ServerManagerTest.java

@@ -7,8 +7,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.identities.IdentityManager;
-import javax.swing.JInternalFrame;
+import com.dmdirc.config.IdentityManager;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;

test/com/dmdirc/identities/IdentityTest.java → test/com/dmdirc/config/IdentityTest.java

@@ -5,8 +5,10 @@
  * Created on 19 April 2007, 17:33
  */
 
-package com.dmdirc.identities;
+package com.dmdirc.config;
 
+import com.dmdirc.config.ConfigTarget;
+import com.dmdirc.config.Identity;
 import java.util.Properties;
 import junit.framework.*;
 
@@ -40,7 +42,7 @@ public class IdentityTest extends TestCase {
         
         assertEquals(props.getProperty("domain.option"), "value");
         
-        myIdent.removeOption("domain", "option");
+        myIdent.unsetOption("domain", "option");
     }
 
     public void testGetName() {
@@ -57,8 +59,8 @@ public class IdentityTest extends TestCase {
         
         assertTrue(myIdent.isProfile());
         
-        myIdent.removeOption("profile", "nickname");
-        myIdent.removeOption("profile", "realname");
+        myIdent.unsetOption("profile", "nickname");
+        myIdent.unsetOption("profile", "realname");
     }
 
     public void testHasOption() {
@@ -68,7 +70,7 @@ public class IdentityTest extends TestCase {
         
         assertTrue(myIdent.hasOption("has", "option"));
         
-        myIdent.removeOption("has", "option");
+        myIdent.unsetOption("has", "option");
     }
 
     public void testGetOption() {
@@ -77,7 +79,7 @@ public class IdentityTest extends TestCase {
         
         assertEquals(props.getProperty("domain.option"), myIdent.getOption("domain", "option"));
         
-        myIdent.removeOption("domain", "option");
+        myIdent.unsetOption("domain", "option");
     }
 
     public void testSetOption() {
@@ -87,7 +89,7 @@ public class IdentityTest extends TestCase {
         
         assertEquals(count + 1, myIdent.getProperties().size());
         
-        myIdent.removeOption("foo", "bar");
+        myIdent.unsetOption("foo", "bar");
     }
 
     public void testRemoveOption() {
@@ -95,7 +97,7 @@ public class IdentityTest extends TestCase {
         final int count = props.size();
         
         myIdent.setOption("foo", "bar", "baz");
-        myIdent.removeOption("foo", "bar");
+        myIdent.unsetOption("foo", "bar");
         
         assertEquals(count, props.size());
     }
@@ -110,7 +112,7 @@ public class IdentityTest extends TestCase {
         
         assertEquals("baz!", myIdent.getOption("foo", "bar"));
         
-        myIdent.removeOption("foo", "bar");
+        myIdent.unsetOption("foo", "bar");
         myIdent.save();
     }