Browse Source

Stop IdentityTest creating a dozen or so identities per run. Might fix

quite a few timeouts!
tags/0.6.3m1rc1
Chris Smith 15 years ago
parent
commit
bfbb990796
1 changed files with 8 additions and 10 deletions
  1. 8
    10
      test/com/dmdirc/config/IdentityTest.java

+ 8
- 10
test/com/dmdirc/config/IdentityTest.java View File

48
     
48
     
49
     @After
49
     @After
50
     public void tearDown() throws Exception {
50
     public void tearDown() throws Exception {
51
+        myIdent.file.delete();
51
         myIdent = null;
52
         myIdent = null;
52
     }    
53
     }    
53
     
54
     
142
         
143
         
143
         myIdent.save();
144
         myIdent.save();
144
         
145
         
145
-        myIdent = new Identity(myIdent.getFile().getFile(), false);
146
+        myIdent = new Identity(myIdent.file.getFile(), false);
146
         
147
         
147
         assertEquals("baz!", myIdent.getOption("foo", "bar"));
148
         assertEquals("baz!", myIdent.getOption("foo", "bar"));
148
-        
149
-        myIdent.unsetOption("foo", "bar");
150
-        myIdent.save();
151
     }
149
     }
152
 
150
 
153
     @Test
151
     @Test
170
     public void testMigrate() throws IOException, InvalidIdentityFileException {
168
     public void testMigrate() throws IOException, InvalidIdentityFileException {
171
         final Identity id = new Identity(getClass().getResourceAsStream("identity3"), false);
169
         final Identity id = new Identity(getClass().getResourceAsStream("identity3"), false);
172
         
170
         
173
-        assertTrue(id.getFile().isKeyDomain("identity"));
174
-        assertTrue(id.getFile().isKeyDomain("meep"));
175
-        assertTrue(id.getFile().isKeyDomain("unit"));
171
+        assertTrue(id.file.isKeyDomain("identity"));
172
+        assertTrue(id.file.isKeyDomain("meep"));
173
+        assertTrue(id.file.isKeyDomain("unit"));
176
         
174
         
177
-        assertEquals("unit test", id.getFile().getKeyDomain("identity").get("name"));
178
-        assertEquals("true", id.getFile().getKeyDomain("unit").get("test"));
179
-        assertEquals("2", id.getFile().getKeyDomain("meep").get("moop"));
175
+        assertEquals("unit test", id.file.getKeyDomain("identity").get("name"));
176
+        assertEquals("true", id.file.getKeyDomain("unit").get("test"));
177
+        assertEquals("2", id.file.getKeyDomain("meep").get("moop"));
180
     }
178
     }
181
     
179
     
182
     @Test
180
     @Test

Loading…
Cancel
Save