Konflikt behoben

Budget Projekt/src/MeinBudgetView/MeinGui.java

@@ -250,15 +250,16 @@ public class MeinGui extends JFrame implements ActionListener {
 		}
 
 		if (ae.getSource() == this.berechne && (text1 != null && text2 != null)) {
-			expenses = budget - Double.parseDouble(text2.getText());
+			DefaultTableModel tab = (DefaultTableModel) myTable.getModel();
+			tab.addRow(new Object[] { (textExpensesName.getText()), Double.parseDouble(text2.getText()) });
+
+			balance -= Double.parseDouble(text2.getText());
+			expenses += Double.parseDouble(text2.getText());
 			expensesDisplay.setText(setExpensesView());
-			balance = Double.parseDouble(text1.getText()) - Double.parseDouble(text2.getText());
 			balanceDisplay.setText(setBalanceView());
 
 		}
-		DefaultTableModel tab = (DefaultTableModel)myTable.getModel();  
-		tab.addRow(new Object [] {(textExpensesName.getText()) , Double.parseDouble(text2.getText())});
-		
+
 	}
 
 	public void exitButton() {
@@ -272,7 +273,7 @@ public class MeinGui extends JFrame implements ActionListener {
 		expensesDisplay.setText(null);
 		balanceDisplay.setText(null);
 		textExpensesName.setText(null);
-		((DefaultTableModel)myTable.getModel()).setRowCount(0);
+		((DefaultTableModel) myTable.getModel()).setRowCount(0);
 	}
 
 	public static String setBudgetView() {
@@ -280,14 +281,14 @@ public class MeinGui extends JFrame implements ActionListener {
 		return result;
 	}
 
-	public static String setExpensesView() {
-		String result = expenses - budget + " €";
+	public static String setBalanceView() {
+		String result = budget - expenses + " €";
 		return result;
 	}
 
-	public static String setBalanceView() {
-		String result = balance + " €";
+	public static String setExpensesView() {
+		String result = "-" + expenses + " €";
 		return result;
 	}
-	
+
 }

Budget Projekt/src/MeinBudgetView/MyTest.java

@@ -8,32 +8,42 @@ class MyTest {
 
 	@Test
 	public void testSetBudgetView() {
-		assertEquals(MeinGui.budget + " €", MeinGui.setBudgetView());
-		assertNotEquals(MeinGui.budget + " ", MeinGui.setBudgetView());
-		assertNotEquals(MeinGui.budget + "€ ", MeinGui.setBudgetView());
-		assertNotEquals(MeinGui.budget + "  € ", MeinGui.setBudgetView());
-		assertNotEquals(MeinGui.budget + " ", MeinGui.setBudgetView());
+		MeinGui.budget = 2000.;
+
+		assertEquals(2000.0 + " €", MeinGui.setBudgetView());
+		assertNotEquals(2000 + " €", MeinGui.setBudgetView());
+		assertNotEquals(2000.0 + "€ ", MeinGui.setBudgetView());
+		assertNotEquals(2000 + " €", MeinGui.setBudgetView());
+		assertNotEquals(2000.0 + "€", 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());
-	
+	public void testSetBalanceView() {
+
+		MeinGui.budget = 2000.;
+		MeinGui.expenses = 405.;
+
+		assertEquals(1595.0 + " €", MeinGui.setBalanceView());
+		assertNotEquals(1595 + " €", MeinGui.setBalanceView());
+		assertNotEquals(1595 + "€ ", MeinGui.setBalanceView());
+		assertNotEquals(1595 + "€", MeinGui.setBalanceView());
+		assertNotEquals(null, MeinGui.setBalanceView());
+
 	}
-	
+
 	@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());
-	
-		
+	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());
+
 	}
 
 }