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
No related merge requests found
Pipeline #10585 passed
......@@ -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;
}
......
......@@ -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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment