Skip to content

s0574094 Marco Hamiti /PullRequest/Unvollständig #55

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

s0574094 Marco Hamiti /PullRequest/Unvollständig #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c17ded
Green Test after trying to Subtracting two positive numbers
Hamiti97 Oct 28, 2020
ba77e6e
Red test after trying to show result from pressDigitKey
Hamiti97 Oct 28, 2020
5982af9
Green test after trying to show result from pressDigitKey
Hamiti97 Oct 28, 2020
a79f4bc
Red test after trying to adding a normal positive number with a point…
Hamiti97 Oct 28, 2020
b8b71bc
Green Test After trying to adding two positive point numbers
Hamiti97 Oct 29, 2020
84ac7d3
Green test after trying to adding two positive point numbers
Hamiti97 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
23 changes: 18 additions & 5 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,10 +3,15 @@
// behaviour inspired by https://www.online-calculator.com/
public class Calculator {

private String screen = "0";
private String screen = "";

private double latestValue;

private double firstValue;

private double secondValue;
private double thirdValue;

private String latestOperation = "";

public String readScreen() {
Expand All @@ -17,11 +22,19 @@ public void pressDigitKey(int digit) {

if(latestOperation.isEmpty()) {
screen = screen + digit;
} else {
firstValue = Double.parseDouble(screen);

}
if(!screen.contains(".")) {
latestValue = Double.parseDouble(screen);
screen = Integer.toString(digit);

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

public void pressClearKey() {
screen = "0";
Expand All @@ -42,8 +55,8 @@ public void pressNegative() {
}

public void pressEquals() {
var result = switch(latestOperation) {
case "+" -> latestValue + Double.parseDouble(screen);
var result = switch(latestOperation){
case "+" -> firstValue + Double.parseDouble(screen);
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
Expand Down
36 changes: 36 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 @@ -17,3 +17,39 @@ void calculatorCanDoTwoPlusTwo() {
assertEquals("4", calc.readScreen());
}
}
class CalculatorTest2 {
@Test
@DisplayName("should display result after subtracting 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("5.4", calc.readScreen());
}
}