Fixed tests.

companieshouse · Jul 25, 2024 · c50e653 · c50e653
1 parent df834fe
commit c50e653
Showing 1 changed file with 26 additions and 20 deletions.
diff --git a/...k/gov/companieshouse/acsp/manage/users/integration/AcspMembersServiceIntegrationTest.java b/...k/gov/companieshouse/acsp/manage/users/integration/AcspMembersServiceIntegrationTest.java
@@ -82,47 +82,48 @@ class AcspMembersServiceIntegrationTest {
 
   private User testUser;
 
-  @BeforeEach
-  void setUp() {
+  private void setupEnvironment(){
     testUser = testDataManager.fetchUserDtos("COMU002").get(0);
 
     acspMembersRepository.deleteAll();
 
     List<AcspMembersDao> testMembers =
-        testDataManager.fetchAcspMembersDaos(
-            "COM002", "COM003", "COM004", "COM005", "COM006", "COM007");
+            testDataManager.fetchAcspMembersDaos(
+                    "COM002", "COM003", "COM004", "COM005", "COM006", "COM007");
     acspMembersRepository.saveAll(testMembers);
 
     when(acspMembershipListMapper.daoToDto(anyList(), eq(testUser)))
-        .thenAnswer(
-            invocation -> {
-              List<AcspMembersDao> daos = invocation.getArgument(0);
-              return daos.stream()
-                  .map(
-                      dao -> {
-                        AcspMembership membership = new AcspMembership();
-                        membership.setAcspNumber(dao.getAcspNumber());
-                        membership.setUserRole(
-                            AcspMembership.UserRoleEnum.fromValue(dao.getUserRole()));
-                        return membership;
-                      })
-                  .toList();
-            });
+            .thenAnswer(
+                    invocation -> {
+                      List<AcspMembersDao> daos = invocation.getArgument(0);
+                      return daos.stream()
+                              .map(
+                                      dao -> {
+                                        AcspMembership membership = new AcspMembership();
+                                        membership.setAcspNumber(dao.getAcspNumber());
+                                        membership.setUserRole(
+                                                AcspMembership.UserRoleEnum.fromValue(dao.getUserRole()));
+                                        return membership;
+                                      })
+                              .toList();
+                    });
   }
 
   @Nested
   class FetchAcspMembershipsTests {
     @Test
     void fetchAcspMembershipsReturnsAcspMembershipsListWithAllAcspMembersIfIncludeRemovedTrue() {
+      setupEnvironment();
+
       AcspMembershipsList result = acspMembersService.fetchAcspMemberships(testUser, true);
 
       assertEquals(1, result.getItems().size());
       assertTrue(result.getItems().stream().anyMatch(m -> m.getAcspNumber().equals("COMA001")));
     }
 
     @Test
-    void
-        fetchAcspMembershipsReturnsAcspMembershipsListWithActiveAcspMembersIfIncludeRemovedFalse() {
+    void fetchAcspMembershipsReturnsAcspMembershipsListWithActiveAcspMembersIfIncludeRemovedFalse() {
+      setupEnvironment();
       AcspMembershipsList result = acspMembersService.fetchAcspMemberships(testUser, false);
 
       assertEquals(1, result.getItems().size());
@@ -150,6 +151,7 @@ void fetchAcspMembershipsReturnsAcspMembershipsListWithAllAcspMembersIfIncludeRe
 
   @Nested
   class FindAllByAcspNumberAndRoleTests {
+
     private AcspDataDao acspDataDao;
 
     @BeforeEach
@@ -179,6 +181,7 @@ void setUp() {
 
     @Test
     void findAllByAcspNumberAndRoleReturnsCorrectResultsWithRoleAndIncludeRemovedTrue() {
+      setupEnvironment();
       AcspMembershipsList result =
           acspMembersService.findAllByAcspNumberAndRole(
               "COMA001", acspDataDao, "standard", true, 0, 10);
@@ -191,6 +194,7 @@ void findAllByAcspNumberAndRoleReturnsCorrectResultsWithRoleAndIncludeRemovedTru
 
     @Test
     void findAllByAcspNumberAndRoleReturnsCorrectResultsWithRoleAndIncludeRemovedFalse() {
+      setupEnvironment();
       AcspMembershipsList result =
           acspMembersService.findAllByAcspNumberAndRole(
               "COMA001", acspDataDao, "standard", false, 0, 10);
@@ -203,6 +207,7 @@ void findAllByAcspNumberAndRoleReturnsCorrectResultsWithRoleAndIncludeRemovedFal
 
     @Test
     void findAllByAcspNumberAndRoleReturnsCorrectResultsWithoutRoleAndIncludeRemovedTrue() {
+      setupEnvironment();
       AcspMembershipsList result =
           acspMembersService.findAllByAcspNumberAndRole("COMA001", acspDataDao, null, true, 0, 10);
 
@@ -211,6 +216,7 @@ void findAllByAcspNumberAndRoleReturnsCorrectResultsWithoutRoleAndIncludeRemoved
 
     @Test
     void findAllByAcspNumberAndRoleReturnsCorrectResultsWithoutRoleAndIncludeRemovedFalse() {
+      setupEnvironment();
       AcspMembershipsList result =
           acspMembersService.findAllByAcspNumberAndRole("COMA001", acspDataDao, null, false, 0, 10);