Skip to content
Snippets Groups Projects
Commit 2b897535 authored by Noah Mandler's avatar Noah Mandler
Browse files

Correction du bug de la calculatrice + tous les tests passent

parent d60d0ff0
No related branches found
No related tags found
Loading
Checking pipeline status
...@@ -69,11 +69,11 @@ public class CalcEngine ...@@ -69,11 +69,11 @@ public class CalcEngine
*/ */
public void equals() public void equals()
{ {
if (previousOperator == '+') { if (previousOperator == '-') {
displayValue = leftOperand + displayValue; displayValue = leftOperand - displayValue;
} }
else { else {
displayValue = leftOperand - displayValue; displayValue = leftOperand + displayValue;
} }
leftOperand = 0; leftOperand = 0;
} }
......
...@@ -6,14 +6,9 @@ import org.junit.jupiter.api.Test; ...@@ -6,14 +6,9 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertEquals;
public class CalcEngineTest { public class CalcEngineTest {
private CalcEngine engine;
@BeforeEach
void setUp() {
engine = new CalcEngine();
}
@Test @Test
void testClear() { void testClear() {
CalcEngine engine = new CalcEngine();
engine.numberPressed(1); engine.numberPressed(1);
engine.numberPressed(2); engine.numberPressed(2);
engine.numberPressed(3); engine.numberPressed(3);
...@@ -24,6 +19,7 @@ public class CalcEngineTest { ...@@ -24,6 +19,7 @@ public class CalcEngineTest {
@Test @Test
void testEquals() { void testEquals() {
CalcEngine engine = new CalcEngine();
engine.numberPressed(1); engine.numberPressed(1);
engine.numberPressed(2); engine.numberPressed(2);
engine.numberPressed(3); engine.numberPressed(3);
...@@ -34,26 +30,31 @@ public class CalcEngineTest { ...@@ -34,26 +30,31 @@ public class CalcEngineTest {
@Test @Test
void testGetAuthor() { void testGetAuthor() {
CalcEngine engine = new CalcEngine();
assertEquals("Hacker T. Largebrain", engine.getAuthor()); assertEquals("Hacker T. Largebrain", engine.getAuthor());
} }
@Test @Test
void testGetDisplayValue() { void testGetDisplayValue() {
CalcEngine engine = new CalcEngine();
assertEquals(0, engine.getDisplayValue()); assertEquals(0, engine.getDisplayValue());
} }
@Test @Test
void testGetTitle() { void testGetTitle() {
CalcEngine engine = new CalcEngine();
assertEquals("Super Calculator", engine.getTitle()); assertEquals("Super Calculator", engine.getTitle());
} }
@Test @Test
void testGetVersion() { void testGetVersion() {
CalcEngine engine = new CalcEngine();
assertEquals("version 0.2", engine.getVersion()); assertEquals("version 0.2", engine.getVersion());
} }
@Test @Test
void testMinus() { void testMinus() {
CalcEngine engine = new CalcEngine();
engine.numberPressed(1); engine.numberPressed(1);
engine.numberPressed(2); engine.numberPressed(2);
engine.numberPressed(3); engine.numberPressed(3);
...@@ -70,6 +71,7 @@ public class CalcEngineTest { ...@@ -70,6 +71,7 @@ public class CalcEngineTest {
@Test @Test
void testNumberPressed() { void testNumberPressed() {
CalcEngine engine = new CalcEngine();
assertEquals(0, engine.getDisplayValue()); assertEquals(0, engine.getDisplayValue());
engine.numberPressed(1); engine.numberPressed(1);
assertEquals(1, engine.getDisplayValue()); assertEquals(1, engine.getDisplayValue());
...@@ -81,6 +83,7 @@ public class CalcEngineTest { ...@@ -81,6 +83,7 @@ public class CalcEngineTest {
@Test @Test
void testPlus() { void testPlus() {
CalcEngine engine = new CalcEngine();
engine.numberPressed(1); engine.numberPressed(1);
engine.numberPressed(2); engine.numberPressed(2);
engine.numberPressed(3); engine.numberPressed(3);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment