Issue #257 fix tests

jmprathab · Mar 10, 2021 · 2fbb1bb · 2fbb1bb
1 parent 3bf9f06
commit 2fbb1bb
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 43 deletions.
diff --git a/service/src/test/java/com/myhome/controllers/AmenityControllerTest.java b/service/src/test/java/com/myhome/controllers/AmenityControllerTest.java
@@ -18,17 +18,14 @@
 
 import com.myhome.controllers.mapper.AmenityApiMapper;
 import com.myhome.domain.Amenity;
-import com.myhome.model.AddAmenityRequest;
-import com.myhome.model.AddAmenityResponse;
 import com.myhome.model.AmenityDto;
 import com.myhome.model.GetAmenityDetailsResponse;
 import com.myhome.model.UpdateAmenityRequest;
+import com.myhome.services.AmenityBookingService;
 import com.myhome.services.AmenityService;
 import java.math.BigDecimal;
-import java.util.HashSet;
 import java.util.Optional;
 
-import helpers.TestUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
@@ -58,6 +55,8 @@ class AmenityControllerTest {
   private AmenityService amenitySDJpaService;
   @Mock
   private AmenityApiMapper amenityApiMapper;
+  @Mock
+  private AmenityBookingService amenityBookingService;
 
   @InjectMocks
   private AmenityController amenityController;
@@ -183,7 +182,7 @@ void shouldNotUpdateCommunityAmenityIfAmenityNotExists() {
   @Test
   void deleteBooking() {
     // given
-    given(amenitySDJpaService.deleteBooking(TEST_BOOKING_ID))
+    given(amenityBookingService.deleteBooking(TEST_BOOKING_ID))
             .willReturn(true);
 
     // when
@@ -192,12 +191,12 @@ void deleteBooking() {
     // then
     assertNull(response.getBody());
     assertEquals(HttpStatus.NO_CONTENT, response.getStatusCode());
-    verify(amenitySDJpaService).deleteBooking(TEST_BOOKING_ID);
+    verify(amenityBookingService).deleteBooking(TEST_BOOKING_ID);
   }
   @Test
   void deleteBookingNotExists() {
     // given
-    given(amenitySDJpaService.deleteBooking(TEST_BOOKING_ID))
+    given(amenityBookingService.deleteBooking(TEST_BOOKING_ID))
             .willReturn(false);
 
     // when
@@ -206,7 +205,7 @@ void deleteBookingNotExists() {
     // then
     assertNull(response.getBody());
     assertEquals(HttpStatus.NOT_FOUND, response.getStatusCode());
-    verify(amenitySDJpaService).deleteBooking(TEST_BOOKING_ID);
+    verify(amenityBookingService).deleteBooking(TEST_BOOKING_ID);
   }
 
   private Amenity getTestAmenity() {

diff --git a/service/src/test/java/com/myhome/services/unit/AmenitySDJpaServiceTest.java b/service/src/test/java/com/myhome/services/unit/AmenitySDJpaServiceTest.java
@@ -24,6 +24,7 @@
 import com.myhome.repositories.AmenityBookingItemRepository;
 import com.myhome.repositories.AmenityRepository;
 import com.myhome.repositories.CommunityRepository;
+import com.myhome.services.AmenityBookingService;
 import com.myhome.services.CommunityService;
 import com.myhome.services.springdatajpa.AmenitySDJpaService;
 import helpers.TestUtils;
@@ -58,7 +59,6 @@ class AmenitySDJpaServiceTest {
   private final String TEST_AMENITY_ID = "test-amenity-id";
   private final String TEST_AMENITY_DESCRIPTION = "test-amenity-description";
   private final String TEST_COMMUNITY_ID = "test-community-id";
-  private final int TEST_AMENITIES_COUNT = 2;
   @Mock
   private AmenityRepository amenityRepository;
   @Mock
@@ -114,38 +114,6 @@ void deleteAmenityNotExists() {
     verify(amenityRepository, never()).delete(any());
   }
 
-  @Test
-  void listAllAmenities() {
-    // given
-    Set<Amenity> testAmenities = TestUtils.AmenityHelpers.getTestAmenities(TEST_AMENITIES_COUNT);
-    Community testCommunity = TestUtils.CommunityHelpers.getTestCommunity();
-    testCommunity.setAmenities(testAmenities);
-
-    given(communityRepository.findByCommunityIdWithAmenities(TEST_COMMUNITY_ID))
-        .willReturn(Optional.of(testCommunity));
-
-    // when
-    Set<Amenity> resultAmenities = amenitySDJpaService.listAllAmenities(TEST_COMMUNITY_ID);
-
-    // then
-    assertEquals(testAmenities, resultAmenities);
-    verify(communityRepository).findByCommunityIdWithAmenities(TEST_COMMUNITY_ID);
-  }
-
-  @Test
-  void listAllAmenitiesNotExists() {
-    // given
-    given(communityRepository.findByCommunityIdWithAmenities(TEST_COMMUNITY_ID))
-        .willReturn(Optional.empty());
-
-    // when
-    Set<Amenity> resultAmenities = amenitySDJpaService.listAllAmenities(TEST_COMMUNITY_ID);
-
-    // then
-    assertEquals(new HashSet<>(), resultAmenities);
-    verify(communityRepository).findByCommunityIdWithAmenities(TEST_COMMUNITY_ID);
-  }
-
   @Test
   void shouldAddAmenityToExistingCommunity() {
     // given
@@ -308,7 +276,7 @@ void deleteBookingItem() {
         .willReturn(Optional.of(testBookingItem));
 
     // when
-    boolean bookingDeleted = amenitySDJpaService.deleteBooking(TEST_BOOKING_ID);
+    boolean bookingDeleted = amenityBookingService.deleteBooking(TEST_BOOKING_ID);
 
     // then
     assertTrue(bookingDeleted);
@@ -323,7 +291,7 @@ void deleteBookingNotExists() {
         .willReturn(Optional.empty());
 
     // when
-    boolean amenityDeleted = amenitySDJpaService.deleteBooking(TEST_BOOKING_ID);
+    boolean amenityDeleted = amenityBookingService.deleteBooking(TEST_BOOKING_ID);
 
     // then
     assertFalse(amenityDeleted);

diff --git a/service/src/test/java/com/myhome/services/unit/CommunitySDJpaServiceTest.java b/service/src/test/java/com/myhome/services/unit/CommunitySDJpaServiceTest.java
@@ -16,6 +16,7 @@
 
 package com.myhome.services.unit;
 
+import com.myhome.domain.Amenity;
 import helpers.TestUtils;
 import com.myhome.controllers.dto.CommunityDto;
 import com.myhome.controllers.dto.mapper.CommunityMapper;
@@ -64,6 +65,7 @@ public class CommunitySDJpaServiceTest {
   private final int TEST_HOUSES_COUNT = 2;
   private final int TEST_HOUSE_MEMBERS_COUNT = 2;
   private final int TEST_COMMUNITIES_COUNT = 2;
+  private final int TEST_AMENITIES_COUNT = 2;
 
   private final String TEST_ADMIN_ID = "test-admin-id";
   private final String TEST_ADMIN_NAME = "test-user-name";
@@ -565,6 +567,38 @@ void removeHouseFromCommunityByHouseIdHouseNotInCommunity() {
     verify(communityRepository, never()).save(testCommunity);
   }
 
+  @Test
+  void listAllAmenities() {
+    // given
+    Set<Amenity> testAmenities = TestUtils.AmenityHelpers.getTestAmenities(TEST_AMENITIES_COUNT);
+    Community testCommunity = TestUtils.CommunityHelpers.getTestCommunity();
+    testCommunity.setAmenities(testAmenities);
+
+    given(communityRepository.findByCommunityIdWithAmenities(TEST_COMMUNITY_ID))
+        .willReturn(Optional.of(testCommunity));
+
+    // when
+    Set<Amenity> resultAmenities = communitySDJpaService.listAllAmenities(TEST_COMMUNITY_ID);
+
+    // then
+    assertEquals(testAmenities, resultAmenities);
+    verify(communityRepository).findByCommunityIdWithAmenities(TEST_COMMUNITY_ID);
+  }
+
+  @Test
+  void listAllAmenitiesNotExists() {
+    // given
+    given(communityRepository.findByCommunityIdWithAmenities(TEST_COMMUNITY_ID))
+        .willReturn(Optional.empty());
+
+    // when
+    Set<Amenity> resultAmenities = communitySDJpaService.listAllAmenities(TEST_COMMUNITY_ID);
+
+    // then
+    assertEquals(new HashSet<>(), resultAmenities);
+    verify(communityRepository).findByCommunityIdWithAmenities(TEST_COMMUNITY_ID);
+  }
+
   private CommunityDto getTestCommunityDto() {
     CommunityDto testCommunityDto = new CommunityDto();
     testCommunityDto.setCommunityId(TEST_COMMUNITY_ID);