(no commit message)

diff --git a/support/test/org/wamblee/conditions/AndConditionTest.java b/support/test/org/wamblee/conditions/AndConditionTest.java
new file mode 100644 (file)
index 0000000..3ada4b4
--- /dev/null
+++ b/support/test/org/wamblee/conditions/AndConditionTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2005 the original author or authors.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */ 
+
+package org.wamblee.conditions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+/**
+ * Tests the Or Condition.  
+ */
+public class AndConditionTest extends TestCase {
+    
+    public void checkResult(boolean aFirst, boolean aSecond, boolean aResult) { 
+        AndCondition<Integer> and = new AndCondition<Integer>(new FixedCondition<Integer>(aFirst), 
+                new FixedCondition<Integer>(aSecond)); 
+        assertEquals(aResult, and.matches(0));
+    }
+    
+    public void checkResult(boolean[] aValues, boolean aResult) { 
+        List<Condition<Integer>> conditions = new ArrayList<Condition<Integer>>();
+        for (boolean value: aValues) { 
+            conditions.add(new FixedCondition<Integer>(value)); 
+        }
+        AndCondition<Integer> and = new AndCondition<Integer>(conditions);
+        assertEquals(aResult, and.matches(new Integer(0)));
+    }
+
+    /**
+     * Checks all combinations of two conditions. 
+     *
+     */
+    public void testTwoConditions() { 
+        checkResult(false, false, false);
+        checkResult(true, false, false);
+        checkResult(false, true, false); 
+        checkResult(true, true, true);
+    }
+    
+    public void testMultipleConditions() { 
+        checkResult(new boolean[]{ false, false, false} , false);
+        checkResult(new boolean[]{ true, false, false }, false); 
+        checkResult(new boolean[]{ false, true, false }, false); 
+        checkResult(new boolean[]{ false, false, true }, false); 
+        checkResult(new boolean[]{ true, true, true }, true); 
+    }
+}

diff --git a/support/test/org/wamblee/conditions/OrConditionTest.java b/support/test/org/wamblee/conditions/OrConditionTest.java
index 26541ed75c5677a19f15f6fc7070605e3c75db0b..2fad311027f106ebf94dabada69cc4dc320f4ff1 100644 (file)
--- a/support/test/org/wamblee/conditions/OrConditionTest.java
+++ b/support/test/org/wamblee/conditions/OrConditionTest.java
@@ -26,9 +26,6 @@ import junit.framework.TestCase;
  */
 public class OrConditionTest extends TestCase {
     
-    private Condition<Integer> _false = new FixedCondition(false);
-    private Condition<Integer> _true = new FixedCondition(true);
-    
     public void checkResult(boolean aFirst, boolean aSecond, boolean aResult) { 
         OrCondition<Integer> or = new OrCondition<Integer>(new FixedCondition<Integer>(aFirst), 
                 new FixedCondition<Integer>(aSecond));