changes for unit tests

Author: naman-sriv

Diff for: microservices-self-registration/contextservice/src/main/java/com/learning/contextservice/MyCustomHealthCheck.java

@@ -6,6 +6,7 @@
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import java.time.Clock;
 
 @Component("myCustomHealthCheck")
 public class MyCustomHealthCheck implements HealthIndicator {
@@ -22,7 +23,7 @@ public void updateHealthStatus() {
     log.info("Update health status : {}", isHealthy);
   }
 
-  private boolean performHealthCheck() {
+  boolean performHealthCheck() {
     boolean current = System.currentTimeMillis() % 10000 < 5000; // Simulate fluctuating health
     log.debug("Performing health check, current status: {}", current);
     return current; // Simulate fluctuating health

Diff for: microservices-self-registration/contextservice/src/test/java/com/learning/contextservice/myCustomHealthCheckTest.java

@@ -1,16 +1,23 @@
 package com.learning.contextservice;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.boot.actuate.health.Status;
 
+import java.time.Clock;
+import java.time.Instant;
+import java.time.ZoneId;
 import java.util.function.BooleanSupplier;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.doReturn;
 
 class MyCustomHealthCheckTest {
 
+  MyCustomHealthCheck healthCheck = new MyCustomHealthCheck();
+
   @Test
   void testHealthUp() {
     MyCustomHealthCheck healthCheck = new MyCustomHealthCheck();
@@ -34,33 +41,17 @@ void testHealthDown() {
   }
 
   @Test
-  void testUpdateHealthStatusSetsIsHealthy() throws Exception {
-    MyCustomHealthCheck healthCheck = new MyCustomHealthCheck();
+  void testUpdateHealthStatusSetsIsHealthyWithMocking() throws Exception {
+    MyCustomHealthCheck healthCheck = Mockito.spy(new MyCustomHealthCheck());
 
-    // Force performHealthCheck to return true (by time simulation - might be flaky)
-    long currentTimeForTrue = System.currentTimeMillis();
-    while (currentTimeForTrue % 10000 >= 5000) {
-      Thread.sleep(10); // Wait until time is in the "true" range
-      currentTimeForTrue = System.currentTimeMillis();
-    }
-    ReflectionTestUtils.invokeMethod(healthCheck, "performHealthCheck");
+    // Force performHealthCheck to return true
+    doReturn(true).when(healthCheck).performHealthCheck();
     healthCheck.updateHealthStatus();
-    assertTrue((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be true");
+    assertTrue((Boolean)ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be true");
 
-    // Force performHealthCheck to return false (by time simulation - might be flaky)
-    long currentTimeForFalse = System.currentTimeMillis();
-    while (currentTimeForFalse % 10000 < 5000) {
-      Thread.sleep(10); // Wait until time is in the "false" range
-      currentTimeForFalse = System.currentTimeMillis();
-    }
-    ReflectionTestUtils.invokeMethod(healthCheck, "performHealthCheck");
+    // Force performHealthCheck to return false
+    doReturn(false).when(healthCheck).performHealthCheck();
     healthCheck.updateHealthStatus();
-    assertFalse((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be false");
+    assertFalse((Boolean)ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be false");
   }
-
-  // Note: Directly testing performHealthCheck (the private method) based on time is inherently
-  // difficult and can lead to flaky tests. The testUpdateHealthStatus attempts to indirectly
-  // verify its behavior. For more robust testing of performHealthCheck in isolation,
-  // you might consider refactoring the class to make the time dependency injectable
-  // or making the method protected for testing purposes.
 }

Diff for: microservices-self-registration/eurekaserver/pom.xml

@@ -21,7 +21,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

Diff for: microservices-self-registration/greetingservice/src/main/java/com/learning/greetingservice/MyCustomHealthCheck.java

@@ -22,7 +22,7 @@ public void updateHealthStatus() {
     log.info("Update health status : {}", isHealthy);
   }
 
-  private boolean performHealthCheck() {
+  boolean performHealthCheck() {
     boolean current = System.currentTimeMillis() % 10000 < 5000; // Simulate fluctuating health
     log.debug("Performing health check, current status: {}", current);
     return current; // Simulate fluctuating health

Diff for: microservices-self-registration/greetingservice/src/test/java/com/learning/greetingservice/MyCustomHealthCheckTest.java

@@ -1,13 +1,15 @@
 package com.learning.greetingservice;
 
 import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.boot.actuate.health.Status;
 
 import java.util.function.BooleanSupplier;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.doReturn;
 
 class MyCustomHealthCheckTest {
 
@@ -34,33 +36,19 @@ void testHealthDown() {
   }
 
   @Test
-  void testUpdateHealthStatusSetsIsHealthy() throws Exception {
-    MyCustomHealthCheck healthCheck = new MyCustomHealthCheck();
+  void testUpdateHealthStatusSetsIsHealthyWithMocking() throws Exception {
+    MyCustomHealthCheck healthCheck = Mockito.spy(new MyCustomHealthCheck());
 
-    // Force performHealthCheck to return true (by time simulation - might be flaky)
-    long currentTimeForTrue = System.currentTimeMillis();
-    while (currentTimeForTrue % 10000 >= 5000) {
-      Thread.sleep(10); // Wait until time is in the "true" range
-      currentTimeForTrue = System.currentTimeMillis();
-    }
-    ReflectionTestUtils.invokeMethod(healthCheck, "performHealthCheck");
+    // Force performHealthCheck to return true
+    doReturn(true).when(healthCheck).performHealthCheck();
     healthCheck.updateHealthStatus();
-    assertTrue((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be true");
+    assertTrue((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"),
+        "Health should be true");
 
-    // Force performHealthCheck to return false (by time simulation - might be flaky)
-    long currentTimeForFalse = System.currentTimeMillis();
-    while (currentTimeForFalse % 10000 < 5000) {
-      Thread.sleep(10); // Wait until time is in the "false" range
-      currentTimeForFalse = System.currentTimeMillis();
-    }
-    ReflectionTestUtils.invokeMethod(healthCheck, "performHealthCheck");
+    // Force performHealthCheck to return false
+    doReturn(false).when(healthCheck).performHealthCheck();
     healthCheck.updateHealthStatus();
-    assertFalse((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"), "Health should be false");
+    assertFalse((Boolean) ReflectionTestUtils.getField(healthCheck, "isHealthy"),
+        "Health should be false");
   }
-
-  // Note: Directly testing performHealthCheck (the private method) based on time is inherently
-  // difficult and can lead to flaky tests. The testUpdateHealthStatus attempts to indirectly
-  // verify its behavior. For more robust testing of performHealthCheck in isolation,
-  // you might consider refactoring the class to make the time dependency injectable
-  // or making the method protected for testing purposes.
 }