Skip to content

2. Hausaufgabe - Burak Kadir Onay - s0570331 #76

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

2. Hausaufgabe - Burak Kadir Onay - s0570331 #76

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5e02c5
1. grüner Test
burakkadironay Oct 30, 2020
589d6d3
1. roter Test
burakkadironay Oct 30, 2020
7283e74
1. Bug-Fix
burakkadironay Oct 30, 2020
a40ba0a
2. roter Test
burakkadironay Oct 30, 2020
e803998
2. Bug-Fix
burakkadironay Oct 30, 2020
1127042
3. roter Test
burakkadironay Oct 30, 2020
b813726
3. Bug-Fix
burakkadironay Oct 30, 2020
d43b6ee
4. Bug-Fix zu 3. roten Test
burakkadironay Oct 30, 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
5 changes: 4 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 @@ -12,10 +12,12 @@ public class Calculator {
public String readScreen() {
return screen;
}

public void pressDigitKey(int digit) {
if(digit > 9 || digit < 0) throw new IllegalArgumentException();

if(latestOperation.isEmpty()) {
//Bug-Fix No 2
if(latestOperation.isEmpty() || !(latestValue == 0.0)) {
screen = screen + digit;
} else {
latestValue = Double.parseDouble(screen);
Expand Down Expand Up @@ -43,6 +45,7 @@ public void pressNegative() {

public void pressEquals() {
var result = switch(latestOperation) {
case "" -> Double.parseDouble(screen); //Bug-Fix No 1
case "+" -> latestValue + Double.parseDouble(screen);
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
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());
}

@Test
@DisplayName("should display result after divide two numbers")
void calculatorCanDoFiveDividedFive()
{
Calculator calc1 = new Calculator();
calc1.pressDigitKey(5);
calc1.pressOperationKey("/");
calc1.pressDigitKey(5);
calc1.pressEquals();
assertEquals("1", calc1.readScreen());
}

@Test
@DisplayName("should display show the same digit after press 'equals'")
void calculatorCanDoSixEquals() {
Calculator calc2 = new Calculator();
calc2.pressDigitKey(6);
calc2.pressEquals();
assertEquals("6", calc2.readScreen());
}

@Test
@DisplayName("should display show the result of multiplying of two digit numbers")
void calculatorCanDoMultiplyTwoTWODIGITNumbers() {
Calculator calc3 = new Calculator();
calc3.pressDigitKey(1);
calc3.pressDigitKey(0);
calc3.pressOperationKey("x");
calc3.pressDigitKey(2);
calc3.pressDigitKey(0);
calc3.pressEquals();
assertEquals("200", calc3.readScreen());
}
//System.out.println(calc3.readScreen()); -> Debugger für die Kommandozeile
}