ActionManagerTest now removes its groups when the test has finished, to appease the grand muppet

ActionsManagerDialogTest also does the same, and uses the ClassFinder harness instead of an AIC

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

test/com/dmdirc/actions/ActionManagerTest.java

@@ -25,6 +25,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import java.io.File;
 
 import java.util.ArrayList;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -34,8 +35,19 @@ public class ActionManagerTest extends junit.framework.TestCase {
     @BeforeClass
     public void setUpClass() throws Exception {
         ActionManager.init();
-        ActionManager.removeGroup("unit-test");
-        ActionManager.removeGroup("unit-test-two");
+        
+        tearDownClass();
+    }
+    
+    @AfterClass
+    public void tearDownClass() throws Exception {
+        if (ActionManager.getGroups().containsKey("unit-test")) {
+            ActionManager.removeGroup("unit-test");
+        }
+        
+        if (ActionManager.getGroups().containsKey("unit-test-two")) {
+            ActionManager.removeGroup("unit-test-two");
+        }
     }
 
     @Test

test/com/dmdirc/ui/swing/dialogs/actionsmanager/ActionsManagerDialogTest.java

@@ -60,6 +60,10 @@ public class ActionsManagerDialogTest {
         if (window != null) {
             window.cleanUp();
         }
+        
+        if (ActionManager.getGroups().containsKey("amd-ui-test1")) {
+            ActionManager.removeGroup("amd-ui-test1");
+        }
     }
     
     @Test
@@ -84,12 +88,8 @@ public class ActionsManagerDialogTest {
         assertEquals("New action group", newwin.target.getTitle());
         newwin.button(new ButtonTextFinder("OK")).requireDisabled();
         
-        newwin.textBox(new GenericTypeMatcher<JTextComponent>() {
-            @Override
-            protected boolean isMatching(JTextComponent arg0) {
-                return arg0.getClass().equals(javax.swing.JTextField.class);
-            }
-        }).enterText("amd-ui-test1");
+        newwin.textBox(new ClassFinder<JTextComponent>(javax.swing.JTextField.class, null))
+                .enterText("amd-ui-test1");
         newwin.button(new ButtonTextFinder("OK")).requireEnabled().click();
         
         // Ensure it's added