From 737640d2b2ffae51744375b1eb8d347e90a7eeb2 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Sun, 2 Feb 2020 02:48:33 +0100 Subject: [PATCH] Commit_19 setBalanceView() mit Tests implementiert --- .../bin/MeinBudgetView/MeinGui.class | Bin 5844 -> 5856 bytes .../bin/MeinBudgetView/MyTest.class | Bin 1429 -> 1681 bytes .../src/MeinBudgetView/MeinGui.java | 7 ++++--- Budget Projekt/src/MeinBudgetView/MyTest.java | 11 +++++++++++ 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 98894d705627e0fa1d6426c0f385b84714c52181..1b366b20e072a8e475dd22d856d3982a3321a3a6 100644 GIT binary patch delta 148 zcmcbj`#^WY6E4PYo1b#2adL7qFaaS0!_3JdBEh`wn;7zrF*t5wC^^PpJ-I|gpK}w# z#T|@1+ZdT9FB7rToxyOPK@X@}45EkO2E$Dt52%}wpHYB;kx>xH=3rpq=hgnr;I~;& pG@fztAyF|VMy|=XL={C}GKe$00_*2tU<9(67&RHSChriF0RT%fA^^@q=Fz}aD6MI*Y7}yL9d5oAf`9L$2<{b0JURTf-&AY55bV2T1wjq{PUxu%L)Kd@D%8?h77i)icw bFyM=-G~tB?-f80RJA>U+d;AkbTfEd4-h?B@ diff --git a/Budget Projekt/bin/MeinBudgetView/MyTest.class b/Budget Projekt/bin/MeinBudgetView/MyTest.class index 9918b5d8a0984374be2fbe47d06c19b8c35fda81..93f2812283953a9d8a46ff8140f6b3eb4e14bcdf 100644 GIT binary patch delta 258 zcmbQrJ&~8|)W2Q(7#JAL7=ku(#WSl5m82Gz1gDlbCFUgNC8vgErj~Ouh%or^F!(b_ zFfy3JgvRiVU#~ dN(@yDstnvfckw`62c&s{JVu59Aj!lK2mt0LJ>mcW delta 36 scmbQpJC&R3)W2Q(7#JAL82mPJ#WPQy#H_-|ym>n_6B8=~0~3QU0Mq6PKL7v# 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()); + + + } }