Reformatted everything. Eclipse built-in Linewrapping/Comments 140 chars
[Mograsim.git] / era.mi / src / era / mi / logic / tests / ComponentTest.java
index 3ee5576..b1c9f5e 100644 (file)
@@ -17,267 +17,272 @@ import era.mi.logic.components.TriStateBuffer;
 import era.mi.logic.components.gates.AndGate;
 import era.mi.logic.components.gates.NotGate;
 import era.mi.logic.components.gates.OrGate;
+import era.mi.logic.components.gates.XorGate;
 import era.mi.logic.wires.WireArray;
 import era.mi.logic.wires.WireArray.WireArrayInput;
 
-class ComponentTest
-{
-    
+class ComponentTest {
+
        @Test
-       void circuitExampleTest()
-       {
+       void circuitExampleTest() {
                Simulation.TIMELINE.reset();
-               WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), c = new WireArray(1, 10), d = new WireArray(2, 1), e = new WireArray(1, 1),
-                               f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1), j = new WireArray(1, 1), k = new WireArray(1, 1);
-               new AndGate(1, a, b, f);
+               WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), c = new WireArray(1, 10), d = new WireArray(2, 1),
+                               e = new WireArray(1, 1), f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1),
+                               j = new WireArray(1, 1), k = new WireArray(1, 1);
+               new AndGate(1, f, a, b);
                new NotGate(1, f, g);
                new Merger(h, c, g);
                new Mux(1, i, e, h, d);
                new Splitter(i, k, j);
-               
+
                a.createInput().feedSignals(Bit.ZERO);
                b.createInput().feedSignals(Bit.ONE);
                c.createInput().feedSignals(Bit.ZERO);
                d.createInput().feedSignals(Bit.ONE, Bit.ONE);
                e.createInput().feedSignals(Bit.ZERO);
-               
+
                Simulation.TIMELINE.executeAll();
-               
+
                assertEquals(Bit.ONE, j.getValue());
                assertEquals(Bit.ZERO, k.getValue());
        }
 
-    @Test
-    void splitterTest()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);
-       in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
-       new Splitter(in, a, b, c);
+       @Test
+       void splitterTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);
+               in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+               new Splitter(in, a, b, c);
+
+               Simulation.TIMELINE.executeAll();
+
+               assertBitArrayEquals(a.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO);
+               assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO);
+               assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE);
+       }
+
+       @Test
+       void mergerTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);
+               a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
+               b.createInput().feedSignals(Bit.ONE, Bit.ZERO);
+               c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+
+               new Merger(out, a, b, c);
+
+               Simulation.TIMELINE.executeAll();
+
+               assertTrue(
+                               Arrays.equals(out.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
+       }
+
+       @Test
+       void triStateBufferTest() {
+               WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), en = new WireArray(1, 1), notEn = new WireArray(1, 1);
+               new NotGate(1, en, notEn);
+               new TriStateBuffer(1, a, b, en);
+               new TriStateBuffer(1, b, a, notEn);
+
+               WireArrayInput enI = en.createInput(), aI = a.createInput(), bI = b.createInput();
+               enI.feedSignals(Bit.ONE);
+               aI.feedSignals(Bit.ONE);
 
-       Simulation.TIMELINE.executeAll();
+               Simulation.TIMELINE.executeAll();
 
-       assertBitArrayEquals(a.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO);
-       assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO);
-       assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE);
-    }
+               assertEquals(Bit.ONE, b.getValue());
 
-    @Test
-    void mergerTest()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);
-       a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
-       b.createInput().feedSignals(Bit.ONE, Bit.ZERO);
-       c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+               bI.feedSignals(Bit.ZERO);
 
-       new Merger(out, a, b, c);
+               Simulation.TIMELINE.executeAll();
+
+               assertEquals(Bit.X, b.getValue());
+               assertEquals(Bit.ONE, a.getValue());
 
