diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 7348f7362..0bb52e219 100644 --- a/RELEASE-NOTES.md +++ b/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 diff --git a/gradle.properties b/gradle.properties index c73f81080..e11546ed0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=5.0.4-snapshot +version=5.0.5-snapshot diff --git a/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/EntryTypes.java b/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/EntryTypes.java index 8db1c353e..a5d013bf1 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/EntryTypes.java +++ b/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); diff --git a/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java b/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java index 48e2e58db..e020e2828 100644 --- a/src/main/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfigureDPSHandler.java +++ b/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 dpsDnsLineBuilder, - boolean overrideNameServers) { + public ResolvconfConfigureDPSHandler( + Supplier dpsDnsLineBuilder, boolean overrideNameServers + ) { this.dpsDnsLineBuilder = dpsDnsLineBuilder; this.overrideNameServers = overrideNameServers; } diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java index dad9878ee..7c28d0b79 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java +++ b/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) diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateSelfObservableTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateSelfObservableTest.java index 563b31315..094994ca2 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateSelfObservableTest.java +++ b/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);