Skip to content

hausaufgabe2_S056379_EmadBaroudi #67

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
EmadBaroudi wants to merge 5 commits into
base: master
Choose a base branch
from
Open

hausaufgabe2_S056379_EmadBaroudi #67

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
332fe19
First Green Test
EmadBaroudi Oct 29, 2020
fe07128
First Red Test
EmadBaroudi Oct 29, 2020
6540096
First Red Test bugfix
EmadBaroudi Oct 29, 2020
b9b9f23
Second Red Test
EmadBaroudi Oct 29, 2020
4ace328
Second Red Test bugfix
EmadBaroudi Oct 29, 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
3 changes: 2 additions & 1 deletion 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 @@ -47,6 +47,7 @@ public void pressEquals() {
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
case "sqrt" -> Math.sqrt(Double.parseDouble(screen));
default -> throw new IllegalArgumentException();
};
screen = Double.toString(result);
Expand Down
35 changes: 35 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,39 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}
// First Green Test
@Test
@DisplayName("should Clear the screen and display 0")
void calculatorCanClearScreen() {
Calculator calc1 = new Calculator();
calc1.pressDigitKey(2);
calc1.pressOperationKey("+");
calc1.pressDigitKey(2);
calc1.pressEquals();
calc1.pressClearKey();
assertEquals("0",calc1.readScreen());
}
// First Red Test
@Test
@DisplayName("should display decimal number")
void CalculatorCanDisplayDecimal() {
Calculator calc2 = new Calculator();
calc2.pressDigitKey(1);
calc2.pressDotKey();
calc2.pressDigitKey(9);
calc2.pressDigitKey(9);

assertEquals("1.99", calc2.readScreen());
}
// second Red Test
@Test
@DisplayName("Should calculate the square root")
void CalculatorCanDoSquareroot() {
Calculator calc3 = new Calculator();
calc3.pressDigitKey(5);
calc3.pressOperationKey("sqrt");
calc3.pressEquals();

assertEquals("2.23606797749979", calc3.readScreen());
}
}