samples/apifest1/day1/stackbasedsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java
1.1 --- a/samples/apifest1/day1/stackbasedsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 09:56:12 2008 +0200
1.2 +++ b/samples/apifest1/day1/stackbasedsolution/test/org/netbeans/apifest/boolcircuit/CircuitTest.java Sat Jun 14 09:58:08 2008 +0200
1.3 @@ -74,11 +74,9 @@
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',
1.8 - CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
1.9 + assertEquals("'1' for '11' input.", '1', CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
1.10 s.addAll(Arrays.asList('1', '0'));
1.11 - assertEquals("'0' for '10' input.", '0',
1.12 - CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
1.13 + assertEquals("'0' for '10' input.", '0', CircuitFactory.getBasicCircuit(Operation.AND).evaluate(s));
1.14 }
1.15
1.16 /**
1.17 @@ -89,28 +87,16 @@
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',
1.22 - CircuitFactory.join(CircuitFactory.getTrivialCircuit(),
1.23 - CircuitFactory.getBasicCircuit(Operation.OR),
1.24 - Operation.AND).evaluate(s)
1.25 - );
1.26 + assertEquals("'0' for '010' input.", '0', CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.OR), Operation.AND).evaluate(s));
1.27 s.addAll(Arrays.asList('0', '0', '1'));
1.28 - assertEquals("'1' for '001' input.", '1',
1.29 - CircuitFactory.join(CircuitFactory.getTrivialCircuit(),
1.30 - CircuitFactory.getBasicCircuit(Operation.OR),
1.31 - Operation.AND).evaluate(s)
1.32 - );
1.33 + assertEquals("'1' for '001' input.", '1', CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.OR), Operation.AND).evaluate(s));
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(
1.41 - CircuitFactory.getTrivialCircuit(),
1.42 - CircuitFactory.getBasicCircuit(Operation.NEG),
1.43 - Operation.OR
1.44 - );
1.45 + Circuit alwaysTrue = CircuitFactory.join(CircuitFactory.getTrivialCircuit(), CircuitFactory.getBasicCircuit(Operation.NEG), Operation.OR);
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));