1.1 --- a/samples/apifest1/day1/stackbasedsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java	Sat Jun 14 09:52:45 2008 +0200
     1.2 +++ b/samples/apifest1/day1/stackbasedsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java	Sat Jun 14 09:56:12 2008 +0200
     1.3 @@ -74,9 +74,11 @@
     1.4      public void testX1andX2() {
     1.5          Stack<Character> s = new Stack<Character> ();
     1.6          s.addAll(Arrays.asList('1', '1'));
     1.7 -        assertEquals("'1' for '11' input.", '1', CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
     1.8 +        assertEquals("'1' for '11' input.", '1', 
     1.9 +            CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
    1.10          s.addAll(Arrays.asList('1', '0'));
    1.11 -        assertEquals("'0' for '10' input.", '0', CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
    1.12 +        assertEquals("'0' for '10' input.", '0', 
    1.13 +            CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
    1.14      }
    1.15      
    1.16      /** 
    1.17 @@ -87,16 +89,28 @@
    1.18      public void testX1andX2orX3() {
    1.19          Stack<Character> s = new Stack<Character> ();
    1.20          s.addAll(Arrays.asList('0', '1', '0'));
    1.21 -        assertEquals("'0' for '010' input.", '0', CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.OR), Operation.AND).evaluate(s));
    1.22 +        assertEquals("'0' for '010' input.", '0', 
    1.23 +            CircuitFactory.join(CircuitFactory.getTrivialCircuit(), 
    1.24 +            CircuitFactory.getBasicCircuit(Operation.OR), 
    1.25 +            Operation.AND).evaluate(s)
    1.26 +        );
    1.27          s.addAll(Arrays.asList('0', '0', '1'));
    1.28 -        assertEquals("'1' for '001' input.", '1', CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.OR), Operation.AND).evaluate(s));
    1.29 +        assertEquals("'1' for '001' input.", '1', 
    1.30 +            CircuitFactory.join(CircuitFactory.getTrivialCircuit(), 
    1.31 +            CircuitFactory.getBasicCircuit(Operation.OR), 
    1.32 +            Operation.AND).evaluate(s)
    1.33 +        );
    1.34      }
    1.35      /** 
    1.36       * Create a circuit to evaluate (x1 or not(x1)) and then
    1.37       * verify that its result is true for all values of x1.
    1.38       */
    1.39      public void testAlwaysTrue() {
    1.40 -        Circuit alwaysTrue = CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.NEG), Operation.OR);
    1.41 +        Circuit alwaysTrue = CircuitFactory.join(
    1.42 +            CircuitFactory.getTrivialCircuit(), 
    1.43 +            CircuitFactory.getBasicCircuit(Operation.NEG), 
    1.44 +            Operation.OR
    1.45 +        );
    1.46          Stack<Character> s = new Stack<Character> ();
    1.47          s.addAll(Arrays.asList('0', '0'));
    1.48          assertEquals ("'1' for '00'", '1', alwaysTrue.evaluate(s));