Merge branch 'idea1' into main

georgevangelou · Jan 6, 2022 · 1c3d41b · 1c3d41b
2 parents 519e389 + 5f35fc5
commit 1c3d41b
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,6 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.nar
 *.ear

diff --git a/diagram/Boolean_Circuit.eapx b/diagram/Boolean_Circuit.eapx
diff --git a/diagram/Starter Class Diagram.png b/diagram/Starter Class Diagram.png
diff --git a/jar_files/boolean_circuit_2022.01.06.1730..jar b/jar_files/boolean_circuit_2022.01.06.1730..jar
diff --git a/src/test/java/Testing.java b/src/test/java/Testing.java
@@ -133,7 +133,7 @@ public void testIfCircuitIsFailSafe3() {
             final Calculatable sig1 = factory.createAndGateWithInputs(input1, input2);
             final Calculatable sig2 = factory.createNotGateWithInput(null);
             final Calculatable sig3 = factory.createOrGateWithInputs(sig1, sig2);
-            Circuit circuit = factory.createCircuit(sig1);
+            Circuit circuit = factory.createCircuit(sig3);
             circuit.calculate();
             fail("Wrong user-input or circuit connections were handled INCORRECTLY");
         } catch (final Exception e) {