From 2b897535432a6e63616b92897afc895ad740ffa5 Mon Sep 17 00:00:00 2001 From: Noah Mandler <Noah@noah.com> Date: Mon, 30 Jan 2023 22:38:00 +0100 Subject: [PATCH] Correction du bug de la calculatrice + tous les tests passent --- src/main/java/fr/nancy/iut/CalcEngine.java | 6 +++--- src/test/java/fr/nancy/iut/CalcEngineTest.java | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/fr/nancy/iut/CalcEngine.java b/src/main/java/fr/nancy/iut/CalcEngine.java index 14bc40d..766fb7c 100755 --- a/src/main/java/fr/nancy/iut/CalcEngine.java +++ b/src/main/java/fr/nancy/iut/CalcEngine.java @@ -69,11 +69,11 @@ public class CalcEngine */ public void equals() { - if (previousOperator == '+') { - displayValue = leftOperand + displayValue; + if (previousOperator == '-') { + displayValue = leftOperand - displayValue; } else { - displayValue = leftOperand - displayValue; + displayValue = leftOperand + displayValue; } leftOperand = 0; } diff --git a/src/test/java/fr/nancy/iut/CalcEngineTest.java b/src/test/java/fr/nancy/iut/CalcEngineTest.java index aa92ec8..72ed24d 100644 --- a/src/test/java/fr/nancy/iut/CalcEngineTest.java +++ b/src/test/java/fr/nancy/iut/CalcEngineTest.java @@ -6,14 +6,9 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; public class CalcEngineTest { - private CalcEngine engine; - - @BeforeEach - void setUp() { - engine = new CalcEngine(); - } @Test void testClear() { + CalcEngine engine = new CalcEngine(); engine.numberPressed(1); engine.numberPressed(2); engine.numberPressed(3); @@ -24,6 +19,7 @@ public class CalcEngineTest { @Test void testEquals() { + CalcEngine engine = new CalcEngine(); engine.numberPressed(1); engine.numberPressed(2); engine.numberPressed(3); @@ -34,26 +30,31 @@ public class CalcEngineTest { @Test void testGetAuthor() { + CalcEngine engine = new CalcEngine(); assertEquals("Hacker T. Largebrain", engine.getAuthor()); } @Test void testGetDisplayValue() { + CalcEngine engine = new CalcEngine(); assertEquals(0, engine.getDisplayValue()); } @Test void testGetTitle() { + CalcEngine engine = new CalcEngine(); assertEquals("Super Calculator", engine.getTitle()); } @Test void testGetVersion() { + CalcEngine engine = new CalcEngine(); assertEquals("version 0.2", engine.getVersion()); } @Test void testMinus() { + CalcEngine engine = new CalcEngine(); engine.numberPressed(1); engine.numberPressed(2); engine.numberPressed(3); @@ -70,6 +71,7 @@ public class CalcEngineTest { @Test void testNumberPressed() { + CalcEngine engine = new CalcEngine(); assertEquals(0, engine.getDisplayValue()); engine.numberPressed(1); assertEquals(1, engine.getDisplayValue()); @@ -81,6 +83,7 @@ public class CalcEngineTest { @Test void testPlus() { + CalcEngine engine = new CalcEngine(); engine.numberPressed(1); engine.numberPressed(2); engine.numberPressed(3); -- GitLab