Skip to content
Open
Show file tree
Hide file tree
Changes from 4 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
4 changes: 3 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 All @@ -17,9 +17,11 @@ public void pressDigitKey(int digit) {

if(latestOperation.isEmpty()) {
screen = screen + digit;

} else {
latestValue = Double.parseDouble(screen);
screen = Integer.toString(digit);

}
}

Expand Down
35 changes: 35 additions & 0 deletions src/test/java/tdd/setup/CalculatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,38 @@ void calculatorCanDoTwoPlusTwo() {
assertEquals("4", calc.readScreen());
}
}
class CalculatorTest2 {
@Test
@DisplayName("should display result after suctracting two positive numbers")
void calculatorCanDoThreeMinusTwo() {
Calculator calc = new Calculator();
calc.pressDigitKey(3);
calc.pressOperationKey("-");
calc.pressDigitKey(2);
calc.pressEquals();
assertEquals("1", calc.readScreen());
}
}
class CalculatorTest3 {
@Test
@DisplayName("should display result after pressDigitKey")
void calculatorCanMulti() {
Calculator calc = new Calculator();
calc.pressDigitKey(2);
assertEquals("2", calc.readScreen());
}
}
class CalculatorTest4 {
@Test
@DisplayName("should display result after adding two positive point numbers")
void calculatorCanDoTwoPlusTwo() {
Calculator calc = new Calculator();
calc.pressDigitKey(2);
calc.pressOperationKey("+");
calc.pressDigitKey(3);
calc.pressDotKey();
calc.pressDigitKey(4);
calc.pressEquals();
assertEquals("6.3", calc.readScreen());
}
}