-       Simulation.TIMELINE.executeAll();
+               aI.clearSignals();
+               enI.feedSignals(Bit.ZERO);
 
-       assertTrue(Arrays.equals(out.getValues(),
-               new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
-    }
+               Simulation.TIMELINE.executeAll();
 
-    @Test
-    void triStateBufferTest()
-    {
-       WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), en = new WireArray(1, 1),
-               notEn = new WireArray(1, 1);
-       new NotGate(1, en, notEn);
-       new TriStateBuffer(1, a, b, en);
-       new TriStateBuffer(1, b, a, notEn);
+               assertEquals(Bit.ZERO, a.getValue());
 
-       WireArrayInput enI = en.createInput(), aI = a.createInput(), bI = b.createInput();
-       enI.feedSignals(Bit.ONE);
-       aI.feedSignals(Bit.ONE);
+       }
 
-       Simulation.TIMELINE.executeAll();
+       @Test
+       void muxTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4), select = new WireArray(2, 5),
+                               out = new WireArray(4, 1);
+               WireArrayInput selectIn = select.createInput();
 
-       assertEquals(Bit.ONE, b.getValue());
+               selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+               a.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+               c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       bI.feedSignals(Bit.ZERO);
+               new Mux(1, out, select, a, b, c);
+               Simulation.TIMELINE.executeAll();
 
-       Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+               selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+               Simulation.TIMELINE.executeAll();
 
-       assertEquals(Bit.X, b.getValue());
-       assertEquals(Bit.ONE, a.getValue());
+               assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       aI.clearSignals();
-       enI.feedSignals(Bit.ZERO);
+               selectIn.feedSignals(Bit.ONE, Bit.ONE);
+               Simulation.TIMELINE.executeAll();
 
-       Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
-       assertEquals(Bit.ZERO, a.getValue());
+       }
 
-    }
+       @Test
+       void demuxTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4), select = new WireArray(2, 5),
+                               in = new WireArray(4, 1);
+               WireArrayInput selectIn = select.createInput();
 
-    @Test
-    void muxTest()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
-               select = new WireArray(2, 5), out = new WireArray(4, 1);
-       WireArrayInput selectIn = select.createInput();
+               selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+               in.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 
-       selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
-       a.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
-       c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+               new Demux(1, in, select, a, b, c);
+               Simulation.TIMELINE.executeAll();
 
-       new Mux(1, out, select, a, b, c);
-       Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+               assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+               Simulation.TIMELINE.executeAll();
 
-       assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
-       selectIn.feedSignals(Bit.ZERO, Bit.ONE);
-       Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
 
-       assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+               selectIn.feedSignals(Bit.ONE, Bit.ONE);
+               Simulation.TIMELINE.executeAll();
 
-       selectIn.feedSignals(Bit.ONE, Bit.ONE);
-       Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
 
-       assertBitArrayEquals(out.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+       }
 
-    }
+       @Test
+       void andTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(4, 1), b = new WireArray(4, 3), c = new WireArray(4, 1);
+               new AndGate(1, c, a, b);
+               a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+               b.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-    @Test
-    void demuxTest()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
-               select = new WireArray(2, 5), in = new WireArray(4, 1);
-       WireArrayInput selectIn = select.createInput();
+               Simulation.TIMELINE.executeAll();
 
-       selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
-       in.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+               assertBitArrayEquals(c.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO);
+       }
 
-       new Demux(1, in, select, a, b, c);
-       Simulation.TIMELINE.executeAll();
+       @Test
+       void orTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(4, 1), b = new WireArray(4, 3), c = new WireArray(4, 1);
+               new OrGate(1, c, a, b);
+               a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+               b.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
-       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       selectIn.feedSignals(Bit.ZERO, Bit.ONE);
-       Simulation.TIMELINE.executeAll();
+               Simulation.TIMELINE.executeAll();
 
-       assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+               assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE);
+       }
 
