Improve test coverage

Author: pauldragoslav

src/main/java/com/example/paul/services/AccountService.java

@@ -4,19 +4,21 @@
 import com.example.paul.repositories.AccountRepository;
 import com.example.paul.repositories.TransactionRepository;
 import com.example.paul.utils.CodeGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Optional;
 
 @Service
 public class AccountService {
 
-    @Autowired
-    private AccountRepository accountRepository;
+    private final AccountRepository accountRepository;
+    private final TransactionRepository transactionRepository;
 
-    @Autowired
-    private TransactionRepository transactionRepository;
+    public AccountService(AccountRepository accountRepository,
+                          TransactionRepository transactionRepository) {
+        this.accountRepository = accountRepository;
+        this.transactionRepository = transactionRepository;
+    }
 
     public Account getAccount(String sortCode, String accountNumber) {
         Optional<Account> account = accountRepository

src/test/java/com/example/paul/unit/AccountServiceTest.java

@@ -1,58 +1,87 @@
 package com.example.paul.unit;
 
 import com.example.paul.models.Account;
+import com.example.paul.models.Transaction;
 import com.example.paul.repositories.AccountRepository;
 import com.example.paul.repositories.TransactionRepository;
 import com.example.paul.services.AccountService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.TestConfiguration;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import java.util.List;
 import java.util.Optional;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;
 
-@ExtendWith(SpringExtension.class)
+@ExtendWith(MockitoExtension.class)
 class AccountServiceTest {
 
-    @TestConfiguration
-    static class AccountServiceTestContextConfiguration {
-
-        @Bean
-        public AccountService accountService() {
-            return new AccountService();
-        }
-    }
-
-    @Autowired
-    private AccountService accountService;
-
-    @MockBean
+    @Mock
     private AccountRepository accountRepository;
-
-    @MockBean
+    @Mock
     private TransactionRepository transactionRepository;
 
+    public AccountService underTest;
+
     @BeforeEach
     void setUp() {
+        underTest = new AccountService(accountRepository, transactionRepository);
+    }
+
+    @Test
+    void shouldReturnAccountBySortCodeAndAccountNumberWhenPresent() {
         var account = new Account(1L, "53-68-92", "78901234", 10.1, "Some Bank", "John");
+        when(accountRepository.findBySortCodeAndAccountNumber("53-68-92", "78901234"))
+                .thenReturn(Optional.of(account));
+
+        var result = underTest.getAccount("53-68-92", "78901234");
 
+        assertThat(result.getOwnerName()).isEqualTo(account.getOwnerName());
+        assertThat(result.getSortCode()).isEqualTo(account.getSortCode());
+        assertThat(result.getAccountNumber()).isEqualTo(account.getAccountNumber());
+    }
+
+    @Test
+    void shouldReturnTransactionsForAccount() {
+        var account = new Account(1L, "53-68-92", "78901234", 10.1, "Some Bank", "John");
         when(accountRepository.findBySortCodeAndAccountNumber("53-68-92", "78901234"))
                 .thenReturn(Optional.of(account));
+        var transaction1 = new Transaction();
+        var transaction2 = new Transaction();
+        transaction1.setReference("a");
+        transaction2.setReference("b");
+        when(transactionRepository.findBySourceAccountIdOrderByInitiationDate(account.getId()))
+                .thenReturn(List.of(transaction1, transaction2));
+
+        var result = underTest.getAccount("53-68-92", "78901234");
+
+        assertThat(result.getTransactions()).hasSize(2);
+        assertThat(result.getTransactions()).extracting("reference").containsExactly("a", "b");
+    }
+
+    @Test
+    void shouldReturnNullWhenAccountBySortCodeAndAccountNotFound() {
+        when(accountRepository.findBySortCodeAndAccountNumber("53-68-92", "78901234"))
+                .thenReturn(Optional.empty());
+
+        var result = underTest.getAccount("53-68-92", "78901234");
+
+        assertThat(result).isNull();
     }
 
     @Test
-    void whenAccountDetails_thenAccountShouldBeFound() {
-        var account = accountService.getAccount("53-68-92", "78901234");
+    void shouldReturnAccountByAccountNumberWhenPresent() {
+    }
 
-        assertThat(account.getOwnerName()).isEqualTo("John");
-        assertThat(account.getSortCode()).isEqualTo("53-68-92");
-        assertThat(account.getAccountNumber()).isEqualTo("78901234");
+    @Test
+    void shouldReturnNullWhenAccountByAccountNotFound() {
+    }
+
+    @Test
+    void shouldCreateAccount() {
     }
 }