Rename UITest to UITestIface so JUnit doesn't try to run it as a test (despite it being an interface...)

Some new AED tests

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

test/com/dmdirc/harness/ui/UIMethodTestRunner.java

@@ -55,8 +55,8 @@ public class UIMethodTestRunner extends TestMethodRunner {
             } catch (ActionFailedException e) {
                 if (--retries > 0) {
                     retry = true;
-                    ((UITest) test).tearDown();
-                    ((UITest) test).setUp();
+                    ((UITestIface) test).tearDown();
+                    ((UITestIface) test).setUp();
                 } else {
                     addFailure(e);
                 }

test/com/dmdirc/harness/ui/UITest.java → test/com/dmdirc/harness/ui/UITestIface.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.harness.ui;
 
-public interface UITest {
+public interface UITestIface {
 
     void setUp();
     void tearDown();

test/com/dmdirc/ui/swing/JRadioButtonByTextMatcher.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.swing;
+
+import javax.swing.JRadioButton;
+import org.fest.swing.core.GenericTypeMatcher;
+
+public class JRadioButtonByTextMatcher extends GenericTypeMatcher<JRadioButton> {
+
+    private final String name;
+
+    public JRadioButtonByTextMatcher(final String name) {
+        this.name = name;
+    }
+
+    @Override
+    protected boolean isMatching(JRadioButton arg0) {
+        return arg0.getText().equals(name);
+    }
+
+}

test/com/dmdirc/ui/swing/MainFrameTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.swing;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
-import com.dmdirc.harness.ui.UITest;
+import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.ui.swing.dialogs.FeedbackDialog;
 import com.dmdirc.ui.swing.dialogs.NewServerDialog;
 import com.dmdirc.ui.swing.dialogs.about.AboutDialog;
@@ -44,7 +44,7 @@ import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
 @RunWith(UIClassTestRunner.class)
-public class MainFrameTest implements UITest {
+public class MainFrameTest implements UITestIface {
     
     private FrameFixture window;
 

test/com/dmdirc/ui/swing/dialogs/actioneditor/ActionEditorDialogTest.java

@@ -28,13 +28,16 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
 
-import com.dmdirc.harness.ui.UITest;
+import com.dmdirc.harness.ui.UITestIface;
+import com.dmdirc.ui.swing.JRadioButtonByTextMatcher;
 import com.dmdirc.ui.swing.components.ImageButton;
 
 import java.awt.Component;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 
+import javax.swing.JTextField;
+import javax.swing.text.JTextComponent;
 import org.fest.swing.core.EventMode;
 import org.fest.swing.core.matcher.JButtonByTextMatcher;
 import org.fest.swing.core.matcher.JLabelByTextMatcher;
@@ -48,7 +51,7 @@ import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
 @RunWith(UIClassTestRunner.class)
-public class ActionEditorDialogTest implements UITest {
+public class ActionEditorDialogTest implements UITestIface {
 
     private DialogFixture window;
 
@@ -100,6 +103,7 @@ public class ActionEditorDialogTest implements UITest {
         label.requireVisible();
 
         assertTrue(items > triggers.comboBox().target.getItemCount());
+        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
 
         triggers.button(new ClassFinder<JButton>(ImageButton.class, null)).click();
         
@@ -109,6 +113,40 @@ public class ActionEditorDialogTest implements UITest {
         }
 
         assertEquals(items, triggers.comboBox().target.getItemCount());
+        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+    }
+
+    @Test
+    public void testBasicConditionTrees() {
+        setupWindow(null);
+
+        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).textBox()
+                .enterText("test1");
+        final JPanelFixture triggers = window.panel(
+                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+
+        triggers.comboBox().selectItem("Channel message received");
+        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().click();
+
+        window.radioButton(new JRadioButtonByTextMatcher("All of the conditions are true"))
+                .requireEnabled().requireSelected();
+        window.radioButton(new JRadioButtonByTextMatcher("At least one of the conditions is true"))
+                .requireEnabled();
+        window.radioButton(new JRadioButtonByTextMatcher("The conditions match a custom rule"))
+                .requireEnabled();
+        window.panel(new ClassFinder<JPanel>(ActionConditionsTreePanel.class, null))
+                .textBox(new ClassFinder<JTextComponent>(JTextField.class, null))
+                .requireDisabled();
+
+        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
+
+        window.radioButton(new JRadioButtonByTextMatcher("The conditions match a custom rule"))
+                .click().requireSelected();
+        window.panel(new ClassFinder<JPanel>(ActionConditionsTreePanel.class, null))
+                .textBox(new ClassFinder<JTextComponent>(JTextField.class, null))
+                .requireEnabled().enterText("invalid");
+
+        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
     }
 
     protected void setupWindow(final Action action) {

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

@@ -26,7 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
-import com.dmdirc.harness.ui.UITest;
+import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.ui.swing.components.StandardInputDialog;
 import com.dmdirc.ui.swing.dialogs.actioneditor.ActionEditorDialog;
 
@@ -46,7 +46,7 @@ import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
 @RunWith(UIClassTestRunner.class)
-public class ActionsManagerDialogTest implements UITest {
+public class ActionsManagerDialogTest implements UITestIface {
     
     private DialogFixture window;