-       selectIn.feedSignals(Bit.ONE, Bit.ONE);
-       Simulation.TIMELINE.executeAll();
+       @Test
+       void xorTest() {
+               Simulation.TIMELINE.reset();
+               WireArray a = new WireArray(3, 1), b = new WireArray(3, 2), c = new WireArray(3, 1), d = new WireArray(3, 1);
+               new XorGate(1, d, a, b, c);
+               a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);
+               b.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+               c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
 
-       assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
-       assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);
+               Simulation.TIMELINE.executeAll();
 
-    }
-    
-    @Test
-    void andTest()
-    {
-       Simulation.TIMELINE.reset();
-       AndGate gate = new AndGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-       gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-       gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+               assertBitArrayEquals(d.getValues(), Bit.ZERO, Bit.ONE, Bit.ONE);
+       }
 
-       Simulation.TIMELINE.executeAll();
-       assertBitArrayEquals(gate.getOut().getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO);
-    }
+       @Test
+       void rsLatchCircuitTest() {
+               Simulation.TIMELINE.reset();
+               WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1),
+                               q = new WireArray(1, 1), nq = new WireArray(1, 1);
 
-    @Test
-    void orTest()
-    {
-       Simulation.TIMELINE.reset();
-       OrGate gate = new OrGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-       gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-       gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+               new OrGate(1, t2, r, nq);
+               new OrGate(1, t1, s, q);
+               new NotGate(1, t2, q);
+               new NotGate(1, t1, nq);
 
-       Simulation.TIMELINE.executeAll();
+               WireArrayInput sIn = s.createInput(), rIn = r.createInput();
 
-       assertBitArrayEquals(gate.getOut().getValues(), Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE);
-    }
+               sIn.feedSignals(Bit.ONE);
+               rIn.feedSignals(Bit.ZERO);
 
-    @Test
-    void rsLatchCircuitTest()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1),
-               q = new WireArray(1, 1), nq = new WireArray(1, 1);
+               Simulation.TIMELINE.executeAll();
 
-       new OrGate(1, r, nq, t2);
-       new OrGate(1, s, q, t1);
-       new NotGate(1, t2, q);
-       new NotGate(1, t1, nq);
+               assertEquals(Bit.ONE, q.getValue());
+               assertEquals(Bit.ZERO, nq.getValue());
 
-       WireArrayInput sIn = s.createInput(), rIn = r.createInput();
+               sIn.feedSignals(Bit.ZERO);
 
-       sIn.feedSignals(Bit.ONE);
-       rIn.feedSignals(Bit.ZERO);
+               Simulation.TIMELINE.executeAll();
+               assertEquals(Bit.ONE, q.getValue());
+               assertEquals(Bit.ZERO, nq.getValue());
 
-       Simulation.TIMELINE.executeAll();
+               rIn.feedSignals(Bit.ONE);
 
-       assertEquals(Bit.ONE, q.getValue());
-       assertEquals(Bit.ZERO, nq.getValue());
+               Simulation.TIMELINE.executeAll();
 
-       sIn.feedSignals(Bit.ZERO);
+               assertEquals(Bit.ZERO, q.getValue());
+               assertEquals(Bit.ONE, nq.getValue());
+       }
 
-       Simulation.TIMELINE.executeAll();
-       assertEquals(Bit.ONE, q.getValue());
-       assertEquals(Bit.ZERO, nq.getValue());
+       @Test
+       void numericValueTest() {
+               Simulation.TIMELINE.reset();
 
-       rIn.feedSignals(Bit.ONE);
+               WireArray a = new WireArray(4, 1);
+               a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
 
-       Simulation.TIMELINE.executeAll();
+               Simulation.TIMELINE.executeAll();
 
-       assertEquals(Bit.ZERO, q.getValue());
-       assertEquals(Bit.ONE, nq.getValue());
-    }
-
-    @Test
-    void numericValueTest()
-    {
-       Simulation.TIMELINE.reset();
-
-       WireArray a = new WireArray(4, 1);
-       a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
-
-       Simulation.TIMELINE.executeAll();
-
-       assertEquals(15, a.getUnsignedValue());
-       assertEquals(-1, a.getSignedValue());
-    }
+               assertEquals(15, a.getUnsignedValue());
+               assertEquals(-1, a.getSignedValue());
+       }
 
