Skip to content

HA1 - Calculator Tests and Bugfixes #87

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

HA1 - Calculator Tests and Bugfixes #87

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
8aeb758
first Test green
anakin-2004 Apr 26, 2026
e4b1e83
first red test
anakin-2004 Apr 26, 2026
31c8c5e
bugfix to first red test
anakin-2004 Apr 26, 2026
9cf1a37
second red test
anakin-2004 Apr 26, 2026
235cf33
second bugfix
anakin-2004 Apr 26, 2026
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
20 changes: 17 additions & 3 deletions src/main/java/htw/berlin/prog2/ha1/Calculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class Calculator {

private String latestOperation = "";

private boolean clearPressedOnce = false;
/**
* @return den aktuellen Bildschirminhalt als String
*/
Expand All @@ -29,6 +30,7 @@ public String readScreen() {
* @param digit Die Ziffer, deren Taste gedrückt wurde
*/
public void pressDigitKey(int digit) {
clearPressedOnce = false;
if(digit > 9 || digit < 0) throw new IllegalArgumentException();

if(screen.equals("0") || latestValue == Double.parseDouble(screen)) screen = "";
Expand All @@ -45,9 +47,15 @@ public void pressDigitKey(int digit) {
* im Ursprungszustand ist.
*/
public void pressClearKey() {
screen = "0";
latestOperation = "";
latestValue = 0.0;
if (clearPressedOnce) {
screen = "0";
latestOperation = "";
latestValue = 0.0;
clearPressedOnce = false;
} else {
screen = "0";
clearPressedOnce = true;
}
}

/**
Expand Down Expand Up @@ -118,14 +126,20 @@ public void pressNegativeKey() {
* und das Ergebnis direkt angezeigt.
*/
public void pressEqualsKey() {
if (latestOperation == null || latestOperation.isEmpty()) {
return;
}

var result = switch(latestOperation) {
case "+" -> latestValue + Double.parseDouble(screen);
case "-" -> latestValue - Double.parseDouble(screen);
case "x" -> latestValue * Double.parseDouble(screen);
case "/" -> latestValue / Double.parseDouble(screen);
default -> throw new IllegalArgumentException();
};

screen = Double.toString(result);

if(screen.equals("Infinity")) screen = "Error";
if(screen.endsWith(".0")) screen = screen.substring(0,screen.length()-2);
if(screen.contains(".") && screen.length() > 11) screen = screen.substring(0, 10);
Expand Down
33 changes: 33 additions & 0 deletions src/test/java/htw/berlin/prog2/ha1/CalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,38 @@ void testMultipleDecimalDots() {


//TODO hier weitere Tests erstellen
@Test
void percentOf50Is0Point5() {
Calculator calculator = new Calculator();

calculator.pressDigitKey(5);
calculator.pressDigitKey(0);
calculator.pressUnaryOperationKey("%");

assertEquals("0.5", calculator.readScreen());
}
@Test
void equalsWithoutPreviousOperationDoesNothing() {
Calculator calculator = new Calculator();

calculator.pressDigitKey(7);
calculator.pressEqualsKey();

assertEquals("7", calculator.readScreen());
}
@Test
void firstClearOnlyClearsCurrentEntryButKeepsPendingOperation() {
Calculator calculator = new Calculator();

calculator.pressDigitKey(7);
calculator.pressBinaryOperationKey("+");
calculator.pressDigitKey(3);

calculator.pressClearKey(); // nur aktuelle Eingabe löschen
calculator.pressDigitKey(2);
calculator.pressEqualsKey();

assertEquals("9", calculator.readScreen());
}
}