package net.lshift.spki.suiteb;

import static net.lshift.spki.suiteb.AlwaysCondition.ALWAYS;
import static net.lshift.spki.suiteb.ConditionJoiner.and;
import static net.lshift.spki.suiteb.ConditionJoiner.or;
import static net.lshift.spki.suiteb.NeverCondition.NEVER;
import static org.junit.Assert.assertEquals;

import org.junit.Test;

public class ConditionJoinerTest  {
    private static final Condition[] BOOLEANS
        = new Condition[] {NEVER, ALWAYS};

    @Test
    public void test() {
        for (Condition a: BOOLEANS)  {
            for (Condition b: BOOLEANS) {
                assertEquals(
                        a.allows(null, null) || b.allows(null, null),
                        or(a, b).allows(null, null));
                assertEquals(
                        a.allows(null, null) && b.allows(null, null),
                        and(a, b).allows(null, null));
            }
        }
    }
}

package net.lshift.spki.suiteb;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

public class ConditionJoinerTest  {
    private static final Condition[] BOOLEANS = new Condition[] {
        NeverCondition.NEVER, AlwaysCondition.ALWAYS};

    @Test
    public void test() {
        for (Condition a: BOOLEANS)  {
            for (Condition b: BOOLEANS) {
                assertEquals(
                        a.allows(null, null) || b.allows(null, null),
                        ConditionJoiner.or(a, b).allows(null, null));
                assertEquals(
                        a.allows(null, null) && b.allows(null, null),
                        ConditionJoiner.and(a, b).allows(null, null));
            }
        }
    }

}

--- 
+++ 
@@ -1,12 +1,16 @@
 package net.lshift.spki.suiteb;
 
+import static net.lshift.spki.suiteb.AlwaysCondition.ALWAYS;
+import static net.lshift.spki.suiteb.ConditionJoiner.and;
+import static net.lshift.spki.suiteb.ConditionJoiner.or;
+import static net.lshift.spki.suiteb.NeverCondition.NEVER;
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
 public class ConditionJoinerTest  {
-    private static final Condition[] BOOLEANS = new Condition[] {
-        NeverCondition.NEVER, AlwaysCondition.ALWAYS};
+    private static final Condition[] BOOLEANS
+        = new Condition[] {NEVER, ALWAYS};
 
     @Test
     public void test() {
@@ -14,12 +18,11 @@
             for (Condition b: BOOLEANS) {
                 assertEquals(
                         a.allows(null, null) || b.allows(null, null),
-                        ConditionJoiner.or(a, b).allows(null, null));
+                        or(a, b).allows(null, null));
                 assertEquals(
                         a.allows(null, null) && b.allows(null, null),
-                        ConditionJoiner.and(a, b).allows(null, null));
+                        and(a, b).allows(null, null));
             }
         }
     }
-
 }
Clean up test a little

--HG--
branch : delegation