-    @Test
-    void multipleInputs()
-    {
-       Simulation.TIMELINE.reset();
-       WireArray w = new WireArray(2, 1);
-       WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();
-       wI1.feedSignals(Bit.ONE, Bit.Z);
-       wI2.feedSignals(Bit.Z, Bit.X);
-       Simulation.TIMELINE.executeAll();
-       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X);
+       @Test
+       void multipleInputs() {
+               Simulation.TIMELINE.reset();
+               WireArray w = new WireArray(2, 1);
+               WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();
+               wI1.feedSignals(Bit.ONE, Bit.Z);
+               wI2.feedSignals(Bit.Z, Bit.X);
+               Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.X);
 
-       wI2.feedSignals(Bit.ZERO, Bit.Z);
-       Simulation.TIMELINE.executeAll();
-       assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z);
+               wI2.feedSignals(Bit.ZERO, Bit.Z);
+               Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(w.getValues(), Bit.X, Bit.Z);
 
-       wI2.feedSignals(Bit.Z, Bit.Z);
-       Simulation.TIMELINE.executeAll();
-       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
+               wI2.feedSignals(Bit.Z, Bit.Z);
+               Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
 
-       wI2.feedSignals(Bit.ONE, Bit.Z);
-       w.addObserver((i, oldValues) -> fail("WireArray notified observer, although value did not change."));
-       Simulation.TIMELINE.executeAll();
-       assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
-    }
+               wI2.feedSignals(Bit.ONE, Bit.Z);
+               w.addObserver((i, oldValues) -> fail("WireArray notified observer, although value did not change."));
+               Simulation.TIMELINE.executeAll();
+               assertBitArrayEquals(w.getValues(), Bit.ONE, Bit.Z);
+       }
 
        @Test
-       void wireConnections()
-       {
+       void wireConnections() {
                // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
-               
+
                Simulation.TIMELINE.reset();
 
                WireArray a = new WireArray(1, 2);
@@ -301,7 +306,7 @@ class ComponentTest
                cI.feedSignals(Bit.Z);
                test.assertAfterSimulationIs(print, Bit.Z);
 
-               Connector c1 = new Connector(b, c);
+               new Connector(b, c);
                test.assertAfterSimulationIs(print, Bit.Z);
                System.err.println("ONE");
                bI.feedSignals(Bit.ONE);
@@ -312,8 +317,8 @@ class ComponentTest
                System.err.println("Z");
                bI.feedSignals(Bit.Z);
                test.assertAfterSimulationIs(print, Bit.Z);
-               
-               Connector c2 = new Connector(a, b);
+
+               new Connector(a, b);
                System.err.println("Z 2");
                aI.feedSignals(Bit.Z);
                test.assertAfterSimulationIs(print, Bit.Z);
@@ -330,7 +335,7 @@ class ComponentTest
                aI.feedSignals(Bit.Z);
                test.assertAfterSimulationIs(print, Bit.Z);
                test2.assertAfterSimulationIs(Bit.Z);
-               
+
                System.err.println("No Conflict yet");
                bI.feedSignals(Bit.ONE);
                test.assertAfterSimulationIs(print, Bit.ONE);
@@ -347,8 +352,7 @@ class ComponentTest
                test2.assertAfterSimulationIs(Bit.ONE);
        }
 
-    private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
-    {
-       assertArrayEquals(expected, actual);
-    }
+       private static void assertBitArrayEquals(Bit[] actual, Bit... expected) {
+               assertArrayEquals(expected, actual);
+       }
 }