Merge branch 'staging' into async

ADPRO-C11 · May 26, 2024 · 444f52d · 444f52d
2 parents 695574d + 03cfd96
commit 444f52d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,6 @@ dependencies {
 	compileOnly("org.projectlombok:lombok")
 	developmentOnly("org.springframework.boot:spring-boot-devtools")
 	runtimeOnly("org.postgresql:postgresql")
-	runtimeOnly("io.micrometer:micrometer-registry-prometheus")
 	annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
 	annotationProcessor("org.projectlombok:lombok")
 	testImplementation("org.springframework.boot:spring-boot-starter-test")

diff --git a/src/test/java/snackscription/review/service/ReviewServiceTest.java b/src/test/java/snackscription/review/service/ReviewServiceTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.verify;
@@ -59,7 +60,7 @@ public void setUp() {
 
 
     @Test
-    public void testGetSubsboxReview() throws Exception {
+    public void testGetSubsboxReview() throws Exception {    
         String subscriptionBoxId = this.reviews.getFirst().getSubsbox();
         List<Review> curReviews = new ArrayList<>();
         for (Review review : this.reviews) {            
@@ -68,7 +69,6 @@ public void testGetSubsboxReview() throws Exception {
             }
         }
 
-        when(reviewRepo.findByIdSubsbox(subscriptionBoxId)).thenReturn(curReviews);
         when(reviewRepo.findByIdSubsbox(subscriptionBoxId)).thenReturn(curReviews);
 
         List<Review> foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, null);        
@@ -78,7 +78,7 @@ public void testGetSubsboxReview() throws Exception {
         verify(reviewRepo).findByIdSubsbox(subscriptionBoxId);
     }
 
-    @Test
+    @Test    
     public void testGetSubsboxReviewNotFound() throws Exception {
         String subscriptionBoxId = "nonexistent_subsbox_id";
 
@@ -87,13 +87,13 @@ public void testGetSubsboxReviewNotFound() throws Exception {
         List<Review> foundReviews = reviewService.getSubsboxReview(subscriptionBoxId, null);
 
         assertNotNull(foundReviews);
-        assertEquals(0, foundReviews.size());
+        assertEquals(0, foundReviews.size());       
 
         verify(reviewRepo).findByIdSubsbox(subscriptionBoxId);
     }
 
     @Test
-    public void testGetSubsboxReviewApproved() throws Exception {
+    public void testGetSubsboxReviewApproved() throws Exception {    
         String subscriptionBoxId = this.reviews.getFirst().getSubsbox();
 
         List <Review> cuReviews = new ArrayList<>();