Fix some minor bugs with ActionCondition's equals/hashcode methods

Add three new unit tests

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

src/com/dmdirc/actions/ActionCondition.java

@@ -41,10 +41,10 @@ public class ActionCondition {
     private ActionComparison comparison;
     
     /** The target of the comparison for this condition. */
-    private String target;
+    private String target = "";
     
     /** The source target for this comparison. */
-    private String starget;
+    private String starget = "";
     
     /**
      * Creates a new instance of ActionCondition that compares the output of
@@ -193,7 +193,7 @@ public class ActionCondition {
     @Override
     public String toString() {
         return "[ arg=" + arg + ", component=" + component + ", comparison=" 
-                + comparison + ", target=" + target + "]";
+                + comparison + ", target=" + target + ", starget=" + starget + " ]";
     }
 
     /** {@inheritDoc} */
@@ -206,13 +206,15 @@ public class ActionCondition {
         final ActionCondition o = (ActionCondition) obj;
         
         return arg == o.getArg() && component == o.getComponent()
-                && comparison == o.getComparison() && target.equals(o.getTarget());
+                && comparison == o.getComparison() && target.equals(o.getTarget())
+                && starget.equals(o.getStarget());
     }
     
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
-        return arg & component.hashCode() & comparison.hashCode() & target.hashCode();
+        return arg + 100 * (arg == -1 ? starget.hashCode() : component.hashCode())
+                + 10000 * comparison.hashCode() + 100000 * target.hashCode();
     }
     
 }

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) 2006-2008 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.actions;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ActionComponentChainTest extends junit.framework.TestCase {
+
+    @Before
+    public void setUp() throws Exception {
+        ActionManager.init();
+    }
+
+    @Test
+    public void testSingle() {
+        final ActionComponentChain chain = new ActionComponentChain(String.class, "STRING_STRING");
+        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals("STRING_STRING", chain.toString());
+    }
+
+    @Test
+    public void testDouble() {
+        final ActionComponentChain chain = new ActionComponentChain(String.class,
+                "STRING_STRING.STRING_STRING");
+        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals("STRING_STRING.STRING_STRING", chain.toString());
+    }
+
+    @Test
+    public void testInvalidName() {
+        boolean iaed = false;
+
+        try {
+            final ActionComponentChain chain = new ActionComponentChain(String.class,
+                    "STRONG_STRING");
+        } catch (IllegalArgumentException iae) {
+            iaed = true;
+        }
+
+        assertTrue("Should throw an IAE", iaed);
+    }
+
+    @Test
+    public void testInvalidType() {
+        boolean iaed = false;
+
+        try {
+            final ActionComponentChain chain = new ActionComponentChain(String.class,
+                    "USER_MODES.STRING_STRING");
+        } catch (IllegalArgumentException iae) {
+            iaed = true;
+        }
+
+        assertTrue("Should throw an IAE", iaed);
+    }
+
+    @Test
+    public void testInvalidLink() {
+        boolean iaed = false;
+
+        try {
+            final ActionComponentChain chain = new ActionComponentChain(String.class,
+                    "STRING_STRING.USER_MODES");
+        } catch (IllegalArgumentException iae) {
+            iaed = true;
+        }
+
+        assertTrue("Should throw an IAE", iaed);
+    }
+
+}

test/com/dmdirc/actions/ActionConditionTest.java

