Task 20 : Revise all tests

Rapter1990 · Sep 28, 2024 · b4ed9a4 · b4ed9a4
1 parent 21199a6
commit b4ed9a4
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/...st/java/com/casestudy/migroscouriertracking/courier/controller/CourierControllerTest.java b/...st/java/com/casestudy/migroscouriertracking/courier/controller/CourierControllerTest.java
@@ -58,6 +58,7 @@ public void logCourierLocation_shouldReturnSuccessMessage() throws Exception {
 
     @Test
     public void getPastTravels_shouldReturnListOfTravels() throws Exception {
+
         // Given
         String courierId = "123e4567-e89b-12d3-a456-426614174000";
         List<Courier> travels = List.of(

diff --git a/...com/casestudy/migroscouriertracking/courier/model/dto/request/TravelQueryRequestTest.java b/...com/casestudy/migroscouriertracking/courier/model/dto/request/TravelQueryRequestTest.java
@@ -23,6 +23,7 @@ public TravelQueryRequestTest() {
 
     @Test
     void shouldThrowIllegalArgumentExceptionWhenStartTimeIsAfterEndTime() {
+
         // Given
         LocalDateTime start = LocalDateTime.now().plusDays(1); // Future date
         LocalDateTime end = LocalDateTime.now(); // Current date
@@ -41,10 +42,12 @@ void shouldThrowIllegalArgumentExceptionWhenStartTimeIsAfterEndTime() {
         assertFalse(violations.isEmpty(), "Violations should be present");
         assertTrue(violations.stream().anyMatch(v -> v.getMessage().equals("Start time must be before end time")),
                 "Violation for invalid time range should be present");
+
     }
 
     @Test
     void shouldPassWhenValidTimeRangeProvided() {
+
         // Given
         LocalDateTime start = LocalDateTime.now().minusDays(1); // Past date
         LocalDateTime end = LocalDateTime.now().plusDays(1); // Future date
@@ -61,10 +64,12 @@ void shouldPassWhenValidTimeRangeProvided() {
 
         // Then
         assertTrue(violations.isEmpty(), "No violations should be present for a valid time range");
+
     }
 
     @Test
     void shouldFailOnInvalidUUIDFormat() {
+
         // Given
         LocalDateTime start = LocalDateTime.now().minusDays(1);
         LocalDateTime end = LocalDateTime.now().plusDays(1);
@@ -83,10 +88,12 @@ void shouldFailOnInvalidUUIDFormat() {
         assertFalse(violations.isEmpty(), "Violations should be present for invalid UUID format");
         assertTrue(violations.stream().anyMatch(v -> v.getMessage().equals("Invalid UUID format")),
                 "Violation for invalid UUID should be present");
+
     }
 
     @Test
     void shouldFailWhenStoreNameIsBlank() {
+
         // Given
         LocalDateTime start = LocalDateTime.now().minusDays(1);
         LocalDateTime end = LocalDateTime.now().plusDays(1);
@@ -105,10 +112,12 @@ void shouldFailWhenStoreNameIsBlank() {
         assertFalse(violations.isEmpty(), "Violations should be present for blank store name");
         assertTrue(violations.stream().anyMatch(v -> v.getMessage().equals("Store name cannot be blank")),
                 "Violation for blank store name should be present");
+
     }
 
     @Test
     void shouldFailWhenStartIsNull() {
+
         // Given
         LocalDateTime end = LocalDateTime.now().plusDays(1);
 
@@ -130,6 +139,7 @@ void shouldFailWhenStartIsNull() {
 
     @Test
     void shouldFailWhenEndIsNull() {
+
         // Given
         LocalDateTime start = LocalDateTime.now().minusDays(1);
 
@@ -147,6 +157,7 @@ void shouldFailWhenEndIsNull() {
         assertFalse(violations.isEmpty(), "Violations should be present for null end time");
         assertTrue(violations.stream().anyMatch(v -> v.getMessage().equals("End time cannot be null")),
                 "Violation for null end time should be present");
+
     }
 
 }
diff --git a/src/test/java/com/casestudy/migroscouriertracking/courier/service/CourierServiceTest.java b/src/test/java/com/casestudy/migroscouriertracking/courier/service/CourierServiceTest.java
@@ -79,6 +79,9 @@ void logCourierLocation_shouldThrowTimestampBeforeStoreCreateException_ifTimesta
         // Then
         assertThrows(TimestampBeforeStoreCreateException.class, () -> courierService.logCourierLocation(logRequest));
 
+        // Verify
+        verify(storeRepository).findAll();
+
     }
 
     @Test
@@ -94,6 +97,9 @@ void logCourierLocation_shouldThrowStoreFarAwayException_ifCourierIsFarAwayFromA
         // Then
         assertThrows(StoreFarAwayException.class, () -> courierService.logCourierLocation(logRequest));
 
+        // Verify
+        verify(storeRepository).findAll();
+
     }
 
     @Test
@@ -112,6 +118,8 @@ void getPastTravelsByCourierId_shouldReturnTravelsForGivenCourierId() {
 
         assertFalse(result.isEmpty());
         assertEquals(couriers.get(0).getCourierId(), result.get(0).getCourierId());
+
+        // Verify
         verify(courierRepository).findByCourierId(courierId);
 
     }
@@ -132,6 +140,8 @@ void getTravelsByCourierIdStoreNameAndTimeRange_shouldReturnTravelsWithinTimeRan
 
         assertFalse(result.isEmpty());
         assertEquals(couriers.get(0).getCourierId(), result.get(0).getCourierId());
+
+        // Verify
         verify(courierRepository).findByCourierIdAndStoreNameAndTimestampBetween(request.getCourierId(), request.getStoreName(), request.getStart(), request.getEnd());
 
     }
@@ -163,6 +173,8 @@ void getTotalTravelDistance_shouldReturnTotalDistanceTraveledByCourier() {
         double totalDistance = courierService.getTotalTravelDistance(courierId);
 
         assertEquals(distanceInKilometers, totalDistance, 0.001); // Allow a small tolerance for floating point comparisons
+
+        // Verify
         verify(courierRepository).findByCourierIdOrderByTimestampAsc(courierId);
 
     }

diff --git a/...estudy/migroscouriertracking/courier/strategy/DistanceInMetersCalculatorStrategyTest.java b/...estudy/migroscouriertracking/courier/strategy/DistanceInMetersCalculatorStrategyTest.java
@@ -17,6 +17,7 @@ public void setUp() {
 
     @Test
     public void testCalculateDistance_sameLocation() {
+
         // Given
         Location startLoc = new Location(39.9255, 32.8662); // Ankara
         Location endLoc = new Location(39.9255, 32.8662); // Ankara
@@ -26,6 +27,7 @@ public void testCalculateDistance_sameLocation() {
 
         // Then
         assertEquals(0.0, distance, 0.001); // Distance should be 0 meters
+
     }
 
 }
diff --git a/src/test/java/com/casestudy/migroscouriertracking/courier/utils/DistanceUtilsTest.java b/src/test/java/com/casestudy/migroscouriertracking/courier/utils/DistanceUtilsTest.java
@@ -22,6 +22,7 @@ void utilityClass_ShouldNotBeInstantiated() {
 
     @Test
     public void testIsWithinRadiusReturnsTrueWhenWithinRadiusInKilometers() {
+
         double courierLat = 37.7749;
         double courierLng = -122.4194;
         double storeLat = 37.7750;
@@ -33,10 +34,12 @@ public void testIsWithinRadiusReturnsTrueWhenWithinRadiusInKilometers() {
         boolean result = DistanceUtils.isWithinRadius(courierLat, courierLng, storeLat, storeLng, radiusInMeters);
 
         assertTrue(result, "Courier should be within the radius of the store.");
+
     }
 
     @Test
     public void testIsWithinRadiusReturnsFalseWhenOutsideRadiusInKilometers() {
+
         double courierLat = 37.7749;
         double courierLng = -122.4194;
         double storeLat = 37.7800;
@@ -48,10 +51,12 @@ public void testIsWithinRadiusReturnsFalseWhenOutsideRadiusInKilometers() {
         boolean result = DistanceUtils.isWithinRadius(courierLat, courierLng, storeLat, storeLng, radiusInMeters);
 
         assertFalse(result, "Courier should not be within the radius of the store.");
+
     }
 
     @Test
     public void testCalculateDistanceReturnsCorrectDistanceInKilometers() {
+
         double lat1 = 37.7749;
         double lng1 = -122.4194;
         double lat2 = 37.7750;
@@ -65,34 +70,40 @@ public void testCalculateDistanceReturnsCorrectDistanceInKilometers() {
 
         assertTrue(Math.abs(distance - expectedDistanceInKm) <= tolerance,
                 "Calculated distance should be within the expected range.");
+
     }
 
     @Test
     public void testIsMoreThanOneMinuteAgoReturnsTrue() {
+
         LocalDateTime lastTimestamp = LocalDateTime.now().minusMinutes(2);
         LocalDateTime currentTimestamp = LocalDateTime.now();
 
         // Directly call the static method
         boolean result = DistanceUtils.isMoreThanOneMinuteAgo(lastTimestamp, currentTimestamp);
 
         assertTrue(result, "Timestamp should be more than one minute ago.");
+
     }
 
     @Test
     public void testIsMoreThanOneMinuteAgoReturnsFalse() {
+
         LocalDateTime lastTimestamp = LocalDateTime.now().minusSeconds(30);
         LocalDateTime currentTimestamp = LocalDateTime.now();
 
         // Directly call the static method
         boolean result = DistanceUtils.isMoreThanOneMinuteAgo(lastTimestamp, currentTimestamp);
 
         assertFalse(result, "Timestamp should not be more than one minute ago.");
+
     }
 
     /**
      * Haversine formula to calculate the distance between two points on the Earth's surface.
      */
     private double haversine(double lat1, double lng1, double lat2, double lng2) {
+
         final double R = 6371.0; // Radius of the Earth in kilometers
         double dLat = Math.toRadians(lat2 - lat1);
         double dLng = Math.toRadians(lng2 - lng1);
@@ -101,5 +112,7 @@ private double haversine(double lat1, double lng1, double lat2, double lng2) {
                         Math.sin(dLng / 2) * Math.sin(dLng / 2);
         double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
         return R * c;
+
     }
+
 }