diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 98894d7..1b366b2 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 9918b5d..93f2812 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 295d3bf..d01c2b5 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -201,7 +201,7 @@ public class MeinGui extends JFrame implements ActionListener { expenses = budget - Integer.parseInt(text2.getText()); expensesDisplay.setText(setExpensesView()); balance = Integer.parseInt(text1.getText()) - Integer.parseInt(text2.getText()); - setBalanceView(); + balanceDisplay.setText(setBalanceView()); } } @@ -229,8 +229,9 @@ public class MeinGui extends JFrame implements ActionListener { return result; } - public static void setBalanceView() { - balanceDisplay.setText(balance + " €"); + public static String setBalanceView() { + String result = balance + " €"; + return result; } } diff --git a/Budget Projekt/src/MeinBudgetView/MyTest.java b/Budget Projekt/src/MeinBudgetView/MyTest.java index 8cfc758..1235593 100644 --- a/Budget Projekt/src/MeinBudgetView/MyTest.java +++ b/Budget Projekt/src/MeinBudgetView/MyTest.java @@ -24,5 +24,16 @@ class MyTest { assertNotEquals(MeinGui.expenses - MeinGui.budget + "", MeinGui.setExpensesView()); } + + @Test + public void testSetBalanceView() { + assertEquals(MeinGui.balance + " €", MeinGui.setExpensesView()); + assertNotEquals(MeinGui.balance, MeinGui.setExpensesView()); + assertNotEquals(MeinGui.balance + "€ " , MeinGui.setExpensesView()); + assertNotEquals(MeinGui.balance+ " € " , MeinGui.setExpensesView()); + assertNotEquals(MeinGui.balance*2 + " € ", MeinGui.setExpensesView()); + + + } }