Fixing intermittent unit test (#657)

Author: mageddo

RELEASE-NOTES.md

@@ -1,7 +1,8 @@
-## 5.0.4
+## 5.0.5
 * Refactoring Linux amd64 static build to work on Github Actions
 * Creating the docs for config v3
 * Fixing Hostname Entry Update API
+* Fixing intermittent unit test
 
 ## 5.0.0
 * Refactoring config module to support config v3

gradle.properties

@@ -1 +1 @@
-version=5.0.4-snapshot
+version=5.0.5-snapshot

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/EntryTypes.java

@@ -11,7 +11,6 @@ public class EntryTypes {
   private static final String SEARCH = "SEARCH";
   public static final String OTHER = "OTHER";
 
-
   // parsed types
   public static final EntryType COMMENT_TYPE = EntryType.of(COMMENT);
   public static final EntryType COMMENTED_SERVER_TYPE = EntryType.of(COMMENTED_SERVER);

src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java

@@ -12,8 +12,9 @@ public class ResolvconfConfigureDPSHandler implements Transformer {
   private final boolean overrideNameServers;
   private boolean dpsSet = false;
 
-  public ResolvconfConfigureDPSHandler(Supplier<String> dpsDnsLineBuilder,
-      boolean overrideNameServers) {
+  public ResolvconfConfigureDPSHandler(
+      Supplier<String> dpsDnsLineBuilder, boolean overrideNameServers
+  ) {
     this.dpsDnsLineBuilder = dpsDnsLineBuilder;
     this.overrideNameServers = overrideNameServers;
   }

src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java

@@ -24,8 +24,7 @@ void mustConfigureDpsServerOnEmptyFile(@TempDir Path tmpDir) throws Exception {
     ResolvconfConfigurator.process(resolvFile, IpAddrTemplates.local());
 
     // assert
-    assertEquals(
-        """
+    assertEquals("""
             nameserver 10.10.0.1 # dps-entry
             """,
         Files.readString(resolvFile)

src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateSelfObservableTest.java

@@ -55,6 +55,11 @@ void mustStartBackgroundTaskWhenCreatingObject() {
   void mustHalfOpenCircuitAfterConfiguredTimeAndSatisfyHealthCheck() {
 
     // arrange
+    final var stateTransitor = mock(StateTransitor.class);
+    doReturn(stateTransitor)
+        .when(this.delegate)
+        .stateTransitor();
+
     doReturn(CircuitStatus.OPEN)
         .when(this.delegate)
         .findStatus()
@@ -64,11 +69,6 @@ void mustHalfOpenCircuitAfterConfiguredTimeAndSatisfyHealthCheck() {
         .isHealthy()
     ;
 
-    final var stateTransitor = mock(StateTransitor.class);
-    doReturn(stateTransitor)
-        .when(this.delegate)
-        .stateTransitor();
-
     // act
     Threads.sleep(1000);