Skip to content

Hausaufgabe_2_S0574551 #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lauramuecke wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Hausaufgabe_2_S0574551 #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
70b5dbc
zweiter grüner Test
Lauramuecke Oct 31, 2020
e7469e2
erster roter Test
Lauramuecke Oct 31, 2020
23ef8b4
Bugfix für erster roter Test
Lauramuecke Oct 31, 2020
291fa5e
zweiter roter Test
Lauramuecke Oct 31, 2020
41372ba
Bugfix für zweiter roter Test
Lauramuecke Oct 31, 2020
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: 7 additions & 3 deletions src/main/java/tdd/setup/Calculator.java
View file
Open in desktop
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 @@ -37,8 +37,11 @@ public void pressDotKey() {
if(!screen.endsWith(".")) screen = screen + ".";
}

public void pressNegative() {
screen = screen.startsWith("-") ? screen.substring(1) : "-" + screen;
public void pressNegative(){
if(!screen.startsWith("-")) screen = "-" + screen;
else {
if (!screen.endsWith("-")) screen = screen + "-";
}
}

public void pressEquals() {
Expand All @@ -47,6 +50,7 @@ public void pressEquals() {
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
case "1/x" -> 1 / Double.parseDouble(screen);
default -> throw new IllegalArgumentException();
};
screen = Double.toString(result);
Expand Down
29 changes: 29 additions & 0 deletions src/test/java/tdd/setup/CalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,33 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}
@Test
@DisplayName("should display clear result after divide two positive numbers")
void calculatorCanClearDisplay() {
Calculator calc = new Calculator();
calc.pressDigitKey(3);
calc.pressOperationKey("/");
calc.pressDigitKey(2);
calc.pressEquals();
calc.pressClearKey();
assertEquals("0", calc.readScreen());
}
@Test
@DisplayName("New Button for Fractional")
void calculatorFractional() {
Calculator calc = new Calculator();
calc.pressDigitKey(3);
calc.pressOperationKey("1/x");
calc.pressEquals();
assertEquals("0.3333333333333333", calc.readScreen());
}

@Test
@DisplayName("Processing negative numbers")
void calculatorNegativeNumbers() {
Calculator calc = new Calculator();
calc.pressDigitKey(9);
calc.pressNegative();
assertEquals("-9", calc.readScreen());
}
}