X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fconditions%2FAndConditionTest.java;h=174e3cd745b01cf7ec98a8429c504ca2fb8085b1;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=81c4e4ed3ad4f610492794d2aecb7aedd31a45f1;hpb=32a62ca2c752e33a7873ac868a7a1f289caedcd4;p=utils

diff --git a/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java b/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java
index 81c4e4ed..174e3cd7 100644
--- a/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java
+++ b/support/general/src/test/java/org/wamblee/conditions/AndConditionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 the original author or authors.
+ * Copyright 2005-2010 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.
@@ -12,53 +12,54 @@
  * 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 junit.framework.TestCase;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 /**
- * Tests the Or Condition.  
- *
+ * Tests the Or Condition.
+ * 
  * @author Erik Brakkee
  */
 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)); 
+    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) { 
+
+    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)); 
+
+        for (boolean value : aValues) {
+            conditions.add(new FixedCondition<Integer>(value));
         }
+
         AndCondition<Integer> and = new AndCondition<Integer>(conditions);
-        assertEquals(aResult, and.matches(new Integer(0)));
+        assertEquals(aResult, and.matches(Integer.valueOf(0)));
     }
 
     /**
-     * Checks all combinations of two conditions. 
-     *
+     * Checks all combinations of two conditions.
+     * 
      */
-    public void testTwoConditions() { 
+    public void testTwoConditions() {
         checkResult(false, false, false);
         checkResult(true, false, false);
-        checkResult(false, true, 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); 
+
+    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);
     }
 }