Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/tdd/setup/Calculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// behaviour inspired by https://www.online-calculator.com/
public class Calculator {

private String screen = "0";
private String screen = "";

private double latestValue;

Expand Down Expand Up @@ -47,6 +47,7 @@ public void pressEquals() {
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
case "" -> latestValue = Double.parseDouble(screen);
default -> throw new IllegalArgumentException();
};
screen = Double.toString(result);
Expand Down
30 changes: 30 additions & 0 deletions src/test/java/tdd/setup/CalculatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,34 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}

@Test
@DisplayName("should display 0 after pressing clear button")
void canClear() {
Calculator c = new Calculator();
c.pressDigitKey(5);
c.pressClearKey();
assertEquals("0", c.readScreen());
}

@Test
@DisplayName("should display the correct number")
void showCorrectInput(){
Calculator c = new Calculator();
c.pressDigitKey(5);
c.readScreen();
assertEquals("5", c.readScreen());
}

@Test
@DisplayName("Should display negative value of input")
void calCanConvertInput() {
Calculator c = new Calculator();
c.pressNegative();
c.pressDigitKey(5);
c.pressEquals();
assertEquals("-5", c.readScreen());
}


}