diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index e60ee87..4cf9f3b 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/MeinGui.class and b/Budget Projekt/bin/MeinBudgetView/MeinGui.class differ diff --git a/Budget Projekt/bin/MeinBudgetView/MyTest.class b/Budget Projekt/bin/MeinBudgetView/MyTest.class index 8a1c6cb..6362c8c 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/MyTest.class and b/Budget Projekt/bin/MeinBudgetView/MyTest.class differ diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index c492ec9..0c4ee3d 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -254,8 +254,8 @@ public class MeinGui extends JFrame implements ActionListener { tab.addRow(new Object[] { (textExpensesName.getText()), Double.parseDouble(text2.getText()) }); balance -= Double.parseDouble(text2.getText()); - expenses += Double.parseDouble(text2.getText()); - + expenses += Double.parseDouble(text2.getText()); + expensesDisplay.setText(setExpensesView()); balanceDisplay.setText(setBalanceView()); } @@ -280,10 +280,15 @@ public class MeinGui extends JFrame implements ActionListener { String result = budget + " €"; return result; } - + public static String setBalanceView() { String result = budget - expenses + " €"; return result; } + public static String setExpensesView() { + String result = "-" + expenses + " €"; + return result; + } + } diff --git a/Budget Projekt/src/MeinBudgetView/MyTest.java b/Budget Projekt/src/MeinBudgetView/MyTest.java index b2a2f5d..8abdc57 100644 --- a/Budget Projekt/src/MeinBudgetView/MyTest.java +++ b/Budget Projekt/src/MeinBudgetView/MyTest.java @@ -32,4 +32,18 @@ class MyTest { } + @Test + public void testSetExpensesView() { + + MeinGui.expenses = 1234; + assertEquals("-" + 1234.0 + " €", MeinGui.setExpensesView()); + assertNotEquals(1234.0 + " €", MeinGui.setExpensesView()); + assertNotEquals(null, MeinGui.setBalanceView()); + MeinGui.expenses = 4321.; + assertEquals("-" + 4321.0 + " €", MeinGui.setExpensesView()); + assertNotEquals("-" + 4321 + " €", MeinGui.setExpensesView()); + assertNotEquals("-" + 4321.0 + "€", MeinGui.setExpensesView()); + + } + }