style(java/testing): improve the test solutions

APICe-at-DISI · Nov 13, 2023 · 8033125 · 8033125
1 parent d9b2f8b
commit 8033125
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/java/testing/junit/src/test/java/it/unibo/bank/impl/TestStrictBankAccount.java b/java/testing/junit/src/test/java/it/unibo/bank/impl/TestStrictBankAccount.java
@@ -2,16 +2,14 @@
 
 import it.unibo.bank.api.AccountHolder;
 import it.unibo.bank.api.BankAccount;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static it.unibo.bank.impl.SimpleBankAccount.*;
-import static it.unibo.bank.impl.SimpleBankAccount.ATM_TRANSACTION_FEE;
+import static it.unibo.bank.impl.SimpleBankAccount.MANAGEMENT_FEE;
 import static it.unibo.bank.impl.StrictBankAccount.TRANSACTION_FEE;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class TestStrictBankAccount {
 
@@ -39,20 +37,27 @@ public void testInitialization() {
     // 3. Perform a deposit of 100€, compute the management fees, and check that the balance is correctly reduced.
     @Test
     public void testManagementFees() {
+        assertTransactionsAre(0);
         bankAccount.deposit(mRossi.getUserID(), INITIAL_AMOUNT);
+        assertTransactionsAre(1);
         assertEquals(INITIAL_AMOUNT, bankAccount.getBalance());
         bankAccount.chargeManagementFees(mRossi.getUserID());
+        assertTransactionsAre(0);
         assertEquals(INITIAL_AMOUNT - TRANSACTION_FEE - MANAGEMENT_FEE, bankAccount.getBalance());
     }
 
+    private void assertTransactionsAre(final int expectedTransactions) {
+        assertEquals(expectedTransactions, bankAccount.getTransactionsCount());
+    }
+
     // 4. Test the withdraw of a negative value
     @Test
     public void testNegativeWithdraw() {
         try {
             bankAccount.withdraw(mRossi.getUserID(), -INITIAL_AMOUNT);
         } catch (IllegalArgumentException e) {
             assertNotNull(e.getMessage());
-            assertTrue(e.getMessage().length() > 1);
+            assertFalse(e.getMessage().isBlank());
         }
     }
 
@@ -63,7 +68,7 @@ public void testWithdrawingTooMuch() {
             bankAccount.withdraw(mRossi.getUserID(), INITIAL_AMOUNT);
         } catch (IllegalArgumentException e) {
             assertNotNull(e.getMessage());
-            assertTrue(e.getMessage().length() > 1);
+            assertFalse(e.getMessage().isBlank());
         }
     }
 }