diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index f1e48c8..98894d7 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 486adef..9918b5d 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 3e590a1..295d3bf 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -199,7 +199,7 @@ public class MeinGui extends JFrame implements ActionListener { if (ae.getSource() == this.berechne && (text1 != null && text2 != null)) { expenses = budget - Integer.parseInt(text2.getText()); - setExpensesView(); + expensesDisplay.setText(setExpensesView()); balance = Integer.parseInt(text1.getText()) - Integer.parseInt(text2.getText()); setBalanceView(); } @@ -224,8 +224,9 @@ public class MeinGui extends JFrame implements ActionListener { return result; } - public static void setExpensesView() { - expensesDisplay.setText(expenses - budget + " €"); + public static String setExpensesView() { + String result = expenses - budget + " €"; + return result; } public static void setBalanceView() { diff --git a/Budget Projekt/src/MeinBudgetView/MyTest.java b/Budget Projekt/src/MeinBudgetView/MyTest.java index 6f9308a..8cfc758 100644 --- a/Budget Projekt/src/MeinBudgetView/MyTest.java +++ b/Budget Projekt/src/MeinBudgetView/MyTest.java @@ -13,8 +13,16 @@ class MyTest { assertNotEquals(MeinGui.budget + "€ ", MeinGui.setBudgetView()); assertNotEquals(MeinGui.budget + " € ", MeinGui.setBudgetView()); assertNotEquals(MeinGui.budget + " ", MeinGui.setBudgetView()); - - + } + + @Test + public void testSetExpensesView() { + assertEquals(MeinGui.expenses - MeinGui.budget + " €", MeinGui.setExpensesView()); + assertNotEquals(MeinGui.expenses - MeinGui.budget, MeinGui.setExpensesView()); + assertNotEquals(MeinGui.expenses - MeinGui.budget + "€ " , MeinGui.setExpensesView()); + assertNotEquals(MeinGui.expenses - MeinGui.budget + " € " , MeinGui.setExpensesView()); + assertNotEquals(MeinGui.expenses - MeinGui.budget + "", MeinGui.setExpensesView()); + } }