Skip to content

drei Tests, zwei Fixes #53

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

drei Tests, zwei Fixes #53

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
cd1870c
green test
Oct 28, 2020
51e27bf
red test1
magacss Oct 28, 2020
51ca007
Fix for red1
magacss Oct 28, 2020
a840768
red test 2
magacss Oct 28, 2020
615e4a8
fix red test 2
magacss Oct 28, 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
12 changes: 12 additions & 0 deletions src/main/java/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import tdd.setup.Calculator;

public class Main {
public static void main(String[] args) {
Calculator calculator = new Calculator(); // cmd+option und v
calculator.pressDigitKey(3);
calculator.pressOperationKey("+");
calculator.pressDigitKey(5);
calculator.pressEquals();
System.out.println(calculator.readScreen());
}
}
16 changes: 14 additions & 2 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 @@ -17,10 +17,13 @@ public void pressDigitKey(int digit) {

if(latestOperation.isEmpty()) {
screen = screen + digit;
} else {
} else if (latestValue == 0.0){
latestValue = Double.parseDouble(screen);
screen = Integer.toString(digit);
}
else{
screen = screen + digit;
}
}

public void pressClearKey() {
Expand All @@ -30,7 +33,14 @@ public void pressClearKey() {
}

public void pressOperationKey(String operation) {
latestOperation = operation;
if (operation != "%") {
latestOperation = operation;
}
else {
var result = Double.parseDouble(screen) / 100.0;
screen = Double.toString(result);
if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2);
}
}

public void pressDotKey() {
Expand All @@ -51,5 +61,7 @@ public void pressEquals() {
};
screen = Double.toString(result);
if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2);
if(screen.contains(".0E-")) screen = screen.replace(".0E","e");
if(screen.contains(".0E")) screen = screen.replace(".0E","e+");
}
}
60 changes: 60 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,64 @@ void calculatorCanDoTwoPlusTwo() {
calc.pressEquals();
assertEquals("4", calc.readScreen());
}
@Test
@DisplayName("should display zero after adding")
void calculatorCanDoTwoPlusTwoNewWithClearFunction() {
Calculator calc = new Calculator();
calc.pressDigitKey(2);
calc.pressOperationKey("+");
calc.pressDigitKey(2);
calc.pressEquals();
calc.pressClearKey();
assertEquals("0", calc.readScreen());
}
@Test
@DisplayName("should display result of percentage")
void calculatorCanDoPercentageOperationKey() {
Calculator calc = new Calculator();
calc.pressDigitKey(8);
calc.pressOperationKey("%");
assertEquals("0.08", calc.readScreen());
}
@Test
@DisplayName("should display big number")
void calculatorCanDoCalculateBigNumber() {
Calculator calc = new Calculator();
calc.pressDigitKey(1);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressOperationKey("x");
calc.pressDigitKey(1);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressEquals();
assertEquals("1e+12", calc.readScreen());
}

@Test
@DisplayName("should display small number")
void calculatorCanDoCalculateSmallNumber() {
Calculator calc = new Calculator();
calc.pressDigitKey(1);
calc.pressOperationKey("/");
calc.pressDigitKey(1);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressDigitKey(0);
calc.pressEquals();
assertEquals("1e-7", calc.readScreen());
}
}
// andere Fälle testen