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
4 changes: 4 additions & 0 deletions src/main/java/tdd/setup/Calculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ public String readScreen() {
public void pressDigitKey(int digit) {
if(digit > 9 || digit < 0) throw new IllegalArgumentException();

if (digit == 0 && latestOperation.equals("/")) {
throw new IllegalArgumentException("division by zero not possible");
}

if(latestOperation.isEmpty()) {
screen = screen + digit;
} else {
Expand Down
33 changes: 33 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,37 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}

@Test
@DisplayName("should display result after multiplying two positive numbers")
void calculatorMultiplication() {
Calculator calc = new Calculator();
calc.pressDigitKey(5);
calc.pressOperationKey("x");
calc.pressDigitKey(2);
calc.pressEquals();
assertEquals("10", calc.readScreen());
}

@Test
@DisplayName("should throw exception, when dividing by zero")
void calculatorShouldThrowZeroDivisionException() {
Calculator calc = new Calculator();
calc.pressDigitKey(2);
calc.pressOperationKey("/");
assertThrows(IllegalArgumentException.class, () -> {calc.pressDigitKey(0);});
}

@Test
@DisplayName("should display result after adding a digit and decimal number")
void calculatorCanAddDecimalNo() {
Calculator calc = new Calculator();
calc.pressDigitKey(2);
calc.pressOperationKey("+");
calc.pressDigitKey(1);
calc.pressDotKey();
calc.pressDigitKey(5);
calc.pressEquals();
assertEquals("3.5", calc.readScreen());
}
}