Skip to content
Open

HA2 #81

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
10 changes: 9 additions & 1 deletion src/main/java/tdd/setup/Calculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ public class Calculator {

private String latestOperation = "";

// 5. Fix zu diesem Test

public String readScreen() {
if ( Double.parseDouble(screen) == -1 ) {
screen = "Error";
}
return screen;

}
public void pressDigitKey(int digit) {
if(digit > 9 || digit < 0) throw new IllegalArgumentException();
Expand Down Expand Up @@ -43,10 +49,12 @@ public void pressNegative() {

public void pressEquals() {
var result = switch(latestOperation) {


case "+" -> latestValue + Double.parseDouble(screen);
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
case "/" -> ( Double.parseDouble(screen) == 0 ) ? -1 : latestValue / Double.parseDouble(screen);
default -> throw new IllegalArgumentException();
};
screen = Double.toString(result);
Expand Down
16 changes: 15 additions & 1 deletion src/test/java/tdd/setup/CalculatorTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,18 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}
}
@Test
@DisplayName("display should show String 'Error' after pressing 'equals'")
void calculatorCanDivideFourByZeroEquals() {
Calculator calc = new Calculator();
calc.pressDigitKey(4);
calc.pressOperationKey("/");
calc.pressDigitKey(0);
calc.pressEquals();
assertEquals("Error", calc.readScreen());
}
// 5. Fix zu diesem Test PASSED



};