@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 2006-2008 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.actions;
+
+import org.junit.Before;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ActionConditionTest extends junit.framework.TestCase {
+
+    @Before
+    public void setUp() throws Exception {
+        ActionManager.init();
+    }
+
+    @Test
+    public void testConstructor1() {
+        final ActionCondition ac = new ActionCondition(1, CoreActionComponent.STRING_STRING,
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        assertEquals(1, ac.getArg());
+        assertEquals(CoreActionComponent.STRING_STRING, ac.getComponent());
+        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
+        assertEquals("foo", ac.getTarget());
+    }
+
+    @Test
+    public void testConstructor2() {
+        final ActionCondition ac = new ActionCondition("foobarbaz",
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        assertEquals("foobarbaz", ac.getStarget());
+        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
+        assertEquals("foo", ac.getTarget());
+    }
+
+    @Test
+    public void testTest1() {
+        final ActionCondition ac = new ActionCondition(0, CoreActionComponent.STRING_STRING,
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        assertTrue(ac.test(new ActionSubstitutor(CoreActionType.CLIENT_CLOSED), "foo bar"));
+    }
+
+    @Test
+    public void testTest2() {
+        final ActionCondition ac = new ActionCondition("foobarbaz",
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        assertTrue(ac.test(new ActionSubstitutor(CoreActionType.CLIENT_CLOSED)));
+    }
+
+    @Test
+    public void testSetters() {
+        final ActionCondition ac = new ActionCondition("foobarbaz",
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        assertEquals("foo", ac.getTarget());
+        ac.setTarget("bar");
+        assertEquals("bar", ac.getTarget());
+
+        assertEquals("foobarbaz", ac.getStarget());
+        ac.setStarget("bar");
+        assertEquals("bar", ac.getStarget());
+
+        assertEquals(CoreActionComparison.STRING_STARTSWITH, ac.getComparison());
+        ac.setComparison(CoreActionComparison.STRING_EQUALS);
+        assertEquals(CoreActionComparison.STRING_EQUALS, ac.getComparison());
+
+        ac.setComponent(CoreActionComponent.STRING_STRING);
+        assertEquals(CoreActionComponent.STRING_STRING, ac.getComponent());
+
+        ac.setArg(0);
+        assertEquals(0, ac.getArg());
+    }
+
+    @Test
+    public void testEquals() {
+        final ActionCondition ac1 = new ActionCondition("foobarbaz",
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+        final ActionCondition ac2 = new ActionCondition("foobarbaz",
+            CoreActionComparison.STRING_STARTSWITH, "foo");
+
+        assertTrue(ac1.equals(ac2));
+        assertTrue(ac2.equals(ac1));
+        assertFalse(ac1.equals(null));
+        assertFalse(ac1.equals("foo"));
+        assertEquals(ac1.hashCode(), ac2.hashCode());
+        
+        ac2.setStarget("bar");
+        assertFalse(ac2.equals(ac1));
+        assertFalse(ac1.equals(ac2));
+        
+        ac2.setStarget("foobarbaz");
+        ac2.setComponent(CoreActionComponent.STRING_STRING);
+        ac2.setArg(1);
+        assertFalse(ac2.equals(ac1));
+        assertFalse(ac1.equals(ac2));
+
+        ac1.setComponent(CoreActionComponent.STRING_STRING);
+        ac1.setArg(1);
+        assertTrue(ac1.equals(ac2));
+        assertTrue(ac2.equals(ac1));
+        assertEquals(ac1.hashCode(), ac2.hashCode());
+
+        ac1.setComponent(CoreActionComponent.STRING_LENGTH);
+        assertFalse(ac2.equals(ac1));
+        assertFalse(ac1.equals(ac2));
+
+        ac1.setComponent(CoreActionComponent.STRING_STRING);
+        ac1.setComparison(CoreActionComparison.STRING_NCONTAINS);
+        assertFalse(ac2.equals(ac1));
+        assertFalse(ac1.equals(ac2));
+
+        ac1.setComparison(CoreActionComparison.STRING_STARTSWITH);
+        ac1.setTarget("flub");
+        assertFalse(ac2.equals(ac1));
+        assertFalse(ac1.equals(ac2));
+    }
+
+}

test/com/dmdirc/actions/ActionGroupTest.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2006-2008 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.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ActionGroupTest extends junit.framework.TestCase {
+
+    @Test
+    public void testGetAuthor() {
+        ActionGroup instance = new ActionGroup("moo");
+        instance.setAuthor("foo");
+        
+        String expResult = "foo";
+        String result = instance.getAuthor();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetDescription() {
+        ActionGroup instance = new ActionGroup("bar");
+        instance.setDescription("Tra-la-la-la-la");
+                
+        String expResult = "Tra-la-la-la-la";
+        String result = instance.getDescription();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetName() {
+        ActionGroup instance = new ActionGroup("foobar");
+        
+        String expResult = "foobar";
+        String result = instance.getName();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetSettings() {
+        ActionGroup instance = new ActionGroup("foo");
+        
+        List<ActionSetting> expResult = new ArrayList<ActionSetting>();
+        List<ActionSetting> result = instance.getSettings();
+        assertEquals(expResult, result);
+        
+        result.add(new ActionSetting(ActionSetting.TYPE.BOOLEAN, "", "", "", ""));
+        assertEquals(1, instance.getSettings().size());
+    }
+
+    @Test
+    public void testGetVersion() {
+        ActionGroup instance = new ActionGroup("vtest");
+        instance.setVersion(73);
+        
+        int expResult = 73;
+        int result = instance.getVersion();
+        assertEquals(expResult, result);
+    }
+
+    @Test
+    public void testGetComponent() {
+        ActionGroup instance = new ActionGroup("zzz");
+        instance.setComponent(69);
+        
+        int expResult = 69;
+        int result = instance.getComponent();
+        assertEquals(expResult, result);
+    }
+
+}