From 93ba7b00d828d224bac7365a10f9087015339253 Mon Sep 17 00:00:00 2001 From: Elvis de Freitas Date: Wed, 17 Dec 2025 10:25:38 -0300 Subject: [PATCH] Coding style --- .../failsafe/CircuitStatusRefreshTest.java | 4 +- .../commons/exec/CommandLinesTest.java | 24 +- .../exec/DelegateOutputStreamTest.java | 4 +- .../mageddo/commons/exec/PipedStreamTest.java | 8 +- .../java/com/mageddo/dns/HostnameTest.java | 8 +- .../mageddo/dnsproxyserver/AppCompTest.java | 15 +- .../mageddo/dnsproxyserver/AppIntTest.java | 29 ++- .../dnsproxyserver/AppSettingsTest.java | 6 +- .../dnsproxyserver/config/ConfigsTest.java | 14 +- .../ConfigFileFinderServiceTest.java | 30 +-- .../application/ConfigPathMapperTest.java | 26 +- .../application/ConfigV2ServiceCompTest.java | 42 ++-- .../config/mapper/ConfigMapperCompTest.java | 13 +- .../cmdargs/mapper/ConfigFlagMapperTest.java | 4 +- .../provider/cmdargs/vo/ConfigFlagTest.java | 23 +- .../templates/ConfigV3EnvTemplates.java | 5 +- .../templates/ConfigV3Templates.java | 238 +++++++++--------- .../dataprovider/ConfigDAOJsonTest.java | 18 +- .../dataprovider/ConfigJsonV1Test.java | 15 +- .../dataprovider/JsonConfigsTest.java | 81 +++--- .../MutableConfigDAOJsonTest.java | 24 +- .../mapper/ConfigJsonV2MapperTest.java | 23 +- .../legacyenv/ConfigEnvMapperTest.java | 4 +- .../dnsproxyserver/di/ContextCompTest.java | 35 +-- .../dns/server/solver/WildcardsTest.java | 3 +- .../DnsConfiguratorDefaultTest.java | 38 +-- .../dnsconfigurator/DnsConfiguratorsTest.java | 29 ++- .../linux/DnsConfiguratorLinuxTest.java | 61 ++--- .../linux/LinuxResolverConfDetectorTest.java | 31 +-- .../linux/ResolvconfConfiguratorTest.java | 123 ++++----- .../ResolvedConfiguratorTest.java | 26 +- .../DockerNetworkFacadeDefaultTest.java | 18 +- .../DockerConnectionCheckTest.java | 31 ++- .../ContainerFacadeDefaultCompTest.java | 35 +-- .../ContainerFacadeDefaultTest.java | 20 +- .../DpsBinaryExecutableFinderIntTest.java | 10 +- .../server/CacheResourceCompTest.java | 52 ++-- .../dnsproxyserver/server/StarterTest.java | 16 +- .../server/dns/MessagesTest.java | 63 +++-- .../server/dns/RequestHandlerDefaultTest.java | 5 +- .../server/rest/NetworkResourceCompTest.java | 31 +-- .../solver/HostnameQueryTest.java | 14 +- .../solver/RemoteResolversCompTest.java | 10 +- .../solver/SolverCacheFactoryTest.java | 5 +- .../solver/SolverCachedRemoteTest.java | 7 +- .../solver/SolverDelegateTest.java | 16 +- .../solver/SolverDockerTest.java | 47 ++-- .../solver/SolverLocalDBTest.java | 40 +-- .../solver/SolverProviderCompTest.java | 11 +- .../solver/SolverProviderTest.java | 10 +- .../solver/SolverSystemCompTest.java | 17 +- .../solver/SolverSystemTest.java | 4 +- .../solver/SolversCacheTest.java | 62 +++-- .../ContainerSolvingServiceTest.java | 47 ++-- .../application/DpsContainerServiceTest.java | 12 +- .../DpsDockerEnvironmentSetupServiceTest.java | 18 +- .../ContainerHostnameMatcherTest.java | 25 +- .../dataprovider/DockerDAODefaultTest.java | 26 +- .../DpsContainerDAODefaultTest.java | 4 +- .../dataprovider/DpsContainerUtilsTest.java | 4 +- .../mapper/ContainerCompactMapperTest.java | 2 +- .../mapper/ContainerMapperTest.java | 7 +- .../mapper/NetworkMapperTest.java | 24 +- .../entrypoint/EventListenerCompTest.java | 11 +- .../FailsafeCircuitBreakerFactoryTest.java | 23 +- .../application/RemoteResultSupplierTest.java | 16 +- .../application/ResolverStatsFactoryTest.java | 28 ++- .../failsafe/CircuitBreakerFactoryTest.java | 56 +++-- .../CircuitBreakerPingCheckerServiceTest.java | 31 ++- .../application/mapper/ResultMapperTest.java | 13 +- ...erDelegateStaticThresholdFailsafeTest.java | 9 +- ...sCircuitBreakerWithManualHalfOpenTest.java | 4 +- ...reakerDelegateCanaryRateThresholdTest.java | 10 +- ...cuitBreakerDelegateSelfObservableTest.java | 27 +- .../CircuitBreakerFactoryCompTest.java | 11 +- .../solver/stub/AddressExpressionsTest.java | 1 + .../solver/stub/HostnameIpExtractorTest.java | 6 +- .../solver/stub/SolverStubTest.java | 18 +- .../systemd/ResolvedServiceTest.java | 4 +- .../usecase/HostMachineServiceTest.java | 18 +- .../dnsproxyserver/utils/EnvsTest.java | 10 +- .../mageddo/dnsproxyserver/utils/IpsTest.java | 7 +- .../dnsserver/DnsQueryTCPHandlerTest.java | 50 ++-- src/test/java/com/mageddo/http/PathTest.java | 8 +- .../com/mageddo/http/WebServerCompTest.java | 88 +++---- src/test/java/com/mageddo/net/IPTest.java | 7 +- src/test/java/com/mageddo/net/IpAddrTest.java | 40 +-- .../mageddo/net/NetExecutorWatchdogTest.java | 7 +- .../java/com/mageddo/net/NetworksTest.java | 11 +- .../com/mageddo/net/osx/NetworksTest.java | 4 +- .../windows/registry/NetworkRegistryTest.java | 19 +- .../FailSafeCircuitBreakerSandBox.java | 14 +- .../testing/sandbox/failsafe/StateMapper.java | 1 + .../sandbox/failsafe/StatsCalculator.java | 5 +- .../Resilience4jCircuitBreakerSandBox.java | 16 +- .../sandbox/resilience4j/StateMapper.java | 1 + .../sandbox/resilience4j/StatsCalculator.java | 5 +- .../java/com/mageddo/utils/Assertions.java | 3 +- .../java/com/mageddo/utils/ExecutorsTest.java | 7 +- .../java/com/mageddo/utils/TestUtils.java | 61 +++-- .../java/com/mageddo/utils/TestsTest.java | 10 +- src/test/java/com/mageddo/wait/WaitTest.java | 13 +- src/test/java/dagger/sheath/CtxWrapper.java | 30 ++- .../java/dagger/sheath/CtxWrapperTest.java | 3 +- src/test/java/dagger/sheath/EventHandler.java | 6 +- src/test/java/dagger/sheath/MethodUtils.java | 6 +- .../java/dagger/sheath/ProviderWrapper.java | 20 +- .../sheath/binding/BindingMapMethod.java | 13 +- .../dagger/sheath/binding/BindingMethod.java | 22 +- .../sheath/binding/BindingMethodTest.java | 7 +- .../dagger/sheath/junit/DaggerExtension.java | 180 +++++++------ .../java/dagger/sheath/junit/DaggerTest.java | 26 +- .../dagger/sheath/reflection/Signature.java | 40 +-- .../sheath/reflection/SignatureTest.java | 38 +-- .../sheath/templates/SignatureTemplates.java | 8 +- .../sheath/testing/stub/AppByBindingMap.java | 11 +- .../sheath/testing/stub/AppByProvider.java | 5 +- src/test/java/testing/ContextSupplier.java | 4 +- src/test/java/testing/Events.java | 1 + src/test/java/testing/JsonAssertion.java | 3 +- .../java/testing/mocks/DockerClientStub.java | 14 +- .../CircuitBreakerConfigTemplates.java | 20 +- .../templates/ConfigFlagArgsTemplates.java | 46 ++-- .../templates/ConfigFlagTemplates.java | 6 +- .../templates/ConfigJsonFileTemplates.java | 48 ++-- .../testing/templates/ConfigTemplates.java | 177 ++++++------- .../testing/templates/EntryTemplates.java | 36 +-- .../java/testing/templates/EnvTemplates.java | 57 ++--- .../templates/HostnameQueryTemplates.java | 4 +- .../templates/InetAddressTemplates.java | 4 +- .../templates/InetSocketAddressTemplates.java | 9 +- .../java/testing/templates/IpTemplates.java | 4 +- .../testing/templates/MessageTemplates.java | 4 +- .../templates/NetworkInterfaceTemplates.java | 39 +-- .../testing/templates/ResponseTemplates.java | 7 +- .../templates/SocketClientTemplates.java | 4 +- .../templates/SolverMockTemplates.java | 15 +- .../Resilience4jCircuitBreakerTemplates.java | 61 ++--- .../templates/config/ConfigEnvTemplates.java | 20 +- .../templates/docker/ContainerTemplates.java | 5 +- .../docker/DockerClientTemplates.java | 3 +- .../templates/docker/EntryTemplates.java | 33 +-- .../InspectContainerResponseTemplates.java | 12 +- .../templates/docker/NetworkTemplates.java | 21 +- .../templates/docker/SolverTemplates.java | 4 +- .../docker/ContainerNetworkTemplates.java | 12 +- .../dns/solver/docker/ContainerTemplates.java | 108 ++++---- .../dns/solver/docker/NetworkTemplates.java | 60 ++--- .../CircuitBreakerDelegateTemplates.java | 2 +- .../FailSafeCircuitBreakerTemplates.java | 23 +- .../remote/RemoteResolversTemplates.java | 4 +- .../solver/remote/RequestTemplates.java | 14 +- .../solver/remote/ResolverTemplates.java | 19 +- .../remote/ResultSupplierTemplates.java | 6 +- .../solver/remote/ResultTemplates.java | 13 +- 155 files changed, 2043 insertions(+), 1664 deletions(-) diff --git a/src/test/java/com/mageddo/circuitbreaker/failsafe/CircuitStatusRefreshTest.java b/src/test/java/com/mageddo/circuitbreaker/failsafe/CircuitStatusRefreshTest.java index 162c2d15c..015b9d145 100644 --- a/src/test/java/com/mageddo/circuitbreaker/failsafe/CircuitStatusRefreshTest.java +++ b/src/test/java/com/mageddo/circuitbreaker/failsafe/CircuitStatusRefreshTest.java @@ -1,7 +1,9 @@ package com.mageddo.circuitbreaker.failsafe; import com.mageddo.commons.concurrent.Threads; + import org.junit.jupiter.api.Test; + import testing.templates.solver.remote.FailSafeCircuitBreakerTemplates; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -57,7 +59,7 @@ void closedStateWillNotBeAffected() { } @Test - void mustIgnoreNulls(){ + void mustIgnoreNulls() { final var refreshed = CircuitStatusRefresh.refresh(null); assertFalse(refreshed); } diff --git a/src/test/java/com/mageddo/commons/exec/CommandLinesTest.java b/src/test/java/com/mageddo/commons/exec/CommandLinesTest.java index bebd08efa..700794cd8 100644 --- a/src/test/java/com/mageddo/commons/exec/CommandLinesTest.java +++ b/src/test/java/com/mageddo/commons/exec/CommandLinesTest.java @@ -10,12 +10,12 @@ class CommandLinesTest { @Test - void mustValidateWhenExitsWithErrorCode(){ + void mustValidateWhenExitsWithErrorCode() { final var result = CommandLines.exec( - new CommandLine("sh") - .addArgument("-c") - .addArgument("exit 3", false) + new CommandLine("sh") + .addArgument("-c") + .addArgument("exit 3", false) ); final var ex = assertThrows(ExecutionValidationFailedException.class, result::checkExecution); @@ -25,7 +25,7 @@ void mustValidateWhenExitsWithErrorCode(){ } @Test - void mustExecuteCommand(){ + void mustExecuteCommand() { final var result = CommandLines.exec("echo %s", "hey"); @@ -37,10 +37,10 @@ void mustExecuteCommand(){ void mustExecuteAndPrintOutputConcurrently() { final var result = CommandLines.exec( - new CommandLine("sh") - .addArgument("-c") - .addArgument("echo hi && sleep 0.2 && echo hi2", false), - new NopResultHandler() + new CommandLine("sh") + .addArgument("-c") + .addArgument("echo hi && sleep 0.2 && echo hi2", false), + new NopResultHandler() ); result.printOutToLogsInBackground(); @@ -48,9 +48,9 @@ void mustExecuteAndPrintOutputConcurrently() { result.waitProcessToFinish(); final var expectedOut = """ - hi - hi2 - """; + hi + hi2 + """; assertEquals(expectedOut, result.getOutAsString()); } } diff --git a/src/test/java/com/mageddo/commons/exec/DelegateOutputStreamTest.java b/src/test/java/com/mageddo/commons/exec/DelegateOutputStreamTest.java index 86b07f4ca..4d30fbc26 100644 --- a/src/test/java/com/mageddo/commons/exec/DelegateOutputStreamTest.java +++ b/src/test/java/com/mageddo/commons/exec/DelegateOutputStreamTest.java @@ -1,10 +1,10 @@ package com.mageddo.commons.exec; -import org.junit.jupiter.api.Test; - import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; class DelegateOutputStreamTest { diff --git a/src/test/java/com/mageddo/commons/exec/PipedStreamTest.java b/src/test/java/com/mageddo/commons/exec/PipedStreamTest.java index b93f1121a..895ab0a31 100644 --- a/src/test/java/com/mageddo/commons/exec/PipedStreamTest.java +++ b/src/test/java/com/mageddo/commons/exec/PipedStreamTest.java @@ -1,10 +1,10 @@ package com.mageddo.commons.exec; -import org.junit.jupiter.api.Test; - import java.io.ByteArrayOutputStream; import java.io.IOException; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; class PipedStreamTest { @@ -22,6 +22,8 @@ void mustWriteToOutAndBeAbleToReadWhatIsBeingWritten() throws IOException { // assert final var bout = (ByteArrayOutputStream) stream.getOriginalOut(); assertArrayEquals(bytes, bout.toByteArray()); - assertArrayEquals(bytes, stream.getPipedIn().readAllBytes()); + assertArrayEquals(bytes, stream.getPipedIn() + .readAllBytes() + ); } } diff --git a/src/test/java/com/mageddo/dns/HostnameTest.java b/src/test/java/com/mageddo/dns/HostnameTest.java index 6880382e8..534f60e90 100644 --- a/src/test/java/com/mageddo/dns/HostnameTest.java +++ b/src/test/java/com/mageddo/dns/HostnameTest.java @@ -1,20 +1,22 @@ package com.mageddo.dns; import org.junit.jupiter.api.Test; + import testing.templates.HostnameTemplates; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class HostnameTest { @Test - void mustEndsWith(){ + void mustEndsWith() { final var hostname = Hostname.of(HostnameTemplates.NGINX_COM_BR); assertTrue(hostname.endsWith(".com.br")); } @Test - void mustNotEndsWith(){ + void mustNotEndsWith() { final var hostname = Hostname.of(HostnameTemplates.NGINX_COM_BR); assertFalse(hostname.endsWith(".com")); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppCompTest.java index b74515212..f5db0f736 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppCompTest.java @@ -57,7 +57,8 @@ void mustCreateTmpDirIfNotExists() { // arrange final var args = new String[]{"--create-tmp-dir"}; this.setupStub(args); - doNothing().when(this.app).startContext(); + doNothing().when(this.app) + .startContext(); // act this.app.start(); @@ -76,12 +77,12 @@ void mustHandleFatalErrors() { this.setupStub(args); doThrow(new IllegalAccessError("mocked fatal error")) - .when(this.app) - .checkHiddenCommands() + .when(this.app) + .checkHiddenCommands() ; doNothing() - .when(this.app) - .exitWithError(anyInt()) + .when(this.app) + .exitWithError(anyInt()) ; // act @@ -94,8 +95,8 @@ void mustHandleFatalErrors() { RuntimeException mockExitMethod() { final var expectedException = new App.SystemExitException("testing"); doThrow(expectedException) - .when(this.app) - .exitGracefully() + .when(this.app) + .exitGracefully() ; return expectedException; } diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java index 4adb25e1c..2f3867dea 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppIntTest.java @@ -1,5 +1,10 @@ package com.mageddo.dnsproxyserver; +import java.nio.file.Path; +import java.time.Duration; +import java.util.Arrays; +import java.util.concurrent.ExecutorService; + import com.mageddo.commons.concurrent.Threads; import com.mageddo.commons.exec.ProcessesWatchDog; import com.mageddo.dns.utils.Messages; @@ -13,21 +18,18 @@ import com.mageddo.dnsproxyserver.utils.Ips; import com.mageddo.net.IpAddr; import com.mageddo.utils.Executors; -import lombok.SneakyThrows; -import lombok.Value; -import lombok.extern.slf4j.Slf4j; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.xbill.DNS.Message; + +import lombok.SneakyThrows; +import lombok.Value; +import lombok.extern.slf4j.Slf4j; import testing.templates.ConfigFlagArgsTemplates; import testing.templates.ConfigJsonFileTemplates; -import java.nio.file.Path; -import java.time.Duration; -import java.util.Arrays; -import java.util.concurrent.ExecutorService; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,7 +45,8 @@ void beforeEach() { @AfterAll static void afterAll() { Starter.setMustStartFlagActive(false); - ProcessesWatchDog.instance().killAllProcesses(); + ProcessesWatchDog.instance() + .killAllProcesses(); } @Test @@ -88,11 +91,15 @@ void mustQueryRemoteSolverPassingThroughAllModulesAndGetSuccess() { private static App buildClientAppAndWait(ExecutorService executor, Integer serverPort) { final var remoteAddr = IpAddr.of("127.0.0.1", serverPort); - return buildAppAndWait(executor, ConfigFlagArgsTemplates.withRandomPortsAndNotAsDefaultDnsUsingRemote(remoteAddr)); + return buildAppAndWait(executor, + ConfigFlagArgsTemplates.withRandomPortsAndNotAsDefaultDnsUsingRemote(remoteAddr) + ); } private static Result buildAndStartServerApp(String hostToQuery) { - final var configFile = ConfigJsonFileTemplates.withRandomPortsAndNotAsDefaultDnsAndCustomLocalDBEntry(hostToQuery); + final var configFile = + ConfigJsonFileTemplates.withRandomPortsAndNotAsDefaultDnsAndCustomLocalDBEntry( + hostToQuery); final var instance = Sandbox.runFromGradleTests(configFile); return Result.of(configFile, instance); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/AppSettingsTest.java b/src/test/java/com/mageddo/dnsproxyserver/AppSettingsTest.java index 63153c968..b9ad7dc22 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/AppSettingsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/AppSettingsTest.java @@ -1,15 +1,17 @@ package com.mageddo.dnsproxyserver; import com.mageddo.dnsproxyserver.application.LogSettings; -import testing.templates.ConfigTemplates; import com.mageddo.logback.LogbackUtils; + import org.junit.jupiter.api.Test; +import testing.templates.ConfigTemplates; + import static org.junit.jupiter.api.Assertions.assertEquals; class AppSettingsTest { @Test - void mustLogLevelInSl4jConversion(){ + void mustLogLevelInSl4jConversion() { // arrange final var config = ConfigTemplates.defaultWithoutId(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java index 90c78a66a..2d5d10524 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/ConfigsTest.java @@ -18,22 +18,22 @@ void mustGenerateEnvHostnameIdWhenIsNull() { // act final var env = EnvTemplates.buildWithoutId(); final var firstEntry = env - .getEntries() - .stream() - .findFirst() - .get(); + .getEntries() + .stream() + .findFirst() + .get(); // assert assertNotNull(firstEntry.getId()); final var currentNanoTime = System.nanoTime(); assertTrue( - firstEntry.getId() < currentNanoTime, - String.format("id=%s, currentTimeInMillis=%s", firstEntry.getId(), currentNanoTime) + firstEntry.getId() < currentNanoTime, + String.format("id=%s, currentTimeInMillis=%s", firstEntry.getId(), currentNanoTime) ); } @Test - void mustCreateDefaultConfigFileOnRandomPathWhenTesting(){ + void mustCreateDefaultConfigFileOnRandomPathWhenTesting() { final var config = Configs.getInstance(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java index e362b68c9..56466827b 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigFileFinderServiceTest.java @@ -1,7 +1,10 @@ package com.mageddo.dnsproxyserver.config.application; +import java.nio.file.Paths; + import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigDAOLegacyEnv; + import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -9,11 +12,10 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.ConfigFlagTemplates; import testing.templates.config.ConfigEnvTemplates; -import java.nio.file.Paths; - import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.doReturn; @@ -35,13 +37,13 @@ class ConfigFileFinderServiceTest { void mustUseEnvConfig() { // arrange doReturn(ConfigEnvTemplates.withConfigFilePath()) - .when(this.configDAOEnv) - .findRaw() + .when(this.configDAOEnv) + .findRaw() ; doReturn(ConfigFlagTemplates.withConfigFilePath()) - .when(this.configDAOCmdArgs) - .findRaw() + .when(this.configDAOCmdArgs) + .findRaw() ; // act @@ -56,13 +58,13 @@ void mustUseEnvConfig() { void mustUseArgsConfigWhenEnvNotSet() { // arrange doReturn(ConfigEnvTemplates.empty()) - .when(this.configDAOEnv) - .findRaw() + .when(this.configDAOEnv) + .findRaw() ; doReturn(ConfigFlagTemplates.withConfigFilePath()) - .when(this.configDAOCmdArgs) - .findRaw() + .when(this.configDAOCmdArgs) + .findRaw() ; // act @@ -78,13 +80,13 @@ void mustUseArgsConfigWhenEnvNotSet() { void mustUseRandomGeneratedConfigPathWhenRunningInTestsAndNoCustomPathIsSpecified() { // arrange doReturn(ConfigEnvTemplates.empty()) - .when(this.configDAOEnv) - .findRaw() + .when(this.configDAOEnv) + .findRaw() ; doReturn(ConfigFlagTemplates.empty()) - .when(this.configDAOCmdArgs) - .findRaw() + .when(this.configDAOCmdArgs) + .findRaw() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java index 2df130b2b..cae682751 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigPathMapperTest.java @@ -1,30 +1,40 @@ package com.mageddo.dnsproxyserver.config.application; +import java.nio.file.Path; +import java.nio.file.Paths; + import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.ConfigDAOCmdArgs; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import testing.templates.ConfigFlagTemplates; -import java.nio.file.Path; -import java.nio.file.Paths; +import testing.templates.ConfigFlagTemplates; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class ConfigPathMapperTest { @Test - void mustBuildConfPathRelativeToWorkDir(@TempDir Path tmpDir){ + void mustBuildConfPathRelativeToWorkDir(@TempDir Path tmpDir) { // arrange final var workDir = tmpDir.resolve("custom-work-dir"); - final var flags = ConfigFlagTemplates.defaultWithConfigPath(Paths.get("conf/config-custom.json")); + final var flags = ConfigFlagTemplates.defaultWithConfigPath( + Paths.get("conf/config-custom.json")); ConfigDAOCmdArgs.setArgs(flags.getArgs()); // act final var configPath = ConfigPathMapper.build(workDir, flags.getConfigFileAsPath()); // assert - assertEquals("config-custom.json", configPath.getFileName().toString()); - assertEquals(workDir.getFileName().toString(), configPath.getParent().getParent().getFileName().toString()); + assertEquals("config-custom.json", configPath.getFileName() + .toString() + ); + assertEquals(workDir.getFileName() + .toString(), configPath.getParent() + .getParent() + .getFileName() + .toString() + ); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigV2ServiceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigV2ServiceCompTest.java index 8f76c686e..45b725b8c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigV2ServiceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/application/ConfigV2ServiceCompTest.java @@ -27,8 +27,8 @@ class ConfigV2ServiceCompTest { static final String[] excludingFields = new String[]{ - "version", "configPath", "resolvConfPaths", - "dockerHost" + "version", "configPath", "resolvConfPaths", + "dockerHost" }; @Test @@ -43,9 +43,8 @@ void mustParseDefaultConfigsAndNotCreateJsonConfigFileUntilItIsChanged( // act final var config = Configs.getContext() - .configService() - .find() - ; + .configService() + .find(); // assert assertFalse(config.getRegisterContainerNames()); @@ -54,30 +53,28 @@ void mustParseDefaultConfigsAndNotCreateJsonConfigFileUntilItIsChanged( @Test - void mustParseLowerCaseLogLevel(){ + void mustParseLowerCaseLogLevel() { // arrange ConfigDAOCmdArgs.setArgs(new String[]{"--log-level", "warning"}); // act final var config = Configs.getContext() - .configService() - .find() - ; + .configService() + .find(); // assert assertEquals(Config.Log.Level.WARNING, config.getLogLevel()); } @Test - void mustDisableRemoteServersRespectingConfig(@TempDir Path tmpDir){ + void mustDisableRemoteServersRespectingConfig(@TempDir Path tmpDir) { // arrange writeAndSetCustomConfigFile(tmpDir, "/configs-test/006.json"); // act final var config = Configs.getContext() - .configService() - .find() - ; + .configService() + .find(); // assert assertFalse(config.isSolverRemoteActive()); @@ -85,30 +82,33 @@ void mustDisableRemoteServersRespectingConfig(@TempDir Path tmpDir){ } @Test - void mustParseCanaryRateThreshold(@TempDir Path tmpDir){ + void mustParseCanaryRateThreshold(@TempDir Path tmpDir) { // arrange writeAndSetCustomConfigFile(tmpDir, "/configs-test/009.json"); // act final var config = Configs.getContext() - .configService() - .find() - ; + .configService() + .find(); // assert - assertEquals(CANARY_RATE_THRESHOLD, config.getSolverRemoteCircuitBreakerStrategy().getType()); + assertEquals(CANARY_RATE_THRESHOLD, config.getSolverRemoteCircuitBreakerStrategy() + .getType() + ); } static void assertParsedConfig(Config config, String expectedFilePath) { assertEquals( - readAndSortJsonExcluding(expectedFilePath, excludingFields), - readAndSortJsonExcluding(config, excludingFields) + readAndSortJsonExcluding(expectedFilePath, excludingFields), + readAndSortJsonExcluding(config, excludingFields) ); } static void assertWrittenFile(String expectedFilePath, Path jsonConfigFile) { assertTrue(Files.exists(jsonConfigFile)); - assertEquals(readAndSortJson(expectedFilePath), readSortDonWriteNullsAndExcludeFields(jsonConfigFile)); + assertEquals(readAndSortJson(expectedFilePath), + readSortDonWriteNullsAndExcludeFields(jsonConfigFile) + ); } static void writeAndSetCustomConfigFile(Path tmpDir, String sourceConfigFile) { diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java index 19dc3942f..cd2cb50cb 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapperCompTest.java @@ -1,16 +1,19 @@ package com.mageddo.dnsproxyserver.config.mapper; +import java.util.List; + +import javax.inject.Inject; + import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.net.IP; -import dagger.sheath.junit.DaggerTest; + import org.junit.jupiter.api.Test; + +import dagger.sheath.junit.DaggerTest; import testing.ContextSupplier; import testing.Events; import testing.templates.ConfigTemplates; -import javax.inject.Inject; -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -50,7 +53,7 @@ void mustMapSolverStub() { } @Test - void mustMapSolverLocal(){ + void mustMapSolverLocal() { final var theDefault = ConfigTemplates.defaultWithoutId(); final var another = ConfigTemplates.acmeSolverLocal(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java index 540bd24bd..0cfabd9d4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/mapper/ConfigFlagMapperTest.java @@ -1,14 +1,16 @@ package com.mageddo.dnsproxyserver.config.provider.cmdargs.mapper; import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.mapper.ConfigFlagMapper; + import org.junit.jupiter.api.Test; + import testing.templates.ConfigFlagTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; class ConfigFlagMapperTest { @Test - void mustMapStubSolverDomainName(){ + void mustMapStubSolverDomainName() { final var configFlag = ConfigFlagTemplates.withStubSolverDomainName(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java index 74c66f027..28c3a4586 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/cmdargs/vo/ConfigFlagTest.java @@ -1,14 +1,17 @@ package com.mageddo.dnsproxyserver.config.provider.cmdargs.vo; -import com.mageddo.commons.regex.Regexes; -import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.vo.ConfigFlag; -import org.junit.jupiter.api.Test; - import java.io.PrintWriter; import java.io.StringWriter; import java.util.regex.Pattern; -import static com.mageddo.utils.TestUtils.*; +import com.mageddo.commons.regex.Regexes; +import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.vo.ConfigFlag; + +import org.junit.jupiter.api.Test; + +import static com.mageddo.utils.TestUtils.readAndSortJson; +import static com.mageddo.utils.TestUtils.readString; +import static com.mageddo.utils.TestUtils.sortJson; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -43,13 +46,14 @@ void mustPrintHelp() { // assert assertEquals( readString("/flags-test/002.txt"), - sw.toString().replaceAll("\r\n", "\n") + sw.toString() + .replaceAll("\r\n", "\n") ); assertTrue(config.isHelp()); } @Test - void mustPrintVersion() { + void mustPrintVersion() { // arrange final var sw = new StringWriter(); @@ -59,14 +63,15 @@ void mustPrintVersion() { final var config = ConfigFlag.parse(args, new PrintWriter(sw)); // assert - final var validVersion = Regexes.matcher(sw.toString(), Pattern.compile("\\d+\\.\\d+.\\d+.*")).matches(); + final var validVersion = Regexes.matcher(sw.toString(), Pattern.compile("\\d+\\.\\d+.\\d+.*")) + .matches(); assertTrue(validVersion, sw.toString()); assertTrue(config.isVersion()); } @Test - void mustParseLowerCaseLogLevel(){ + void mustParseLowerCaseLogLevel() { // arrange final var args = new String[]{"--log-level", "warning"}; diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3EnvTemplates.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3EnvTemplates.java index d5cbafec5..135617ec1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3EnvTemplates.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3EnvTemplates.java @@ -40,7 +40,10 @@ public static Map build() { env.put("DPS_SOLVER__LOCAL__ENVS_0__HOSTNAMES_0__TTL", "255"); env.put("DPS_SOLVER__STUB__DOMAIN_NAME", "stub"); env.put("DPS_DEFAULT_DNS__ACTIVE", "true"); - env.put("DPS_DEFAULT_DNS__RESOLV_CONF__PATHS", "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf,/etc/resolv.conf"); + env.put("DPS_DEFAULT_DNS__RESOLV_CONF__PATHS", + "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf," + + "/etc/resolv.conf" + ); env.put("DPS_DEFAULT_DNS__RESOLV_CONF__OVERRIDE_NAME_SERVERS", "true"); env.put("DPS_LOG__LEVEL", "DEBUG"); env.put("DPS_LOG__FILE", "console"); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java index b8d208f83..2d0dbd5a8 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/dataformatv3/templates/ConfigV3Templates.java @@ -9,59 +9,59 @@ public class ConfigV3Templates { public static String buildYaml() { return YamlUtils.format(""" - --- - version: 3 - server: - dns: - port: 53 - noEntriesResponseCode: 3 - web: - port: 5380 - protocol: UDP_TCP - solver: - remote: + --- + version: 3 + server: + dns: + port: 53 + noEntriesResponseCode: 3 + web: + port: 5380 + protocol: UDP_TCP + solver: + remote: + active: true + dnsServers: + - 8.8.8.8 + - 4.4.4.4:53 + circuitBreaker: + failureThreshold: null + failureThresholdCapacity: null + successThreshold: null + testDelay: null + type: STATIC_THRESHOLD + docker: + registerContainerNames: false + domain: docker + hostMachineFallback: true + dpsNetwork: + name: dps + autoCreate: false + autoConnect: false + dockerDaemonUri:\s + system: + hostMachineHostname: host.docker + local: + activeEnv: '' + envs: + - name: '' + hostnames: + - type: A + hostname: github.com + target: + ip: 192.168.0.1 + ttl: 255 + stub: + domainName: stub + defaultDns: active: true - dnsServers: - - 8.8.8.8 - - 4.4.4.4:53 - circuitBreaker: - failureThreshold: null - failureThresholdCapacity: null - successThreshold: null - testDelay: null - type: STATIC_THRESHOLD - docker: - registerContainerNames: false - domain: docker - hostMachineFallback: true - dpsNetwork: - name: dps - autoCreate: false - autoConnect: false - dockerDaemonUri:\s - system: - hostMachineHostname: host.docker - local: - activeEnv: '' - envs: - - name: '' - hostnames: - - type: A - hostname: github.com - target: - ip: 192.168.0.1 - ttl: 255 - stub: - domainName: stub - defaultDns: - active: true - resolvConf: - paths: "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf,/etc/resolv.conf" - overrideNameServers: true - log: - level: DEBUG - file: console - """); + resolvConf: + paths: "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf,/etc/resolv.conf" + overrideNameServers: true + log: + level: DEBUG + file: console + """); } public static ConfigV3 build() { @@ -70,80 +70,80 @@ public static ConfigV3 build() { public static String buildJson() { return JsonUtils.prettify(""" - { - "version": 3, - "server": { - "dns": { - "port": 53, - "noEntriesResponseCode": 3 + { + "version": 3, + "server": { + "dns": { + "port": 53, + "noEntriesResponseCode": 3 + }, + "web": { + "port": 5380 + }, + "protocol": "UDP_TCP" }, - "web": { - "port": 5380 + "solver": { + "remote": { + "active": true, + "dnsServers": [ + "8.8.8.8", "4.4.4.4:53" + ], + "circuitBreaker": { + "failureThreshold" : null, + "failureThresholdCapacity" : null, + "successThreshold" : null, + "testDelay" : null, + "type": "STATIC_THRESHOLD" + } + }, + "docker": { + "registerContainerNames": false, + "domain": "docker", + "hostMachineFallback": true, + "dpsNetwork": { + "name": "dps", + "autoCreate": false, + "autoConnect": false + }, + "dockerDaemonUri": null + }, + "system": { + "hostMachineHostname": "host.docker" + }, + "local": { + "activeEnv": "", + "envs": [ + { + "name": "", + "hostnames": [ + { + "type": "A", + "hostname": "github.com", + "target": null, + "ip": "192.168.0.1", + "ttl": 255 + } + ] + } + ] + }, + "stub": { + "domainName": "stub" + } }, - "protocol": "UDP_TCP" - }, - "solver": { - "remote": { + "defaultDns": { "active": true, - "dnsServers": [ - "8.8.8.8", "4.4.4.4:53" - ], - "circuitBreaker": { - "failureThreshold" : null, - "failureThresholdCapacity" : null, - "successThreshold" : null, - "testDelay" : null, - "type": "STATIC_THRESHOLD" + "resolvConf": { + "paths": "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf,/etc/resolv.conf", + "overrideNameServers": true } }, - "docker": { - "registerContainerNames": false, - "domain": "docker", - "hostMachineFallback": true, - "dpsNetwork": { - "name": "dps", - "autoCreate": false, - "autoConnect": false - }, - "dockerDaemonUri": null - }, - "system": { - "hostMachineHostname": "host.docker" - }, - "local": { - "activeEnv": "", - "envs": [ - { - "name": "", - "hostnames": [ - { - "type": "A", - "hostname": "github.com", - "target": null, - "ip": "192.168.0.1", - "ttl": 255 - } - ] - } - ] - }, - "stub": { - "domainName": "stub" - } - }, - "defaultDns": { - "active": true, - "resolvConf": { - "paths": "/host/etc/systemd/resolved.conf,/host/etc/resolv.conf,/etc/systemd/resolved.conf,/etc/resolv.conf", - "overrideNameServers": true + "log": { + "level": "DEBUG", + "file": "console" } - }, - "log": { - "level": "DEBUG", - "file": "console" } - } - """); + """); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java index 8d0a5d3b4..54ce835de 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigDAOJsonTest.java @@ -1,15 +1,17 @@ package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; +import java.nio.file.Files; +import java.nio.file.Path; + import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.ConfigDAOJson; -import lombok.SneakyThrows; + import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; import org.mockito.junit.jupiter.MockitoExtension; -import java.nio.file.Files; -import java.nio.file.Path; +import lombok.SneakyThrows; import static com.mageddo.utils.TestUtils.readAndSortJsonExcluding; import static com.mageddo.utils.TestUtils.readAsStream; @@ -22,8 +24,8 @@ class ConfigDAOJsonTest { static final String[] excludingFields = new String[]{ - "version", "configPath", "resolvConfPaths", - "dockerHost" + "version", "configPath", "resolvConfPaths", + "dockerHost" }; final ConfigDAOJson configDAOJson = new ConfigDAOJson(null); @@ -40,8 +42,8 @@ void mustReadAndRespectStoredConfigFile(@TempDir Path tmpDir) { // assert assertEquals( - readAndSortJsonExcluding("/configs-test/004.json", excludingFields), - readSortDonWriteNullsAndExcludeFields(config, excludingFields) + readAndSortJsonExcluding("/configs-test/004.json", excludingFields), + readSortDonWriteNullsAndExcludeFields(config, excludingFields) ); } @@ -60,7 +62,7 @@ void mustDisableRemoteServersRespectingConfig(@TempDir Path tmpDir) { } @Test - void mustConfigureStubSolverDomain(@TempDir Path tmpDir){ + void mustConfigureStubSolverDomain(@TempDir Path tmpDir) { // arrange final var sourceConfigFile = "/configs-test/010.json"; final var configPathToUse = tmpDir.resolve("tmpfile.json"); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java index 487868d6d..e80924f63 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/ConfigJsonV1Test.java @@ -1,13 +1,16 @@ package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; +import java.nio.file.Files; +import java.nio.file.Path; + import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.JsonConfigs; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Files; -import java.nio.file.Path; - -import static com.mageddo.utils.TestUtils.*; +import static com.mageddo.utils.TestUtils.readAndSortJson; +import static com.mageddo.utils.TestUtils.readAsStream; +import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; import static org.junit.jupiter.api.Assertions.assertEquals; class ConfigJsonV1Test { @@ -23,8 +26,8 @@ void mustParseV1Config(@TempDir Path tmpDir) throws Exception { // assert assertEquals( - readAndSortJson("/config-json-v1-test/002.json"), - readSortDonWriteNullsAndExcludeFields(config) + readAndSortJson("/config-json-v1-test/002.json"), + readSortDonWriteNullsAndExcludeFields(config) ); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java index 461e00322..12922b429 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/JsonConfigsTest.java @@ -1,25 +1,31 @@ package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Duration; + import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.JsonConfigs; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.vo.ConfigJsonV2; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.vo.ConfigJsonV2.CanaryRateThresholdCircuitBreaker; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.vo.ConfigJsonV2.StaticThresholdCircuitBreaker; + import org.apache.commons.lang3.ClassUtils; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Files; -import java.nio.file.Path; -import java.time.Duration; - import static com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.JsonConfigs.findVersion; -import static com.mageddo.utils.TestUtils.*; -import static org.junit.jupiter.api.Assertions.*; +import static com.mageddo.utils.TestUtils.readAndSortJson; +import static com.mageddo.utils.TestUtils.readAsStream; +import static com.mageddo.utils.TestUtils.readSortDonWriteNullsAndExcludeFields; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; class JsonConfigsTest { @Test - void mustParseVersion1ConvertAndSaveAsVersion2WhenChanged(@TempDir Path tempDir) throws Exception { + void mustParseVersion1ConvertAndSaveAsVersion2WhenChanged(@TempDir Path tempDir) + throws Exception { // arrange final var tempJsonConfigPath = tempDir.resolve("config.tmp.json"); Files.copy(readAsStream("/config-json-v1-test/001.json"), tempJsonConfigPath); @@ -38,13 +44,13 @@ void mustParseVersion1ConvertAndSaveAsVersion2WhenChanged(@TempDir Path tempDir) assertTrue(Files.exists(path), path.toString()); assertEquals( - readAndSortJson("/json-configs-test/001.json"), - readSortDonWriteNullsAndExcludeFields(tempJsonConfigPath) + readAndSortJson("/json-configs-test/001.json"), + readSortDonWriteNullsAndExcludeFields(tempJsonConfigPath) ); } @Test - void mustCreateDefaultConfigJsonFileVersion2WhenItDoesntExists(@TempDir Path tempDir){ + void mustCreateDefaultConfigJsonFileVersion2WhenItDoesntExists(@TempDir Path tempDir) { // arrange final var tempConfig = tempDir.resolve("config.tmp.json"); @@ -59,9 +65,10 @@ void mustCreateDefaultConfigJsonFileVersion2WhenItDoesntExists(@TempDir Path tem } @Test - void mustCreateDefaultConfigFileEvenWhenDirectoryDoesntExists(@TempDir Path tempDir){ + void mustCreateDefaultConfigFileEvenWhenDirectoryDoesntExists(@TempDir Path tempDir) { // arrange - final var tempConfig = tempDir.resolve("some-random-dir").resolve("config.tmp.json"); + final var tempConfig = tempDir.resolve("some-random-dir") + .resolve("config.tmp.json"); // act final var configJson = JsonConfigs.loadConfig(tempConfig); @@ -72,49 +79,51 @@ void mustCreateDefaultConfigFileEvenWhenDirectoryDoesntExists(@TempDir Path temp } @Test - void mustParseDefaultCircuitBreakerStrategyAsStaticThreshold(){ + void mustParseDefaultCircuitBreakerStrategyAsStaticThreshold() { final var json = """ - { - "version": 2, - "solverRemote" : { - "circuitBreaker" : { - "failureThreshold": 3, - "failureThresholdCapacity": 5, - "successThreshold": 10, - "testDelay": "PT20S" + { + "version": 2, + "solverRemote" : { + "circuitBreaker" : { + "failureThreshold": 3, + "failureThresholdCapacity": 5, + "successThreshold": 10, + "testDelay": "PT20S" + } } } - } - """; + """; final var config = JsonConfigs.loadConfig(json); assertNotNull(config); - assertStaticThresholdCircuitBreakerConfig((StaticThresholdCircuitBreaker) config.getSolverRemoteCircuitBreaker()); + assertStaticThresholdCircuitBreakerConfig( + (StaticThresholdCircuitBreaker) config.getSolverRemoteCircuitBreaker()); } @Test - void mustParseCanaryRateThresholdCircuitBreakerStrategy(){ + void mustParseCanaryRateThresholdCircuitBreakerStrategy() { final var json = """ - { - "version": 2, - "solverRemote" : { - "circuitBreaker" : { - "strategy": "CANARY_RATE_THRESHOLD", - "failureRateThreshold" : 21.9, - "minimumNumberOfCalls" : 50, - "permittedNumberOfCallsInHalfOpenState" : 10 + { + "version": 2, + "solverRemote" : { + "circuitBreaker" : { + "strategy": "CANARY_RATE_THRESHOLD", + "failureRateThreshold" : 21.9, + "minimumNumberOfCalls" : 50, + "permittedNumberOfCallsInHalfOpenState" : 10 + } } } - } - """; + """; final var config = JsonConfigs.loadConfig(json); assertNotNull(config); - final var circuitBreaker = (CanaryRateThresholdCircuitBreaker) config.getSolverRemoteCircuitBreaker(); + final var circuitBreaker = + (CanaryRateThresholdCircuitBreaker) config.getSolverRemoteCircuitBreaker(); assertEquals(21.9f, circuitBreaker.getFailureRateThreshold(), 1); assertEquals(50, circuitBreaker.getMinimumNumberOfCalls()); assertEquals(10, circuitBreaker.getPermittedNumberOfCallsInHalfOpenState()); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/MutableConfigDAOJsonTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/MutableConfigDAOJsonTest.java index ed185904c..0d2aaeaa3 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/MutableConfigDAOJsonTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/dataprovider/MutableConfigDAOJsonTest.java @@ -3,11 +3,13 @@ import com.mageddo.dnsproxyserver.config.Config.Entry.Type; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.MutableConfigDAOJson; import com.mageddo.dnsproxyserver.solver.HostnameQuery; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.EnvTemplates; import testing.templates.HostnameQueryTemplates; @@ -30,8 +32,8 @@ void mustDoCaseInsensitiveFind() { final var env = EnvTemplates.buildWithCamelCaseHost(); doReturn(env) - .when(this.dao) - .findActiveEnv(); + .when(this.dao) + .findActiveEnv(); // act final var entry = this.dao.findEntryForActiveEnv(hostname); @@ -42,14 +44,14 @@ void mustDoCaseInsensitiveFind() { } @Test - void mustSolveQuadARecord(){ + void mustSolveQuadARecord() { // arrange final var query = HostnameQueryTemplates.acmeComQuadA(); final var env = EnvTemplates.acmeQuadA(); doReturn(env) - .when(this.dao) - .findActiveEnv(); + .when(this.dao) + .findActiveEnv(); // act final var found = this.dao.findEntryForActiveEnv(query); @@ -59,14 +61,14 @@ void mustSolveQuadARecord(){ } @Test - void mustSolveQueriedTypeWhenTwoDifferentTypesAreAvailable(){ + void mustSolveQueriedTypeWhenTwoDifferentTypesAreAvailable() { // arrange final var query = HostnameQueryTemplates.acmeComQuadA(); final var env = EnvTemplates.acmeAAndQuadA(); doReturn(env) - .when(this.dao) - .findActiveEnv(); + .when(this.dao) + .findActiveEnv(); // act final var found = this.dao.findEntryForActiveEnv(query); @@ -78,14 +80,14 @@ void mustSolveQueriedTypeWhenTwoDifferentTypesAreAvailable(){ @Test - void mustReturnWhatExistsWhenNotBestMatchIsFound(){ + void mustReturnWhatExistsWhenNotBestMatchIsFound() { // arrange final var query = HostnameQueryTemplates.acmeComQuadA(); final var env = EnvTemplates.acmeCname(); doReturn(env) - .when(this.dao) - .findActiveEnv(); + .when(this.dao) + .findActiveEnv(); // act final var found = this.dao.findEntryForActiveEnv(query); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java index 8a06d7141..8bcf257f8 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/jsonv1v2/mapper/ConfigJsonV2MapperTest.java @@ -1,23 +1,28 @@ package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.mapper; +import java.nio.file.Path; +import java.nio.file.Paths; + import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.mapper.ConfigJsonV2Mapper; import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.vo.ConfigJson; + import org.junit.jupiter.api.Test; -import testing.templates.ConfigJsonTemplates; -import java.nio.file.Path; -import java.nio.file.Paths; +import testing.templates.ConfigJsonTemplates; import static com.mageddo.dnsproxyserver.config.CircuitBreakerStrategyConfig.Type.CANARY_RATE_THRESHOLD; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; class ConfigJsonV2MapperTest { static final Path RANDOM_CONFIG_PATH = Paths.get("/tmp/conf.json"); @Test - void mustMapSolverRemoteAsInactiveWhenNoRemoteServersFlagIsSet(){ + void mustMapSolverRemoteAsInactiveWhenNoRemoteServersFlagIsSet() { // arrange final var configJson = ConfigJsonTemplates.withNoRemoteServersAndCircuitBreakerDefined(); @@ -29,7 +34,7 @@ void mustMapSolverRemoteAsInactiveWhenNoRemoteServersFlagIsSet(){ } @Test - void mustMapSolverRemoteAsInactiveEvenWhenCircuitBreakerIsNOTSet(){ + void mustMapSolverRemoteAsInactiveEvenWhenCircuitBreakerIsNOTSet() { // arrange final var configJson = ConfigJsonTemplates.withoutCircuitBreakerDefinedWithNoRemoteServers(); @@ -41,7 +46,7 @@ void mustMapSolverRemoteAsInactiveEvenWhenCircuitBreakerIsNOTSet(){ } @Test - void mustReturnNullWhenNothingIsSet(){ + void mustReturnNullWhenNothingIsSet() { // arrange final var configJson = ConfigJsonTemplates.noRemoteServerFlagsSet(); @@ -53,7 +58,7 @@ void mustReturnNullWhenNothingIsSet(){ } @Test - void mustMapCanaryRateCircuitBreaker(){ + void mustMapCanaryRateCircuitBreaker() { final var configJson = ConfigJsonTemplates.canaryRateThresholdCircuitBreaker(); final var config = toConfig(configJson); @@ -64,7 +69,7 @@ void mustMapCanaryRateCircuitBreaker(){ } @Test - void mustMapRemoteDnsServerAddress(){ + void mustMapRemoteDnsServerAddress() { final var configJson = ConfigJsonTemplates.withDnsServers(); final var config = toConfig(configJson); diff --git a/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java index c59f104d6..01c98db8c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/config/provider/legacyenv/ConfigEnvMapperTest.java @@ -1,7 +1,9 @@ package com.mageddo.dnsproxyserver.config.provider.legacyenv; import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigEnvMapper; + import org.junit.jupiter.api.Test; + import testing.templates.config.ConfigEnvTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,7 +12,7 @@ class ConfigEnvMapperTest { @Test - void mustMapStubSolverDomainName(){ + void mustMapStubSolverDomainName() { final var configEnv = ConfigEnvTemplates.withStubSolverDomainName(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/di/ContextCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/di/ContextCompTest.java index ecee2d71c..eb5f29377 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/di/ContextCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/di/ContextCompTest.java @@ -1,13 +1,15 @@ package com.mageddo.dnsproxyserver.di; +import java.util.List; + import com.mageddo.di.Eager; import com.mageddo.json.JsonUtils; -import lombok.SneakyThrows; + import org.junit.jupiter.api.Test; import org.reflections.Reflections; import org.reflections.scanners.Scanners; -import java.util.List; +import lombok.SneakyThrows; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,34 +19,35 @@ class ContextCompTest { @Test @SneakyThrows - void mustRegisterAllEagerBeans(){ + void mustRegisterAllEagerBeans() { final var registeredBeanNames = this.findRegisteredBeanNames(); final var existingEagerClasses = this.findExistingEagerClasses(); assertEquals( - JsonUtils.prettyWriteValueAsString(existingEagerClasses), - JsonUtils.prettyWriteValueAsString(registeredBeanNames) + JsonUtils.prettyWriteValueAsString(existingEagerClasses), + JsonUtils.prettyWriteValueAsString(registeredBeanNames) ); } List findExistingEagerClasses() { final var reflections = new Reflections("com.mageddo"); - return reflections.get(Scanners.SubTypes.of(Eager.class).asClass()) - .stream() - .map(Class::getName) - .sorted() - .toList(); + return reflections.get(Scanners.SubTypes.of(Eager.class) + .asClass()) + .stream() + .map(Class::getName) + .sorted() + .toList(); } private List findRegisteredBeanNames() { return this.context - .eagerBeans() - .stream() - .map(Object::getClass) - .map(Class::getName) - .sorted() - .toList(); + .eagerBeans() + .stream() + .map(Object::getClass) + .map(Class::getName) + .sorted() + .toList(); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/dns/server/solver/WildcardsTest.java b/src/test/java/com/mageddo/dnsproxyserver/dns/server/solver/WildcardsTest.java index 95c9e1f9a..0646b18fb 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dns/server/solver/WildcardsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dns/server/solver/WildcardsTest.java @@ -1,6 +1,7 @@ package com.mageddo.dnsproxyserver.dns.server.solver; import com.mageddo.dns.Hostname; + import org.junit.jupiter.api.Test; import static com.mageddo.dns.utils.Wildcards.buildHostAndWildcards; @@ -8,7 +9,7 @@ class WildcardsTest { @Test - void mustGenerateHostsAndWildcardsTo(){ + void mustGenerateHostsAndWildcardsTo() { // arrange final var hostname = Hostname.of("bookmarks.mageddo.com"); diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java index 4210c513b..d87ead0bc 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorDefaultTest.java @@ -1,7 +1,9 @@ package com.mageddo.dnsproxyserver.dnsconfigurator; -import testing.templates.IpAddrTemplates; +import java.util.List; + import com.mageddo.os.Platform; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -9,7 +11,7 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; +import testing.templates.IpAddrTemplates; import static java.util.Collections.singletonList; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,18 +42,18 @@ void mustConfigureDNSServer() { final var network = "WI-FI"; doReturn(true) - .when(this.configurator) - .updateDnsServers(any(), any()) + .when(this.configurator) + .updateDnsServers(any(), any()) ; doReturn(List.of("8.8.8.8")) - .when(this.configurator) - .findNetworkDnsServers(eq(network)) + .when(this.configurator) + .findNetworkDnsServers(eq(network)) ; doReturn(singletonList(network)) - .when(this.configurator) - .findNetworks() + .when(this.configurator) + .findNetworks() ; // act @@ -59,7 +61,9 @@ void mustConfigureDNSServer() { // assert verify(this.configurator).updateDnsServers(eq(network), eq(singletonList(addr.getRawIP()))); - assertEquals("{WI-FI=[8.8.8.8]}", this.configurator.getServersBefore().toString()); + assertEquals("{WI-FI=[8.8.8.8]}", this.configurator.getServersBefore() + .toString() + ); } @Test @@ -69,18 +73,18 @@ void mustStoreServersBeforeOnceAndNotReplaceByOtherValues() { final var network = "WI-FI"; doReturn(true) - .when(this.configurator) - .updateDnsServers(any(), any()) + .when(this.configurator) + .updateDnsServers(any(), any()) ; doReturn(List.of("8.8.8.8")) - .when(this.configurator) - .findNetworkDnsServers(eq(network)) + .when(this.configurator) + .findNetworkDnsServers(eq(network)) ; doReturn(singletonList(network)) - .when(this.configurator) - .findNetworks() + .when(this.configurator) + .findNetworks() ; // act @@ -90,7 +94,9 @@ void mustStoreServersBeforeOnceAndNotReplaceByOtherValues() { // assert verify(this.configurator, times(1)).updateDnsServers(anyString(), any()); verify(this.configurator, times(1)).findNetworkDnsServers(any()); - assertEquals("{WI-FI=[8.8.8.8]}", this.configurator.getServersBefore().toString()); + assertEquals("{WI-FI=[8.8.8.8]}", this.configurator.getServersBefore() + .toString() + ); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorsTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorsTest.java index 4469c9943..cf65344f7 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/DnsConfiguratorsTest.java @@ -1,14 +1,16 @@ package com.mageddo.dnsproxyserver.dnsconfigurator; import com.mageddo.commons.concurrent.Threads; -import testing.templates.ConfigTemplates; -import testing.templates.IpAddrTemplates; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import testing.templates.ConfigTemplates; +import testing.templates.IpAddrTemplates; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; @@ -23,18 +25,23 @@ class DnsConfiguratorsTest { DnsConfigurators configurators; @Test - void mustFailAndStopAfterMaxTries(){ + void mustFailAndStopAfterMaxTries() { // arrange doReturn(ConfigTemplates.defaultWithoutId()) - .when(this.configurators) - .findConfig() + .when(this.configurators) + .findConfig() ; - doNothing().when(this.configurators).configureShutdownHook(any()); - doReturn(2).when(this.configurators).getInitialDelay(); - doReturn(5).when(this.configurators).getDelay(); - doReturn(IpAddrTemplates.local()).when(this.configurators).findIpAddr(); - - doThrow(new IllegalAccessError("Mocked error")).when(this.configurators).configure(any()); + doNothing().when(this.configurators) + .configureShutdownHook(any()); + doReturn(2).when(this.configurators) + .getInitialDelay(); + doReturn(5).when(this.configurators) + .getDelay(); + doReturn(IpAddrTemplates.local()).when(this.configurators) + .findIpAddr(); + + doThrow(new IllegalAccessError("Mocked error")).when(this.configurators) + .configure(any()); // act this.configurators.onStart(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java index 769ee228e..999bde8e4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/DnsConfiguratorLinuxTest.java @@ -1,16 +1,18 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Collections; + import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigEnv; import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type; -import testing.templates.IpAddrTemplates; + import org.apache.commons.exec.OS; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collections; +import testing.templates.IpAddrTemplates; import static com.mageddo.utils.Files.createIfNotExists; import static com.mageddo.utils.Files.getPathName; @@ -24,7 +26,7 @@ class DnsConfiguratorLinuxTest { DnsConfiguratorLinux configurator = spy(new DnsConfiguratorLinux()); @BeforeEach - void beforeEach(){ + void beforeEach() { assumeTrue(OS.isFamilyUnix()); } @@ -36,8 +38,8 @@ void mustConfigureDpsServerOnEmptyFileAsResolvconf(@TempDir Path tmpDir) throws final var ip = IpAddrTemplates.local(); doReturn(Collections.singletonList(resolvFile)) - .when(this.configurator) - .buildConfPaths() + .when(this.configurator) + .buildConfPaths() ; // act @@ -45,10 +47,10 @@ void mustConfigureDpsServerOnEmptyFileAsResolvconf(@TempDir Path tmpDir) throws // assert assertEquals( - """ - nameserver 10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + nameserver 10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -61,8 +63,8 @@ void mustConfigureDpsServerOnEmptyFileAsResolved(@TempDir Path tmpDir) throws Ex final var ip = IpAddrTemplates.local(); doReturn(Collections.singletonList(resolvFile)) - .when(this.configurator) - .buildConfPaths() + .when(this.configurator) + .buildConfPaths() ; // act @@ -70,10 +72,10 @@ void mustConfigureDpsServerOnEmptyFileAsResolved(@TempDir Path tmpDir) throws Ex // assert assertEquals( - """ - DNS=10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + DNS=10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -86,8 +88,8 @@ void shouldntConfigureResolvedTwice(@TempDir Path tmpDir) throws Exception { final var ip = IpAddrTemplates.local(); doReturn(Collections.singletonList(resolvFile)) - .when(this.configurator) - .buildConfPaths() + .when(this.configurator) + .buildConfPaths() ; // act @@ -96,10 +98,10 @@ void shouldntConfigureResolvedTwice(@TempDir Path tmpDir) throws Exception { // assert assertEquals( - """ - DNS=10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + DNS=10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -108,8 +110,8 @@ void shouldntConfigureResolvedTwice(@TempDir Path tmpDir) throws Exception { void mustSplitResolvPathConfigToMultiplePaths() { // arrange doReturn(ConfigEnv.DEFAULT_RESOLV_CONF_PATH) - .when(this.configurator) - .getConfigResolvPaths() + .when(this.configurator) + .getConfigResolvPaths() ; // act @@ -117,8 +119,9 @@ void mustSplitResolvPathConfigToMultiplePaths() { // assert assertEquals( - "[/host/etc/systemd/resolved.conf, /host/etc/resolv.conf, /etc/systemd/resolved.conf, /etc/resolv.conf]", - paths.toString() + "[/host/etc/systemd/resolved.conf, /host/etc/resolv.conf, /etc/systemd/resolved.conf, " + + "/etc/resolv.conf]", + paths.toString() ); } @@ -129,8 +132,8 @@ void mustDetectTwoConfigFilesButUseTheSecondBecauseTheFirstIsNotOK(@TempDir Path final var confB = createIfNotExists(tmpDir.resolve("resolv.conf")); doReturn(confA + "," + confB) - .when(this.configurator) - .getConfigResolvPaths() + .when(this.configurator) + .getConfigResolvPaths() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java index 9431a3a3c..a0a3f8373 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/LinuxResolverConfDetectorTest.java @@ -1,12 +1,13 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux; +import java.nio.file.Path; + import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvFile.Type; import com.mageddo.utils.Files; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Path; - import static java.nio.file.Files.writeString; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -40,15 +41,15 @@ void mustDetectResolvedFile(@TempDir Path tmpDir) throws Exception { // arrange final var conf = tmpDir.resolve("xpto.conf"); writeString( - conf, - """ - [Resolve] - # Some examples of DNS servers which may be used for DNS= and FallbackDNS=: - # Cloudflare: 1.1.1.1 - # Google: 8.8.8.8 - # Quad9: 9.9.9.9 - DNS= - """ + conf, + """ + [Resolve] + # Some examples of DNS servers which may be used for DNS= and FallbackDNS=: + # Cloudflare: 1.1.1.1 + # Google: 8.8.8.8 + # Quad9: 9.9.9.9 + DNS= + """ ); // act final var type = LinuxResolverConfDetector.detect(conf); @@ -62,10 +63,10 @@ void mustDetectResolvConfFile(@TempDir Path tmpDir) throws Exception { // arrange final var conf = tmpDir.resolve("xpto.conf"); writeString( - conf, - """ - nameserver 0.0.0.0 - """ + conf, + """ + nameserver 0.0.0.0 + """ ); // act final var type = LinuxResolverConfDetector.detect(conf); 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 157c1f9b3..dad9878ee 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/ResolvconfConfiguratorTest.java @@ -1,11 +1,12 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux; -import testing.templates.IpAddrTemplates; +import java.nio.file.Files; +import java.nio.file.Path; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Files; -import java.nio.file.Path; +import testing.templates.IpAddrTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -24,10 +25,10 @@ void mustConfigureDpsServerOnEmptyFile(@TempDir Path tmpDir) throws Exception { // assert assertEquals( - """ - nameserver 10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + nameserver 10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -45,11 +46,11 @@ void mustCommentExistingServerAndSetupPassedConf(@TempDir Path tmpDir) throws Ex // assert assertEquals( - """ - # nameserver 8.8.8.8 # dps-comment - nameserver 10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + # nameserver 8.8.8.8 # dps-comment + nameserver 10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -67,11 +68,11 @@ void mustUseAlreadyExistentDpsServerLine(@TempDir Path tmpDir) throws Exception ResolvconfConfigurator.process(resolvFile, ip); // assert assertEquals( - """ - # nameserver 8.8.8.8 # dps-comment - nameserver 10.10.0.1 # dps-entry - """, - Files.readString(resolvFile) + """ + # nameserver 8.8.8.8 # dps-comment + nameserver 10.10.0.1 # dps-entry + """, + Files.readString(resolvFile) ); } @@ -83,23 +84,24 @@ void mustRestoreOriginalResolvconf(@TempDir Path tmpDir) throws Exception { final var resolvFile = tmpDir.resolve("resolv.conf"); Files.writeString(resolvFile, """ - # Provided by test - # nameserver 7.7.7.7 - # nameserver 8.8.8.8 # dps-comment - nameserver 9.9.9.9 # dps-entry - """); + # Provided by test + # nameserver 7.7.7.7 + # nameserver 8.8.8.8 # dps-comment + nameserver 9.9.9.9 # dps-entry + """ + ); // act ResolvconfConfigurator.restore(resolvFile); // assert assertEquals( - """ - # Provided by test - # nameserver 7.7.7.7 - nameserver 8.8.8.8 - """, - Files.readString(resolvFile) + """ + # Provided by test + # nameserver 7.7.7.7 + nameserver 8.8.8.8 + """, + Files.readString(resolvFile) ); } @@ -113,8 +115,9 @@ void wontConfigurePortsDifferentFrom53(@TempDir Path tmpDir) throws Exception { // act final var ex = assertThrows(IllegalArgumentException.class, () -> { - ResolvconfConfigurator.process(resolvFile, addr); - }); + ResolvconfConfigurator.process(resolvFile, addr); + } + ); // assert final var msg = ex.getMessage(); @@ -123,49 +126,53 @@ void wontConfigurePortsDifferentFrom53(@TempDir Path tmpDir) throws Exception { } @Test - void mustNotCommentFollowingNameServersWhenNameserversOverrideIsDisabled(@TempDir Path tmpDir) throws Exception { + void mustNotCommentFollowingNameServersWhenNameserversOverrideIsDisabled(@TempDir Path tmpDir) + throws Exception { // arrange final var resolvFile = tmpDir.resolve("resolv.conf"); final var ip = IpAddrTemplates.local(); Files.writeString(resolvFile, """ - # Provided by test - nameserver 7.7.7.7 - # nameserver 8.8.8.8 - nameserver 8.8.4.4 - """); + # Provided by test + nameserver 7.7.7.7 + # nameserver 8.8.8.8 + nameserver 8.8.4.4 + """ + ); // act ResolvconfConfigurator.process(resolvFile, ip, false); // assert assertEquals( - """ - # Provided by test - nameserver 10.10.0.1 # dps-entry - nameserver 7.7.7.7 - # nameserver 8.8.8.8 - nameserver 8.8.4.4 - """, - Files.readString(resolvFile) + """ + # Provided by test + nameserver 10.10.0.1 # dps-entry + nameserver 7.7.7.7 + # nameserver 8.8.8.8 + nameserver 8.8.4.4 + """, + Files.readString(resolvFile) ); } @Test - void mustCreateExactlyOneDpsEntryWhenNameserversOverrideIsDisabled(@TempDir Path tmpDir) throws Exception { + void mustCreateExactlyOneDpsEntryWhenNameserversOverrideIsDisabled(@TempDir Path tmpDir) + throws Exception { // arrange final var resolvFile = tmpDir.resolve("resolv.conf"); final var ip = IpAddrTemplates.local(); Files.writeString(resolvFile, """ - # Provided by test - nameserver 7.7.7.7 - # nameserver 8.8.8.8 - nameserver 8.8.4.4 - """); + # Provided by test + nameserver 7.7.7.7 + # nameserver 8.8.8.8 + nameserver 8.8.4.4 + """ + ); // act ResolvconfConfigurator.process(resolvFile, ip, false); @@ -173,14 +180,14 @@ void mustCreateExactlyOneDpsEntryWhenNameserversOverrideIsDisabled(@TempDir Path // assert assertEquals( - """ - # Provided by test - nameserver 10.10.0.1 # dps-entry - nameserver 7.7.7.7 - # nameserver 8.8.8.8 - nameserver 8.8.4.4 - """, - Files.readString(resolvFile) + """ + # Provided by test + nameserver 10.10.0.1 # dps-entry + nameserver 7.7.7.7 + # nameserver 8.8.8.8 + nameserver 8.8.4.4 + """, + Files.readString(resolvFile) ); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/systemdresolved/ResolvedConfiguratorTest.java b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/systemdresolved/ResolvedConfiguratorTest.java index 071205be0..ea5d03715 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/systemdresolved/ResolvedConfiguratorTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/dnsconfigurator/linux/systemdresolved/ResolvedConfiguratorTest.java @@ -1,12 +1,14 @@ package com.mageddo.dnsproxyserver.dnsconfigurator.linux.systemdresolved; +import java.nio.file.Files; +import java.nio.file.Path; + import com.mageddo.dnsproxyserver.dnsconfigurator.linux.ResolvedConfigurator; -import testing.templates.IpAddrTemplates; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.nio.file.Files; -import java.nio.file.Path; +import testing.templates.IpAddrTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -42,7 +44,8 @@ void mustConfigureDnsServerOnAlreadyExstingFile(@TempDir Path tmpDir) throws Exc #DNS=192.168.0.128 #FallbackDNS= #Domains= - """); + """ + ); final var localIp = IpAddrTemplates.local(); // act @@ -60,7 +63,8 @@ void mustConfigureDnsServerOnAlreadyExstingFile(@TempDir Path tmpDir) throws Exc #FallbackDNS= #Domains= DNS=10.10.0.1 # dps-entry - """, Files.readString(confFile)); + """, Files.readString(confFile) + ); } @@ -72,7 +76,8 @@ void mustChangeActiveDNS(@TempDir Path tmpDir) throws Exception { DNS=8.8.8.8 FallbackDNS= Domains= - """); + """ + ); final var localIp = IpAddrTemplates.local(); // act @@ -85,7 +90,8 @@ void mustChangeActiveDNS(@TempDir Path tmpDir) throws Exception { FallbackDNS= Domains= DNS=10.10.0.1 # dps-entry - """, Files.readString(confFile)); + """, Files.readString(confFile) + ); } @Test @@ -94,7 +100,8 @@ void mustReuseDPSDNSLine(@TempDir Path tmpDir) throws Exception { final var confFile = Files.writeString(tmpDir.resolve("file.conf"), """ [Resolve] DNS=192.168.0.1 # dps-entry - """); + """ + ); final var localIp = IpAddrTemplates.local(); // act @@ -142,7 +149,8 @@ void mustConfigureCustomPort(@TempDir Path tmpDir) throws Exception { // arrange final var confFile = Files.writeString(tmpDir.resolve("file.conf"), """ [Resolve] - """); + """ + ); final var addr = IpAddrTemplates.localPort54(); // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/docker/DockerNetworkFacadeDefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/docker/DockerNetworkFacadeDefaultTest.java index a8a12f947..1295cd0dc 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/docker/DockerNetworkFacadeDefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/docker/DockerNetworkFacadeDefaultTest.java @@ -3,13 +3,15 @@ import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.exception.DockerException; import com.mageddo.dnsproxyserver.docker.dataprovider.DockerNetworkFacadeDefault; -import testing.templates.docker.DockerClientTemplates; import com.mageddo.http.HttpStatus; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; +import testing.templates.docker.DockerClientTemplates; + import static com.mageddo.dnsproxyserver.docker.domain.NetworkConnectionStatus.ALREADY_CONNECTED; import static com.mageddo.dnsproxyserver.docker.domain.NetworkConnectionStatus.CONNECTED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,13 +25,13 @@ class DockerNetworkFacadeDefaultTest { DockerClient dockerClient; @BeforeEach - void before(){ + void before() { this.dockerClient = DockerClientTemplates.buildSpy(); this.dao = new DockerNetworkFacadeDefault(this.dockerClient); } @Test - void mustConnectContainerIsToNetwork(){ + void mustConnectContainerIsToNetwork() { // arrange final var netName = "dps"; final var containerId = "a39bba9a8bab2899"; @@ -42,15 +44,17 @@ void mustConnectContainerIsToNetwork(){ } @Test - void mustNotThrowErrorWhenContainerIsAlreadyConnectedToNetwork(){ + void mustNotThrowErrorWhenContainerIsAlreadyConnectedToNetwork() { // arrange final var netName = "dps"; final var containerId = "a39bba9a8bab2899"; final var connectToNetworkCmd = this.dockerClient.connectToNetworkCmd(); - doThrow(new DockerException("endpoint with name cobaia already exists in network dps", HttpStatus.FORBIDDEN)) - .when(connectToNetworkCmd) - .exec() + doThrow(new DockerException("endpoint with name cobaia already exists in network dps", + HttpStatus.FORBIDDEN + )) + .when(connectToNetworkCmd) + .exec() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/docker/application/DockerConnectionCheckTest.java b/src/test/java/com/mageddo/dnsproxyserver/docker/application/DockerConnectionCheckTest.java index 7c75a916c..4d6c52bfb 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/docker/application/DockerConnectionCheckTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/docker/application/DockerConnectionCheckTest.java @@ -1,18 +1,19 @@ package com.mageddo.dnsproxyserver.docker.application; +import java.time.LocalDateTime; + import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.command.VersionCmd; import com.mageddo.commons.concurrent.Threads; import com.mageddo.dnsproxyserver.di.module.ModuleDockerClient; import com.mageddo.dnsproxyserver.docker.application.DockerConnectionCheck.Status; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; -import java.time.LocalDateTime; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assumptions.assumeTrue; @@ -52,16 +53,17 @@ void mustCheckIfDockerIsConnected() { void dockerMustBeConnected() { // arrange doReturn(true) - .when(this.connectionCheck).isSupportedPlatform(); + .when(this.connectionCheck) + .isSupportedPlatform(); final var versionCmd = mock(VersionCmd.class); doReturn(versionCmd) - .when(this.dockerClient) - .versionCmd(); + .when(this.dockerClient) + .versionCmd(); doReturn(null) - .when(versionCmd) - .exec(); + .when(versionCmd) + .exec(); // act final var connected = this.connectionCheck.isConnected(); @@ -76,21 +78,24 @@ void mustUpdateCache() { // arrange doReturn(true) - .when(this.connectionCheck).isSupportedPlatform(); + .when(this.connectionCheck) + .isSupportedPlatform(); this.connectionCheck.status = Status.connected(); assertTrue(this.connectionCheck.isConnected()); - this.connectionCheck.status = new Status(true, LocalDateTime.now().minusSeconds(31)); + this.connectionCheck.status = new Status(true, LocalDateTime.now() + .minusSeconds(31) + ); final var versionCmd = mock(VersionCmd.class); doReturn(versionCmd) - .when(this.dockerClient) - .versionCmd(); + .when(this.dockerClient) + .versionCmd(); doThrow(new RuntimeException("Whatever not connected error")) - .when(versionCmd) - .exec(); + .when(versionCmd) + .exec(); // act this.connectionCheck.isConnected(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultCompTest.java index 610fb877e..6eb37d5b8 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultCompTest.java @@ -1,17 +1,19 @@ package com.mageddo.dnsproxyserver.docker.dataprovider; +import java.util.ArrayList; + import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.model.Container; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.docker.ContainerTemplates; import testing.templates.docker.DockerClientTemplates; import testing.templates.docker.InspectContainerResponseTemplates; -import java.util.ArrayList; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.doReturn; @@ -25,24 +27,25 @@ class ContainerFacadeDefaultCompTest { DockerClient dockerClient; @BeforeEach - void before(){ + void before() { this.dockerClient = DockerClientTemplates.buildSpy(); this.dao = spy(new ContainerFacadeDefault(this.dockerClient)); } @Test - void mustFindContainerById(){ + void mustFindContainerById() { // arrange final var mockReturn = new ArrayList(); mockReturn.add(ContainerTemplates.buildDpsContainer()); mockReturn.add(ContainerTemplates.buildRegularContainerCoffeeMakerCheckout()); - final var containerId = mockReturn.get(0).getId(); + final var containerId = mockReturn.get(0) + .getId(); final var inspectContainerCmd = this.dockerClient.listContainersCmd(); doReturn(mockReturn) - .when(inspectContainerCmd) - .exec() + .when(inspectContainerCmd) + .exec() ; // act @@ -53,7 +56,7 @@ void mustFindContainerById(){ } @Test - void mustReturnNullWhenFindContainerByIdNotFound(){ + void mustReturnNullWhenFindContainerByIdNotFound() { // arrange final var mockReturn = new ArrayList(); @@ -61,8 +64,8 @@ void mustReturnNullWhenFindContainerByIdNotFound(){ final var listContainerCmd = this.dockerClient.listContainersCmd(); doReturn(mockReturn) - .when(listContainerCmd) - .exec() + .when(listContainerCmd) + .exec() ; // act @@ -73,15 +76,15 @@ void mustReturnNullWhenFindContainerByIdNotFound(){ } @Test - void mustListActiveContainers(){ + void mustListActiveContainers() { // arrange final var expected = new ArrayList(); expected.add(ContainerTemplates.buildRegularContainerCoffeeMakerCheckout()); final var listContainerCmd = this.dockerClient.listContainersCmd(); doReturn(expected) - .when(listContainerCmd) - .exec() + .when(listContainerCmd) + .exec() ; // act @@ -92,15 +95,15 @@ void mustListActiveContainers(){ } @Test - void mustInspectContainerById(){ + void mustInspectContainerById() { // arrange final var expected = InspectContainerResponseTemplates.ngixWithDefaultBridgeNetworkOnly(); final var containerId = expected.getId(); final var inspectContainerCmd = this.dockerClient.inspectContainerCmd(containerId); doReturn(expected) - .when(inspectContainerCmd) - .exec() + .when(inspectContainerCmd) + .exec() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultTest.java index 34f980466..5f2f1d3d4 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/docker/dataprovider/ContainerFacadeDefaultTest.java @@ -1,16 +1,18 @@ package com.mageddo.dnsproxyserver.docker.dataprovider; +import java.util.List; + import com.github.dockerjava.api.exception.NotFoundException; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.docker.ContainerTemplates; import testing.templates.docker.InspectContainerResponseTemplates; -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.doReturn; @@ -29,7 +31,8 @@ void mustNotThrowErrorWhenInspectContainerGetNotFound() { final var containerId = "a39bba9a8bab2899"; doThrow(new NotFoundException("Container not found")) - .when(this.facade).inspect(containerId) + .when(this.facade) + .inspect(containerId) ; // act @@ -45,7 +48,8 @@ void mustNotThrowErrorWhenInspectContainerFails() { final var containerId = "a39bba9a8bab28aa"; doThrow(new NullPointerException("Unexpected failure")) - .when(this.facade).inspect(containerId) + .when(this.facade) + .inspect(containerId) ; // act @@ -62,15 +66,17 @@ void mustFilterNullContainerInspections() { final var containers = List.of(c1, c2); doReturn(InspectContainerResponseTemplates.withDpsLabel()) - .when(this.facade).safeInspect(c1.getId()) + .when(this.facade) + .safeInspect(c1.getId()) ; doReturn(null) - .when(this.facade).safeInspect(c2.getId()) + .when(this.facade) + .safeInspect(c2.getId()) ; final var filtered = this.facade.inspectFilteringValidContainers(containers) - .toList(); + .toList(); assertEquals(1, filtered.size()); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinderIntTest.java b/src/test/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinderIntTest.java index b6e8a6ec0..653c231bf 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinderIntTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/sandbox/DpsBinaryExecutableFinderIntTest.java @@ -10,21 +10,23 @@ class DpsBinaryExecutableFinderIntTest { @Test - void mustFindDpsNativeExecutablePath(){ + void mustFindDpsNativeExecutablePath() { assumeTrue(ImageInfo.inImageRuntimeCode()); final var found = DpsBinaryExecutableFinder.findPath(); - assertTrue(found.toString().endsWith("-tests")); + assertTrue(found.toString() + .endsWith("-tests")); } @Test - void mustFindDpsJarPath(){ + void mustFindDpsJarPath() { assumeFalse(ImageInfo.inImageRuntimeCode()); final var found = DpsBinaryExecutableFinder.findPath(); - assertTrue(found.toString().endsWith(".jar")); + assertTrue(found.toString() + .endsWith(".jar")); } diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/CacheResourceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/CacheResourceCompTest.java index b230472db..10b847b6d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/CacheResourceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/CacheResourceCompTest.java @@ -33,17 +33,17 @@ void mustFindCacheSize() { // act final var response = given() - .get("/v1/caches/size") - .then() - .log() - .ifValidationFails(); + .get("/v1/caches/size") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(Response.Status.OK.getStatusCode()) - .body(equalTo(""" - {"GLOBAL":0,"REMOTE":0}""")) - .log() + .statusCode(Response.Status.OK.getStatusCode()) + .body(equalTo(""" + {"GLOBAL":0,"REMOTE":0}""")) + .log() ; } @@ -54,18 +54,18 @@ void mustFindCaches() { // act final var response = given() - .get("/v1/caches") - .then() - .log() - .ifValidationFails(); + .get("/v1/caches") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(Response.Status.OK.getStatusCode()) - .body("GLOBAL", notNullValue()) - .body("REMOTE.'A-acme.com'", notNullValue()) - .body("REMOTE.'A-acme.com'.ttl", equalTo("PT5S")) - .log() + .statusCode(Response.Status.OK.getStatusCode()) + .body("GLOBAL", notNullValue()) + .body("REMOTE.'A-acme.com'", notNullValue()) + .body("REMOTE.'A-acme.com'.ttl", equalTo("PT5S")) + .log() ; } @@ -75,18 +75,18 @@ void mustFilterCaches() { // act final var response = given() - .param("name", "GLOBAL") - .get("/v1/caches") - .then() - .log() - .ifValidationFails(); + .param("name", "GLOBAL") + .get("/v1/caches") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(Response.Status.OK.getStatusCode()) - .body("GLOBAL", notNullValue()) - .body("REMOTE", nullValue()) - .log() + .statusCode(Response.Status.OK.getStatusCode()) + .body("GLOBAL", notNullValue()) + .body("REMOTE", nullValue()) + .log() ; } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/StarterTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/StarterTest.java index c5b0b41d4..7017fa591 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/StarterTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/StarterTest.java @@ -1,11 +1,11 @@ package com.mageddo.dnsproxyserver.server; +import java.util.Set; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.Set; - import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -19,8 +19,10 @@ class StarterTest { @Test void wontStartInTestMode() { - doNothing().when(this.starter).startWebServer(); - doNothing().when(this.starter).startDnsServer(); + doNothing().when(this.starter) + .startWebServer(); + doNothing().when(this.starter) + .startDnsServer(); this.starter.start(); @@ -34,8 +36,10 @@ void mustStartWhenInTestModeAndFlagForced() { Starter.setMustStartFlagActive(true); - doNothing().when(this.starter).startWebServer(); - doNothing().when(this.starter).startDnsServer(); + doNothing().when(this.starter) + .startWebServer(); + doNothing().when(this.starter) + .startDnsServer(); this.starter.start(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/dns/MessagesTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/dns/MessagesTest.java index b12624668..c8aba4ef9 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/dns/MessagesTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/dns/MessagesTest.java @@ -1,22 +1,24 @@ package com.mageddo.dnsproxyserver.server.dns; import com.mageddo.dns.utils.Messages; -import testing.templates.MessageTemplates; + import org.junit.jupiter.api.Test; import org.xbill.DNS.Flags; import org.xbill.DNS.Rcode; +import testing.templates.MessageTemplates; + import static com.mageddo.dns.utils.Messages.findFirstAnswerRecord; -import static testing.templates.MessageTemplates.acmeAResponse; -import static testing.templates.MessageTemplates.acmeNxDomain; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static testing.templates.MessageTemplates.acmeAResponse; +import static testing.templates.MessageTemplates.acmeNxDomain; class MessagesTest { @Test - void mustBuildCompliantNxResponse(){ + void mustBuildCompliantNxResponse() { // arrange final var query = MessageTemplates.acmeAQuery(); @@ -25,15 +27,20 @@ void mustBuildCompliantNxResponse(){ final var res = Messages.nxDomain(query); // assert - assertFalse(query.getHeader().getFlag(Flags.QR)); - assertTrue(res.getHeader().getFlag(Flags.QR)); - assertTrue(res.getHeader().getFlag(Flags.RA)); - assertEquals(Rcode.NXDOMAIN, res.getHeader().getRcode()); + assertFalse(query.getHeader() + .getFlag(Flags.QR)); + assertTrue(res.getHeader() + .getFlag(Flags.QR)); + assertTrue(res.getHeader() + .getFlag(Flags.RA)); + assertEquals(Rcode.NXDOMAIN, res.getHeader() + .getRcode() + ); } @Test - void mustRespondRaFlagEvenWhenRdIsNotSetForARecord(){ + void mustRespondRaFlagEvenWhenRdIsNotSetForARecord() { // arrange final var query = MessageTemplates.acmeAQuery(); @@ -42,8 +49,10 @@ void mustRespondRaFlagEvenWhenRdIsNotSetForARecord(){ final var res = Messages.aAnswer(query, "0.0.0.0"); // assert - assertFalse(query.getHeader().getFlag(Flags.QR)); - assertTrue(query.getHeader().getFlag(Flags.RD)); + assertFalse(query.getHeader() + .getFlag(Flags.QR)); + assertTrue(query.getHeader() + .getFlag(Flags.RD)); final var resHeader = res.getHeader(); assertTrue(resHeader.getFlag(Flags.QR)); @@ -53,7 +62,7 @@ void mustRespondRaFlagEvenWhenRdIsNotSetForARecord(){ } @Test - void mustRespondRaFlagEvenWhenRdIsNotSetForAAAARecord(){ + void mustRespondRaFlagEvenWhenRdIsNotSetForAAAARecord() { // arrange final var query = MessageTemplates.acmeAQuery(); @@ -62,8 +71,10 @@ void mustRespondRaFlagEvenWhenRdIsNotSetForAAAARecord(){ final var res = Messages.quadAnswer(query, "0.0.0.0"); // assert - assertFalse(query.getHeader().getFlag(Flags.QR)); - assertTrue(query.getHeader().getFlag(Flags.RD)); + assertFalse(query.getHeader() + .getFlag(Flags.QR)); + assertTrue(query.getHeader() + .getFlag(Flags.RD)); final var resHeader = res.getHeader(); assertTrue(resHeader.getFlag(Flags.QR)); @@ -73,7 +84,7 @@ void mustRespondRaFlagEvenWhenRdIsNotSetForAAAARecord(){ } @Test - void mustBuildSimplePrintReq(){ + void mustBuildSimplePrintReq() { // arrange final var msg = MessageTemplates.acmeAQuery(); @@ -82,13 +93,13 @@ void mustBuildSimplePrintReq(){ // assert assertEquals(""" - query=A:acme.com""", - str + query=A:acme.com""", + str ); } @Test - void mustBuildSimpleAnswer(){ + void mustBuildSimpleAnswer() { // arrange final var answer = findFirstAnswerRecord(acmeAResponse()); @@ -97,13 +108,13 @@ void mustBuildSimpleAnswer(){ // assert assertEquals(""" - acme.com. 30 IN A 10.10.0.1""", - str + acme.com. 30 IN A 10.10.0.1""", + str ); } @Test - void mustBuildSimplePrintResponse(){ + void mustBuildSimplePrintResponse() { // arrange final var res = acmeAResponse(); @@ -112,13 +123,13 @@ void mustBuildSimplePrintResponse(){ // assert assertEquals(""" - rc=0, res=acme.com. 30 IN A 10.10.0.1""", - str + rc=0, res=acme.com. 30 IN A 10.10.0.1""", + str ); } @Test - void mustBuildSimplePrintNxDomainResponse(){ + void mustBuildSimplePrintNxDomainResponse() { // arrange final var res = acmeNxDomain(); @@ -127,8 +138,8 @@ void mustBuildSimplePrintNxDomainResponse(){ // assert assertEquals(""" - rc=3, query=A:acme.com""", - str + rc=3, query=A:acme.com""", + str ); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/dns/RequestHandlerDefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/dns/RequestHandlerDefaultTest.java index f998f968b..2fde493ec 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/dns/RequestHandlerDefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/dns/RequestHandlerDefaultTest.java @@ -5,6 +5,7 @@ import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.MessageTemplates; import testing.templates.ResponseTemplates; @@ -26,8 +27,8 @@ void mustCacheWithFixedTTL() { final var mesRes = MessageTemplates.acmeAResponse(); doReturn(ResponseTemplates.acmeAResponse()) - .when(this.handler) - .solve(eq(mesRes)) + .when(this.handler) + .solve(eq(mesRes)) ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/server/rest/NetworkResourceCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/server/rest/NetworkResourceCompTest.java index 8320802e2..8ac3bfc7c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/server/rest/NetworkResourceCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/server/rest/NetworkResourceCompTest.java @@ -1,15 +1,18 @@ package com.mageddo.dnsproxyserver.server.rest; +import java.util.List; + +import javax.ws.rs.core.Response; + import com.mageddo.dnsproxyserver.solver.docker.application.DockerNetworkService; + +import org.junit.jupiter.api.Test; + import dagger.sheath.InjectMock; import dagger.sheath.junit.DaggerTest; -import org.junit.jupiter.api.Test; import testing.ContextSupplier; import testing.Events; -import javax.ws.rs.core.Response; -import java.util.List; - import static io.restassured.RestAssured.given; import static org.hamcrest.CoreMatchers.equalTo; import static org.mockito.ArgumentMatchers.anyString; @@ -25,23 +28,23 @@ class NetworkResourceCompTest { void changeDefaultEnv() { // arrange doReturn(List.of("6c99cf8211c282a50fe5be34dff1aa0c8ce9b0aa194dcf6b80339898de07be59")) - .when(this.networkService) - .disconnectContainers(anyString()) + .when(this.networkService) + .disconnectContainers(anyString()) ; // act final var response = given() - .queryParam("networkId", "net1") - .delete("/network/disconnect-containers") - .then() - .log() - .ifValidationFails(); + .queryParam("networkId", "net1") + .delete("/network/disconnect-containers") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(Response.Status.OK.getStatusCode()) - .body(equalTo("[\"6c99cf8211c282a50fe5be34dff1aa0c8ce9b0aa194dcf6b80339898de07be59\"]")) - .log() + .statusCode(Response.Status.OK.getStatusCode()) + .body(equalTo("[\"6c99cf8211c282a50fe5be34dff1aa0c8ce9b0aa194dcf6b80339898de07be59\"]")) + .log() ; } diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/HostnameQueryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/HostnameQueryTest.java index bbb6f786c..0c0d577c5 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/HostnameQueryTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/HostnameQueryTest.java @@ -1,9 +1,9 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.HostnameQuery; +import org.junit.jupiter.api.Test; + import testing.templates.HostnameQueryTemplates; import testing.templates.HostnameTemplates; -import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -11,7 +11,7 @@ class HostnameQueryTest { @Test - void mustMatchWildcard(){ + void mustMatchWildcard() { // arrange final var acme = HostnameQueryTemplates.acmeComWildcard(); @@ -25,7 +25,7 @@ void mustMatchWildcard(){ } @Test - void mustMatchWildcardWhenUsingSubdomain(){ + void mustMatchWildcardWhenUsingSubdomain() { // arrange final var acme = HostnameQueryTemplates.orangeAcmeComWildcard(); @@ -39,7 +39,7 @@ void mustMatchWildcardWhenUsingSubdomain(){ } @Test - void mustMatchExactHostname(){ + void mustMatchExactHostname() { // arrange final var acme = HostnameQueryTemplates.acmeComWildcard(); @@ -53,7 +53,7 @@ void mustMatchExactHostname(){ } @Test - void mustMatchRegex(){ + void mustMatchRegex() { // arrange final var acme = HostnameQuery.ofRegex(HostnameTemplates.ACME_HOSTNAME); @@ -68,7 +68,7 @@ void mustMatchRegex(){ } @Test - void mustRespectRegexTemplate(){ + void mustRespectRegexTemplate() { // arrange final var hostname = HostnameQuery.ofRegex("a"); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/RemoteResolversCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/RemoteResolversCompTest.java index a6f3d96ab..81a70f0d0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/RemoteResolversCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/RemoteResolversCompTest.java @@ -1,13 +1,13 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.RemoteResolvers; -import dagger.sheath.junit.DaggerTest; +import javax.inject.Inject; + import org.junit.jupiter.api.Test; + +import dagger.sheath.junit.DaggerTest; import testing.ContextSupplier; import testing.Events; -import javax.inject.Inject; - import static org.junit.jupiter.api.Assertions.assertEquals; @DaggerTest(initializer = ContextSupplier.class, eventsHandler = Events.class) @@ -17,7 +17,7 @@ class RemoteResolversCompTest { RemoteResolvers remoteResolvers; @Test - void mustBuildWithDefaultRemoteServer(){ + void mustBuildWithDefaultRemoteServer() { // arrange diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCacheFactoryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCacheFactoryTest.java index 00faf8f64..3694df298 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCacheFactoryTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCacheFactoryTest.java @@ -1,6 +1,7 @@ package com.mageddo.dnsproxyserver.solver; import com.mageddo.commons.concurrent.Threads; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; @@ -13,11 +14,11 @@ class SolverCacheFactoryTest { SolverCacheFactory factory = spy(new SolverCacheFactory( - new SolverCache(CacheName.Name.GLOBAL), new SolverCache(CacheName.Name.GLOBAL) + new SolverCache(CacheName.Name.GLOBAL), new SolverCache(CacheName.Name.GLOBAL) )); @Test - void mustClearCacheInBackground(){ + void mustClearCacheInBackground() { // arrange assertEquals(0, this.factory.getProcessedInBackground()); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCachedRemoteTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCachedRemoteTest.java index 85b91b7e1..932a86058 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCachedRemoteTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverCachedRemoteTest.java @@ -1,8 +1,5 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.SolverCache; -import com.mageddo.dnsproxyserver.solver.SolverCachedRemote; -import testing.templates.MessageTemplates; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -10,6 +7,8 @@ import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import testing.templates.MessageTemplates; + import static org.junit.jupiter.api.Assertions.assertNull; @ExtendWith(MockitoExtension.class) @@ -23,7 +22,7 @@ class SolverCachedRemoteTest { SolverCachedRemote solver; @Test - void mustLeadWithNullResponses(){ + void mustLeadWithNullResponses() { // arrange final var query = MessageTemplates.acmeQuadAQuery(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDelegateTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDelegateTest.java index b33b0a1fe..474b327dd 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDelegateTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDelegateTest.java @@ -1,18 +1,16 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.SolverDelegate; -import com.mageddo.dnsproxyserver.solver.SolverLocalDB; -import com.mageddo.dnsproxyserver.solver.SolverProvider; -import testing.templates.EntryTemplates; -import testing.templates.MessageTemplates; -import testing.templates.SolverMockTemplates; +import java.util.List; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.util.List; +import testing.templates.EntryTemplates; +import testing.templates.MessageTemplates; +import testing.templates.SolverMockTemplates; import static com.mageddo.utils.Assertions.validResponse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -39,8 +37,8 @@ void mustDelegateAndGetValidAnswer() { final var cname = EntryTemplates.cname("acme.com", "acme.com.br"); doReturn(List.of(SolverMockTemplates.whateverMock("acme.com.br"))) - .when(this.solverProvider) - .getSolversExcluding(SolverLocalDB.class); + .when(this.solverProvider) + .getSolversExcluding(SolverLocalDB.class); // act final var response = this.delegate.solve(query, cname); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDockerTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDockerTest.java index b844c868a..0bce3403d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDockerTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverDockerTest.java @@ -1,13 +1,11 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.config.Config.Entry.Type; import com.mageddo.dns.utils.Messages; -import com.mageddo.dnsproxyserver.solver.HostnameQuery; -import com.mageddo.dnsproxyserver.solver.Responses; -import com.mageddo.dnsproxyserver.solver.SolverDocker; +import com.mageddo.dnsproxyserver.config.Config.Entry.Type; import com.mageddo.dnsproxyserver.solver.docker.application.ContainerSolvingService; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAO; import com.mageddo.net.IP; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -16,6 +14,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.xbill.DNS.Flags; + import testing.templates.HostnameTemplates; import testing.templates.MessageTemplates; import testing.templates.docker.EntryTemplates; @@ -56,12 +55,12 @@ void mustSolveExactHostname() { final var hostname = HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME); doReturn(true) - .when(this.dockerDAO) - .isConnected() + .when(this.dockerDAO) + .isConnected() ; doReturn(entry) - .when(this.containerSolvingService) - .findBestMatch(eq(hostname)); + .when(this.containerSolvingService) + .findBestMatch(eq(hostname)); // act final var res = this.solver.handle(query); @@ -70,7 +69,9 @@ void mustSolveExactHostname() { assertNotNull(res); final var resText = res.toString(); - assertTrue(resText.contains(entry.getIp().toText()), resText); + assertTrue(resText.contains(entry.getIp() + .toText()), resText + ); verify(this.containerSolvingService).findBestMatch(hostname); } @@ -81,13 +82,13 @@ void mustSolveQuadARecordQuery() { final var entry = EntryTemplates.localIpv6(); doReturn(true) - .when(this.dockerDAO) - .isConnected() + .when(this.dockerDAO) + .isConnected() ; doReturn(entry) - .when(this.containerSolvingService) - .findBestMatch(any()); + .when(this.containerSolvingService) + .findBestMatch(any()); // act final var res = this.solver.handle(query); @@ -96,7 +97,9 @@ void mustSolveQuadARecordQuery() { assertNotNull(res); assertTrue(Responses.hasFlag(res, Flags.RA)); final var resText = res.toString(); - assertTrue(resText.contains(entry.getIp().toText()), resText); + assertTrue(resText.contains(entry.getIp() + .toText()), resText + ); verify(this.containerSolvingService).findBestMatch(this.hostnameQueryCaptor.capture()); final var v = this.hostnameQueryCaptor.getValue(); @@ -110,13 +113,13 @@ void mustSolveEmptyIpWhenHostnameMatchesButNoIpIsFound() { final var entry = EntryTemplates.hostnameMatchedButNoAddress(); doReturn(true) - .when(this.dockerDAO) - .isConnected() + .when(this.dockerDAO) + .isConnected() ; doReturn(entry) - .when(this.containerSolvingService) - .findBestMatch(any()); + .when(this.containerSolvingService) + .findBestMatch(any()); // act final var res = this.solver.handle(query); @@ -135,13 +138,13 @@ void mustReturnNxDomainWhenHostnameDONTMatches() { final var entry = EntryTemplates.hostnameNotMatched(); doReturn(true) - .when(this.dockerDAO) - .isConnected() + .when(this.dockerDAO) + .isConnected() ; doReturn(entry) - .when(this.containerSolvingService) - .findBestMatch(any()); + .when(this.containerSolvingService) + .findBestMatch(any()); // act final var res = this.solver.handle(query); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverLocalDBTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverLocalDBTest.java index de2dedc30..d52794dfb 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverLocalDBTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverLocalDBTest.java @@ -1,12 +1,10 @@ package com.mageddo.dnsproxyserver.solver; +import java.time.Duration; + import com.mageddo.dns.utils.Messages; -import com.mageddo.dnsproxyserver.solver.HostnameQuery; -import com.mageddo.dnsproxyserver.solver.SolverLocalDB; -import testing.templates.EntryTemplates; -import testing.templates.HostnameTemplates; -import testing.templates.MessageTemplates; import com.mageddo.net.IP; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -14,7 +12,9 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.xbill.DNS.Rcode; -import java.time.Duration; +import testing.templates.EntryTemplates; +import testing.templates.HostnameTemplates; +import testing.templates.MessageTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -39,8 +39,8 @@ void mustSolveWildCardHosts() { final var wildcardHostName = HostnameQuery.ofWildcard(hostname.getHostname()); doReturn(EntryTemplates.acmeA()) - .when(this.solver) - .findEntryTo(eq(wildcardHostName)) + .when(this.solver) + .findEntryTo(eq(wildcardHostName)) ; // act @@ -49,8 +49,8 @@ void mustSolveWildCardHosts() { // assert assertNotNull(res); assertEquals( - "acme.com. 45 IN A 10.10.0.1", - Messages.detailedPrint(res.getMessage()) + "acme.com. 45 IN A 10.10.0.1", + Messages.detailedPrint(res.getMessage()) ); assertEquals(Duration.ofSeconds(45), res.getDpsTtl()); @@ -64,11 +64,13 @@ void mustSolveQuadAQueries() { // arrange final var query = MessageTemplates.acmeQuadAQuery(); - final var wildcardHostName = HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME, IP.Version.IPV6); + final var wildcardHostName = HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME, + IP.Version.IPV6 + ); doReturn(EntryTemplates.acmeQuadA()) - .when(this.solver) - .findEntryTo(eq(wildcardHostName)) + .when(this.solver) + .findEntryTo(eq(wildcardHostName)) ; // act @@ -77,8 +79,8 @@ void mustSolveQuadAQueries() { // assert assertNotNull(res); assertEquals( - "acme.com. 45 IN AAAA 2001:db8:1:0:0:0:0:2", - Messages.detailedPrint(res.getMessage()) + "acme.com. 45 IN AAAA 2001:db8:1:0:0:0:0:2", + Messages.detailedPrint(res.getMessage()) ); verify(this.solver).findEntryTo(wildcardHostName); @@ -90,11 +92,13 @@ void mustSolveNoErrorWhenHostIsFoundButAddressIsNot() { // arrange final var query = MessageTemplates.acmeQuadAQuery(); - final var wildcardHostName = HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME, IP.Version.IPV6); + final var wildcardHostName = HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME, + IP.Version.IPV6 + ); doReturn(EntryTemplates.acmeA()) - .when(this.solver) - .findEntryTo(eq(wildcardHostName)) + .when(this.solver) + .findEntryTo(eq(wildcardHostName)) ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderCompTest.java index 11a3a2300..712c05a3c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderCompTest.java @@ -1,14 +1,15 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.SolverProvider; -import dagger.sheath.junit.DaggerTest; +import java.util.Arrays; + +import javax.inject.Inject; + import org.junit.jupiter.api.Test; + +import dagger.sheath.junit.DaggerTest; import testing.ContextSupplier; import testing.Events; -import javax.inject.Inject; -import java.util.Arrays; - import static org.junit.jupiter.api.Assertions.assertEquals; @DaggerTest(initializer = ContextSupplier.class, eventsHandler = Events.class) diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderTest.java index bdd6d1ec2..3ab59a31c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverProviderTest.java @@ -1,9 +1,11 @@ package com.mageddo.dnsproxyserver.solver; import com.mageddo.dnsproxyserver.quarkus.Instances; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.ConfigTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -18,10 +20,10 @@ void mustDisableRemoteSolversWhenNoRemoteServersOptionIsEnabled() { final var config = ConfigTemplates.withSolverRemoteDisabled(); final var solvers = Instances.of( - new SolverMock("SolverSystem"), - new SolverMock("SolverDocker"), - new SolverMock("SolverLocalDB"), - new SolverMock("SolverCachedRemote") + new SolverMock("SolverSystem"), + new SolverMock("SolverDocker"), + new SolverMock("SolverLocalDB"), + new SolverMock("SolverCachedRemote") ); final var provider = spy(new SolverProvider(solvers, config)); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemCompTest.java index 618cd9cba..02caa2a84 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemCompTest.java @@ -1,20 +1,21 @@ package com.mageddo.dnsproxyserver.solver; +import javax.inject.Inject; + import com.mageddo.dns.utils.Messages; -import com.mageddo.dnsproxyserver.solver.SolverSystem; -import testing.templates.HostnameTemplates; import com.mageddo.dnsproxyserver.usecase.HostMachineService; import com.mageddo.net.IP; -import dagger.sheath.InjectMock; -import dagger.sheath.junit.DaggerTest; + import org.hamcrest.CoreMatchers; import org.junit.jupiter.api.Test; import org.xbill.DNS.Flags; import org.xbill.DNS.Rcode; + +import dagger.sheath.InjectMock; +import dagger.sheath.junit.DaggerTest; import testing.ContextSupplier; import testing.Events; - -import javax.inject.Inject; +import testing.templates.HostnameTemplates; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -41,8 +42,8 @@ void mustSolverHostMachineIp() { final var query = Messages.aQuestion(hostname); doReturn(IP.of("192.168.0.1")) - .when(this.machineService) - .findHostMachineIP(any()) + .when(this.machineService) + .findHostMachineIP(any()) ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemTest.java index b101c4707..6c4620a30 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolverSystemTest.java @@ -1,13 +1,13 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.dnsproxyserver.solver.SolverSystem; -import testing.templates.MessageTemplates; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; +import testing.templates.MessageTemplates; + import static org.junit.jupiter.api.Assertions.assertNull; @ExtendWith(MockitoExtension.class) diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/SolversCacheTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/SolversCacheTest.java index 496b20e24..00906e883 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/SolversCacheTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/SolversCacheTest.java @@ -1,18 +1,5 @@ package com.mageddo.dnsproxyserver.solver; -import com.mageddo.commons.concurrent.ThreadPool; -import com.mageddo.commons.concurrent.Threads; -import com.mageddo.dns.utils.Messages; -import com.mageddo.dnsproxyserver.solver.CacheName.Name; -import lombok.SneakyThrows; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.junit.jupiter.MockitoExtension; -import org.xbill.DNS.Flags; -import org.xbill.DNS.Message; -import testing.templates.MessageTemplates; -import testing.templates.ResponseTemplates; - import java.security.SecureRandom; import java.time.Duration; import java.util.ArrayList; @@ -25,6 +12,21 @@ import java.util.function.Function; import java.util.stream.IntStream; +import com.mageddo.commons.concurrent.ThreadPool; +import com.mageddo.commons.concurrent.Threads; +import com.mageddo.dns.utils.Messages; +import com.mageddo.dnsproxyserver.solver.CacheName.Name; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.xbill.DNS.Flags; +import org.xbill.DNS.Message; + +import lombok.SneakyThrows; +import testing.templates.MessageTemplates; +import testing.templates.ResponseTemplates; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -56,14 +58,16 @@ void mustCacheForTheSpecifiedTime() { // act final var res = this.cache.handleRes(req, message -> { - return Response.of(Messages.aAnswer(message, "0.0.0.0"), Duration.ofMillis(50)); - }); + return Response.of(Messages.aAnswer(message, "0.0.0.0"), Duration.ofMillis(50)); + } + ); // assert assertNotNull(res); assertNotNull(this.cache.get(key)); - Threads.sleep(res.getDpsTtl().plusMillis(10)); + Threads.sleep(res.getDpsTtl() + .plusMillis(10)); assertNull(this.cache.get(key)); } @@ -74,14 +78,19 @@ void mustCacheAndGetValidResponse() { final var req = MessageTemplates.acmeAQuery(); // act - final var res = this.cache.handle(req, message -> Response.internalSuccess(Messages.aAnswer(message, "0.0.0.0"))); + final var res = this.cache.handle(req, + message -> Response.internalSuccess(Messages.aAnswer(message, "0.0.0.0")) + ); // assert assertNotNull(res); assertEquals(1, this.cache.getSize()); final var header = res.getHeader(); - assertEquals(req.getHeader().getID(), res.getHeader().getID()); + assertEquals(req.getHeader() + .getID(), res.getHeader() + .getID() + ); assertTrue(header.getFlag(Flags.QR)); } @@ -113,8 +122,8 @@ void mustEvictLocksAndDeadLocks() throws Exception { // act this.runNTimes( - it -> pool.submit(() -> this.cache.handle(MessageTemplates.randomHostnameAQuery(), fn)), - 30 + it -> pool.submit(() -> this.cache.handle(MessageTemplates.randomHostnameAQuery(), fn)), + 30 ); pool.shutdown(); @@ -132,8 +141,8 @@ static void closePoolWhenItWontGetStuckByDeadlock(ExecutorService pool) { void runNTimes(final Consumer task, final int times) { IntStream.range(0, times) - .boxed() - .forEach(task); + .boxed() + .forEach(task); } @SneakyThrows @@ -156,10 +165,11 @@ private void concurrentRequests(int quantity, Message req, Random r) { private Object handleRequest(Message req, Random r) { this.cache.handleRes(req, message -> { - final var res = Response.internalSuccess(Messages.aAnswer(message, "0.0.0.0")); - Threads.sleep(r.nextInt(10)); - return res; - }); + final var res = Response.internalSuccess(Messages.aAnswer(message, "0.0.0.0")); + Threads.sleep(r.nextInt(10)); + return res; + } + ); return null; } diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/ContainerSolvingServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/ContainerSolvingServiceTest.java index a2910b3e4..2a96113b1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/ContainerSolvingServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/ContainerSolvingServiceTest.java @@ -1,11 +1,13 @@ package com.mageddo.dnsproxyserver.solver.docker.application; +import java.util.List; + import com.mageddo.dnsproxyserver.solver.HostnameQuery; -import com.mageddo.dnsproxyserver.solver.docker.application.ContainerSolvingService; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.ContainerDAO; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAO; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAO; import com.mageddo.net.IP; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,12 +15,11 @@ import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.IpTemplates; import testing.templates.server.dns.solver.docker.ContainerTemplates; import testing.templates.server.dns.solver.docker.NetworkTemplates; -import java.util.List; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -68,13 +69,13 @@ void mustReturnHostMachineIPWhenThereIsNoBetterMatch() { final var expectedIp = IP.of(IpTemplates.LOCAL_IPV6); doReturn(expectedIp) - .when(this.dockerDAO) - .findHostMachineIp(eq(version)) + .when(this.dockerDAO) + .findHostMachineIp(eq(version)) ; doReturn(true) - .when(this.containerSolvingService) - .isDockerSolverHostMachineFallbackActive() + .when(this.containerSolvingService) + .isDockerSolverHostMachineFallbackActive() ; // act @@ -87,10 +88,10 @@ void mustReturnHostMachineIPWhenThereIsNoBetterMatch() { } @DisplayName(""" - When there is no a default bridge network but a custom, there is no dps network label, - there is no a DPS network but there is a custom bridge network and a other like overlay, must prioritize to use - the bridge network. - """) + When there is no a default bridge network but a custom, there is no dps network label, + there is no a DPS network but there is a custom bridge network and a other like overlay, must prioritize to use + the bridge network. + """) @Test void mustPreferCustomBridgeNetworkOverOtherNetworksWhenThereIsNotABetterMatch() { // arrange @@ -99,12 +100,12 @@ void mustPreferCustomBridgeNetworkOverOtherNetworksWhenThereIsNotABetterMatch() final var container = ContainerTemplates.withCustomBridgeAndOverlayNetwork(); doReturn(NetworkTemplates.withOverlayDriver(overlayNetwork)) - .when(this.networkDAO) - .findByName(eq(overlayNetwork)) + .when(this.networkDAO) + .findByName(eq(overlayNetwork)) ; doReturn(NetworkTemplates.withBridgeDriver(bridgeNetwork)) - .when(this.networkDAO) - .findByName(eq(bridgeNetwork)) + .when(this.networkDAO) + .findByName(eq(bridgeNetwork)) ; // act @@ -125,8 +126,8 @@ void mustReturnNoIPWhenHostMachineFallbackIsDisabled() { final var version = IP.Version.IPV6; doReturn(false) - .when(this.containerSolvingService) - .isDockerSolverHostMachineFallbackActive() + .when(this.containerSolvingService) + .isDockerSolverHostMachineFallbackActive() ; // act @@ -188,8 +189,8 @@ void mustSolveIpv6FromAnyOtherNetworkWhenThereIsNoBetterMatch() { final var version = IP.Version.IPV6; doReturn(NetworkTemplates.withBridgeDriver("my-net1")) - .when(this.networkDAO) - .findByName(anyString()) + .when(this.networkDAO) + .findByName(anyString()) ; // act @@ -224,8 +225,8 @@ void mustSolveIpv6AndDontUseEmptyIpSpecifiedOnBridgeWhichIsThePreferredNetwork() final var version = IP.Version.IPV6; doReturn(NetworkTemplates.withBridgeDriver("my-net1")) - .when(this.networkDAO) - .findByName(anyString()) + .when(this.networkDAO) + .findByName(anyString()) ; // act @@ -244,8 +245,8 @@ void mustReturnNoIpWhenNoIpv6ReturnedFromDockerSolver() { final var container = ContainerTemplates.withDefaultBridgeNetworkOnly(); doReturn(List.of(container)) - .when(this.containerDAO) - .findActiveContainersMatching(eq(hostnameQuery)); + .when(this.containerDAO) + .findActiveContainersMatching(eq(hostnameQuery)); // act final var ip = this.containerSolvingService.findBestMatch(hostnameQuery); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsContainerServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsContainerServiceTest.java index eb772d5f1..b728a5b66 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsContainerServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsContainerServiceTest.java @@ -1,12 +1,14 @@ package com.mageddo.dnsproxyserver.solver.docker.application; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.NetworkDAO; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.server.dns.solver.docker.ContainerTemplates; import static org.mockito.ArgumentMatchers.any; @@ -68,15 +70,15 @@ void mustDoNothingWhenItIsAlreadyCorrectlyConnectedToDpsNetwork() { } @Test - void mustCheckDockerConnectionBeforeUseDockerDao(){ + void mustCheckDockerConnectionBeforeUseDockerDao() { // arrange doReturn(true) - .when(this.dpsContainerService) - .isDpsRunningInsideContainer() + .when(this.dpsContainerService) + .isDpsRunningInsideContainer() ; doReturn(false) - .when(this.dpsContainerService) - .isDockerConnected(); + .when(this.dpsContainerService) + .isDockerConnected(); // act this.dpsContainerService.findDpsIP(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsDockerEnvironmentSetupServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsDockerEnvironmentSetupServiceTest.java index b84834eac..49ba67ae0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsDockerEnvironmentSetupServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/application/DpsDockerEnvironmentSetupServiceTest.java @@ -1,7 +1,5 @@ package com.mageddo.dnsproxyserver.solver.docker.application; -import com.mageddo.dnsproxyserver.solver.docker.application.DpsContainerService; -import com.mageddo.dnsproxyserver.solver.docker.application.DpsDockerEnvironmentSetupService; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -25,16 +23,16 @@ class DpsDockerEnvironmentSetupServiceTest { DpsDockerEnvironmentSetupService setupService; @Test - void mustSetupNetworkWhenFeatureIsActive(){ + void mustSetupNetworkWhenFeatureIsActive() { // arrange doReturn(true) - .when(this.setupService) - .isMustConfigureDpsNetwork() + .when(this.setupService) + .isMustConfigureDpsNetwork() ; doNothing() - .when(this.setupService) - .createNetworkIfAbsent() + .when(this.setupService) + .createNetworkIfAbsent() ; // act @@ -47,12 +45,12 @@ void mustSetupNetworkWhenFeatureIsActive(){ } @Test - void mustDoNothingSetupNetworkWhenFeatureIsInactive(){ + void mustDoNothingSetupNetworkWhenFeatureIsInactive() { // arrange doReturn(false) - .when(this.setupService) - .isMustConfigureDpsNetwork() + .when(this.setupService) + .isMustConfigureDpsNetwork() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/ContainerHostnameMatcherTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/ContainerHostnameMatcherTest.java index 91059d875..8701a88ac 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/ContainerHostnameMatcherTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/ContainerHostnameMatcherTest.java @@ -2,8 +2,10 @@ import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.solver.HostnameQuery; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + import testing.templates.ConfigTemplates; import testing.templates.HostnameQueryTemplates; import testing.templates.HostnameTemplates; @@ -16,12 +18,12 @@ class ContainerHostnameMatcherTest { @BeforeEach - void beforeEach(){ + void beforeEach() { Configs.clear(); } @Test - void mustSolveFromContainerHostnameWithoutDomain(){ + void mustSolveFromContainerHostnameWithoutDomain() { // arrange final var inspect = InspectContainerResponseTemplates.buildWithHostnameAndWithoutDomain(); final var hostname = HostnameQueryTemplates.nginxWildcard(); @@ -35,9 +37,11 @@ void mustSolveFromContainerHostnameWithoutDomain(){ } @Test - void mustSolveFromContainerHostnameWithDomain(){ + void mustSolveFromContainerHostnameWithDomain() { // arrange - final var inspect = InspectContainerResponseTemplates.buildWithHostnameAndDomain("acme.com", "local"); + final var inspect = InspectContainerResponseTemplates.buildWithHostnameAndDomain("acme.com", + "local" + ); final var hostname = HostnameQueryTemplates.acmeComLocal(); final var config = ConfigTemplates.defaultWithoutId(); @@ -49,7 +53,7 @@ void mustSolveFromContainerHostnameWithDomain(){ } @Test - void mustSolveFromContainerHostnameEnv(){ + void mustSolveFromContainerHostnameEnv() { // arrange final var inspect = InspectContainerResponseTemplates.build(); final var hostname = HostnameQueryTemplates.nginxComBrWildcard(); @@ -63,9 +67,10 @@ void mustSolveFromContainerHostnameEnv(){ } @Test - void mustSolveRegexFromContainerHostnameEnv(){ + void mustSolveRegexFromContainerHostnameEnv() { // arrange - final var inspect = InspectContainerResponseTemplates.buildWithHostnamesEnv("/nginx.+/,/acme.+/"); + final var inspect = InspectContainerResponseTemplates.buildWithHostnamesEnv( + "/nginx.+/,/acme.+/"); final var hostname = HostnameQuery.ofRegex(HostnameTemplates.NGINX_COM_BR); final var hostnameAcme = HostnameQuery.ofRegex(HostnameTemplates.NGINX_COM_BR); final var config = ConfigTemplates.defaultWithoutId(); @@ -80,7 +85,7 @@ void mustSolveRegexFromContainerHostnameEnv(){ } @Test - void mustSolveFromContainerName(){ + void mustSolveFromContainerName() { // arrange final var inspect = InspectContainerResponseTemplates.build(); final var hostname = HostnameQuery.ofWildcard("laughing_swanson.docker"); @@ -96,7 +101,7 @@ void mustSolveFromContainerName(){ } @Test - void mustSolveFromServiceName(){ + void mustSolveFromServiceName() { // arrange final var inspect = InspectContainerResponseTemplates.build(); final var hostname = HostnameQuery.of("nginx-service.docker"); @@ -113,7 +118,7 @@ void mustSolveFromServiceName(){ @Test - void mustNOTSolveFromServiceNameWhenFeatureIsDisabled(){ + void mustNOTSolveFromServiceNameWhenFeatureIsDisabled() { // arrange final var inspect = InspectContainerResponseTemplates.build(); final var hostname = HostnameQuery.of("shibata.docker"); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DockerDAODefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DockerDAODefaultTest.java index 5274239d0..02d8d2d1e 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DockerDAODefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DockerDAODefaultTest.java @@ -1,14 +1,16 @@ package com.mageddo.dnsproxyserver.solver.docker.dataprovider; +import java.util.List; + import com.mageddo.net.IP; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import testing.templates.server.dns.solver.docker.NetworkTemplates; -import java.util.List; +import testing.templates.server.dns.solver.docker.NetworkTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -28,8 +30,8 @@ void mustSolveIpv6IP() { // arrange final var version = IP.Version.IPV6; doReturn(NetworkTemplates.withBridgeIpv4AndIpv6Network()) - .when(this.dockerDAO) - .findBestNetwork(eq(version)); + .when(this.dockerDAO) + .findBestNetwork(eq(version)); // act final var ip = this.dockerDAO.findHostMachineIp(version); @@ -46,13 +48,13 @@ void mustRespectPriorityOrder() { // arrange final var version = IP.Version.IPV6; final var networks = List.of( - NetworkTemplates.withOverlayIpv4AndIpv6Network(), - NetworkTemplates.withBridgeIpv4AndIpv6Network() + NetworkTemplates.withOverlayIpv4AndIpv6Network(), + NetworkTemplates.withBridgeIpv4AndIpv6Network() ); doReturn(networks) - .when(this.dockerDAO) - .findNetworks(); + .when(this.dockerDAO) + .findNetworks(); // act final var ip = this.dockerDAO.findHostMachineIp(version); @@ -69,13 +71,13 @@ void mustIgnoreNetworksWithoutIP() { // arrange final var version = IP.Version.IPV4; final var networks = List.of( - NetworkTemplates.withHostDriverWithoutIps(), - NetworkTemplates.withBridgeIpv4AndIpv6Network() + NetworkTemplates.withHostDriverWithoutIps(), + NetworkTemplates.withBridgeIpv4AndIpv6Network() ); doReturn(networks) - .when(this.dockerDAO) - .findNetworks(); + .when(this.dockerDAO) + .findNetworks(); // act final var ip = this.dockerDAO.findHostMachineIp(version); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerDAODefaultTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerDAODefaultTest.java index 354c2d806..fd365e7dd 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerDAODefaultTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerDAODefaultTest.java @@ -21,8 +21,8 @@ class DpsContainerDAODefaultTest { void mustCheckIsRunningInsideContainer() { // arrange doReturn(DPS_INSIDE_CONTAINER_YES) - .when(this.dpsContainerDAO) - .getDpsContainerEnvValue() + .when(this.dpsContainerDAO) + .getDpsContainerEnvValue() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerUtilsTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerUtilsTest.java index 64c0381b2..b9b1f8ca7 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerUtilsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/DpsContainerUtilsTest.java @@ -1,6 +1,5 @@ package com.mageddo.dnsproxyserver.solver.docker.dataprovider; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DpsContainerUtils; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -22,7 +21,8 @@ void mustParseWhenSingleHostname() { @Test void mustParseWhenMultipleHostnamesWithWhiteSpaces() { // arrange - final var envs = new String[]{"HOSTNAME=xxx", "HOSTNAMES=acme.com, mageddo.com , ahnegao.com.br"}; + final var envs = new String[]{"HOSTNAME=xxx", "HOSTNAMES=acme.com, mageddo.com , ahnegao.com" + + ".br"}; // act final var hostnames = DpsContainerUtils.findHostnamesFromEnv(envs); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerCompactMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerCompactMapperTest.java index b60122f4f..908452bc1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerCompactMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerCompactMapperTest.java @@ -1,7 +1,7 @@ package com.mageddo.dnsproxyserver.solver.docker.dataprovider.mapper; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.mapper.ContainerCompactMapper; import org.junit.jupiter.api.Test; + import testing.templates.docker.ContainerTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerMapperTest.java index dc8b96d5d..3a3c87741 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/ContainerMapperTest.java @@ -1,8 +1,9 @@ package com.mageddo.dnsproxyserver.solver.docker.dataprovider.mapper; -import com.mageddo.dnsproxyserver.solver.docker.dataprovider.mapper.ContainerMapper; import com.mageddo.net.IP; + import org.junit.jupiter.api.Test; + import testing.templates.docker.InspectContainerResponseTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -14,7 +15,7 @@ class ContainerMapperTest { @Test - void mustPutSpecifiedNetworkFirst(){ + void mustPutSpecifiedNetworkFirst() { // arrange final var inspect = InspectContainerResponseTemplates.withDpsLabel(); @@ -43,7 +44,7 @@ void mustMapBridgeNetwork() { } @Test - void mustMapOverlayNetwork(){ + void mustMapOverlayNetwork() { // arrange final var inspect = InspectContainerResponseTemplates.withCustomBridgeAndOverlayNetwork(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/NetworkMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/NetworkMapperTest.java index ebc43482e..7fcc0dd5c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/NetworkMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/dataprovider/mapper/NetworkMapperTest.java @@ -1,9 +1,11 @@ package com.mageddo.dnsproxyserver.solver.docker.dataprovider.mapper; import com.mageddo.dnsproxyserver.docker.domain.Drivers; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.docker.NetworkTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -34,7 +36,7 @@ void mustMapDockerNetworkInspectToNetworkDomainObject() { } @Test - void mustSolveIpv4AddressEvenWhenIpv6IsAvailable(){ + void mustSolveIpv4AddressEvenWhenIpv6IsAvailable() { // arrange final var network = buildBridgeIpv4AndIpv6Network(); @@ -48,7 +50,7 @@ void mustSolveIpv4AddressEvenWhenIpv6IsAvailable(){ } @Test - void mustLeadWhenNoIpv6IsReturned(){ + void mustLeadWhenNoIpv6IsReturned() { // arrange final var dockerNetwork = buildBridgeIpv4OnlyNetwork(); @@ -58,11 +60,13 @@ void mustLeadWhenNoIpv6IsReturned(){ // assert assertNotNull(network); - assertEquals("[172.21.0.1]", network.getGateways().toString()); + assertEquals("[172.21.0.1]", network.getGateways() + .toString() + ); } @Test - void mustLeadWhenNoIpamConfigIsAvailable(){ + void mustLeadWhenNoIpamConfigIsAvailable() { // arrange final var dockerNetwork = buildHostNetworkWithNoIpam(); @@ -73,7 +77,9 @@ void mustLeadWhenNoIpamConfigIsAvailable(){ // assert assertNotNull(network); assertFalse(network.hasAnyGateway()); - assertEquals("[]", network.getGateways().toString()); + assertEquals("[]", network.getGateways() + .toString() + ); } @@ -81,7 +87,7 @@ void mustLeadWhenNoIpamConfigIsAvailable(){ * see https://github.com/mageddo/dns-proxy-server/issues/481 */ @Test - void mustExtractIpWhenASubnetIsSetAtIpv6TheGatewayIp(){ + void mustExtractIpWhenASubnetIsSetAtIpv6TheGatewayIp() { // arrange final var dockerNetwork = NetworkTemplates.buildBridgeWithSubnetIPAtGatewayProp(); @@ -92,11 +98,13 @@ void mustExtractIpWhenASubnetIsSetAtIpv6TheGatewayIp(){ // assert assertNotNull(network); assertTrue(network.hasAnyGateway()); - assertEquals("[172.19.0.1, fddb:21e4:36d4:2:0:0:0:1]", network.getGateways().toString()); + assertEquals("[172.19.0.1, fddb:21e4:36d4:2:0:0:0:1]", network.getGateways() + .toString() + ); } @Test - void mustMapFromCustomNetworkWithoutGateway(){ + void mustMapFromCustomNetworkWithoutGateway() { // arrange final var dockerNetwork = NetworkTemplates.buildCustomIpv4NetworkWithoutGateway(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/entrypoint/EventListenerCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/entrypoint/EventListenerCompTest.java index c86a9c00d..f7beb19c1 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/docker/entrypoint/EventListenerCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/docker/entrypoint/EventListenerCompTest.java @@ -1,13 +1,16 @@ package com.mageddo.dnsproxyserver.solver.docker.entrypoint; +import java.util.Set; + +import javax.inject.Inject; + import com.mageddo.dnsproxyserver.di.Context; import com.mageddo.dnsproxyserver.di.StartupEvent; import com.mageddo.dnsproxyserver.di.StartupEvents; -import dagger.sheath.junit.DaggerTest; + import org.junit.jupiter.api.Test; -import javax.inject.Inject; -import java.util.Set; +import dagger.sheath.junit.DaggerTest; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -18,7 +21,7 @@ class EventListenerCompTest { Set events; @Test - void mustConfigureNetworkEventListener(){ + void mustConfigureNetworkEventListener() { // arrange diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/FailsafeCircuitBreakerFactoryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/FailsafeCircuitBreakerFactoryTest.java index 62ce0e31a..76e7d20d0 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/FailsafeCircuitBreakerFactoryTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/FailsafeCircuitBreakerFactoryTest.java @@ -1,22 +1,24 @@ package com.mageddo.dnsproxyserver.solver.remote.application; +import java.util.function.Supplier; + import com.mageddo.commons.circuitbreaker.CircuitCheckException; import com.mageddo.commons.concurrent.Threads; import com.mageddo.dnsproxyserver.solver.remote.Result; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegate; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegateStaticThresholdFailsafe; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.CircuitBreakerConfigTemplates; import testing.templates.InetSocketAddressTemplates; import testing.templates.solver.remote.ResultSupplierTemplates; -import java.util.function.Supplier; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.times; @@ -42,8 +44,11 @@ void mustNotFlushCacheWhenChangeStateToHalfOpen() { final var supError = ResultSupplierTemplates.alwaysFail(); final var supSuccess = ResultSupplierTemplates.alwaysSuccess(); - final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe(this.factory.build(addr, config)); - assertEquals("CLOSED", circuitBreaker.findStatus().toString()); + final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe( + this.factory.build(addr, config)); + assertEquals("CLOSED", circuitBreaker.findStatus() + .toString() + ); // act this.checkFailAndSleep(circuitBreaker, supError); @@ -53,8 +58,9 @@ void mustNotFlushCacheWhenChangeStateToHalfOpen() { // assert assertEquals( - "CLOSED", - circuitBreaker.findStatus().toString() + "CLOSED", + circuitBreaker.findStatus() + .toString() ); verify(this.onCacheMustBeFlushedEvent, times(2)).run(); @@ -64,8 +70,9 @@ void mustNotFlushCacheWhenChangeStateToHalfOpen() { void checkFailAndSleep(CircuitBreakerDelegate circuitBreaker, Supplier supError) { assertThrows(CircuitCheckException.class, () -> circuitBreaker.execute(supError)); assertEquals( - "OPEN", - circuitBreaker.findStatus().toString() + "OPEN", + circuitBreaker.findStatus() + .toString() ); verify(this.onCacheMustBeFlushedEvent).run(); Threads.sleep(100); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/RemoteResultSupplierTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/RemoteResultSupplierTest.java index 9145fd952..1ebd2d956 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/RemoteResultSupplierTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/RemoteResultSupplierTest.java @@ -1,17 +1,19 @@ package com.mageddo.dnsproxyserver.solver.remote.application; +import java.util.concurrent.CompletableFuture; + import com.mageddo.net.NetExecutorWatchdog; import com.mageddo.utils.Executors; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.MessageTemplates; import testing.templates.solver.remote.RequestTemplates; -import java.util.concurrent.CompletableFuture; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.mockito.ArgumentMatchers.any; @@ -39,12 +41,12 @@ void mustPingRemoteServerWhileQueryingWhenFeatureIsActive() { final var answer = MessageTemplates.buildAAnswer(query); doReturn(true) - .when(this.supplier) - .isPingWhileGettingQueryResponseActive(); + .when(this.supplier) + .isPingWhileGettingQueryResponseActive(); doReturn(CompletableFuture.completedFuture(answer)) - .when(this.supplier) - .sendQueryAsyncToResolver(any()); + .when(this.supplier) + .sendQueryAsyncToResolver(any()); // act final var res = this.supplier.get(); @@ -56,7 +58,7 @@ void mustPingRemoteServerWhileQueryingWhenFeatureIsActive() { } @Test - void pingRemoteServerWhileQueryingDisabledByDefault(){ + void pingRemoteServerWhileQueryingDisabledByDefault() { // act final var active = this.supplier.isPingWhileGettingQueryResponseActive(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/ResolverStatsFactoryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/ResolverStatsFactoryTest.java index fbb9bf4a3..19607db44 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/ResolverStatsFactoryTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/ResolverStatsFactoryTest.java @@ -1,18 +1,20 @@ package com.mageddo.dnsproxyserver.solver.remote.application; +import java.util.List; + import com.mageddo.dnsproxyserver.solver.RemoteResolvers; import com.mageddo.dnsproxyserver.solver.Resolver; import com.mageddo.dnsproxyserver.solver.SimpleResolver; import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import testing.templates.InetSocketAddressTemplates; -import java.util.List; +import testing.templates.InetSocketAddressTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.doReturn; @@ -31,7 +33,7 @@ class ResolverStatsFactoryTest { ResolverStatsFactory factory; @Test - void mustFindOnlyResolversValidToUse(){ + void mustFindOnlyResolversValidToUse() { // arrange final var server1 = new SimpleResolver(InetSocketAddressTemplates._8_8_8_8()); @@ -39,24 +41,24 @@ void mustFindOnlyResolversValidToUse(){ final var server3 = new SimpleResolver(InetSocketAddressTemplates._1_1_1_1()); doReturn(CircuitStatus.OPEN) - .when(this.circuitBreakerService) - .findCircuitStatus(server1.getAddress()); + .when(this.circuitBreakerService) + .findCircuitStatus(server1.getAddress()); doReturn(CircuitStatus.CLOSED) - .when(this.circuitBreakerService) - .findCircuitStatus(server2.getAddress()); + .when(this.circuitBreakerService) + .findCircuitStatus(server2.getAddress()); doReturn(List.of(server1, server2, server3)) - .when(this.remoteResolvers) - .resolvers() + .when(this.remoteResolvers) + .resolvers() ; // act final var resolvers = this.factory.findResolversWithNonOpenCircuit() - .stream() - .map(Resolver::getAddress) - .toList() - .toString(); + .stream() + .map(Resolver::getAddress) + .toList() + .toString(); // assert assertEquals("[/8.8.4.4:53, /1.1.1.1:53]", resolvers); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java index 07def9ad3..19e4469d9 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerFactoryTest.java @@ -3,13 +3,15 @@ import com.mageddo.dnsproxyserver.solver.remote.application.FailsafeCircuitBreakerFactory; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegateNonResilient; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.canaryratethreshold.CircuitBreakerDelegateSelfObservable; -import dev.failsafe.CircuitBreaker; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + +import dev.failsafe.CircuitBreaker; import testing.templates.CircuitBreakerConfigTemplates; import testing.templates.InetSocketAddressTemplates; import testing.templates.solver.remote.CircuitBreakerDelegateTemplates; @@ -34,16 +36,16 @@ class CircuitBreakerFactoryTest { FailsafeCircuitBreakerFactory failsafeCircuitBreakerFactory; @Test - void mustCreateANewCircuitBreakerInstanceWhenDifferentKeyIsUsed(){ + void mustCreateANewCircuitBreakerInstanceWhenDifferentKeyIsUsed() { // arrange doReturn(CircuitBreakerConfigTemplates.buildDefault()) - .when(this.factory) - .findCircuitBreakerConfig() + .when(this.factory) + .findCircuitBreakerConfig() ; doReturn(mock(CircuitBreaker.class)) - .when(this.failsafeCircuitBreakerFactory) - .build(any(), any()); + .when(this.failsafeCircuitBreakerFactory) + .build(any(), any()); // act final var a = this.factory.findCircuitBreaker(InetSocketAddressTemplates._8_8_8_8_addr()); @@ -55,18 +57,18 @@ void mustCreateANewCircuitBreakerInstanceWhenDifferentKeyIsUsed(){ } @Test - void mustReuseCircuitBreakerInstanceWhenSameKeyIsUsed(){ + void mustReuseCircuitBreakerInstanceWhenSameKeyIsUsed() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8_addr(); doReturn(CircuitBreakerConfigTemplates.buildDefault()) - .when(this.factory) - .findCircuitBreakerConfig() + .when(this.factory) + .findCircuitBreakerConfig() ; doReturn(mock(CircuitBreaker.class)) - .when(this.failsafeCircuitBreakerFactory) - .build(any(), any()); + .when(this.failsafeCircuitBreakerFactory) + .build(any(), any()); // act final var a = this.factory.findCircuitBreaker(addr); @@ -82,10 +84,11 @@ void mustReuseCircuitBreakerInstanceWhenSameKeyIsUsed(){ void mustCheckAllExistentCircuitsAndCountSuccessWhenSafeCheckReturnsTrue() { // arrange doReturn(CircuitBreakerConfigTemplates.buildDefault()) - .when(this.factory) - .findCircuitBreakerConfig() + .when(this.factory) + .findCircuitBreakerConfig() ; - doReturn(true).when(this.factory).circuitBreakerSafeCheck(any()); + doReturn(true).when(this.factory) + .circuitBreakerSafeCheck(any()); final var addr = InetSocketAddressTemplates._8_8_8_8_addr(); this.factory.findCircuitBreaker(addr); @@ -103,10 +106,11 @@ void mustCheckAllExistentCircuitsAndCountSuccessWhenSafeCheckReturnsTrue() { void mustCheckAndCountErrorWhenSafeCheckReturnsFalse() { // arrange doReturn(CircuitBreakerConfigTemplates.buildDefault()) - .when(this.factory) - .findCircuitBreakerConfig() + .when(this.factory) + .findCircuitBreakerConfig() ; - doReturn(false).when(this.factory).circuitBreakerSafeCheck(any()); + doReturn(false).when(this.factory) + .circuitBreakerSafeCheck(any()); final var addr = InetSocketAddressTemplates._8_8_8_8_addr(); this.factory.findCircuitBreaker(addr); @@ -120,13 +124,13 @@ void mustCheckAndCountErrorWhenSafeCheckReturnsFalse() { } @Test - void mustBuildNonResilientCircuitBreaker(){ + void mustBuildNonResilientCircuitBreaker() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8_addr(); doReturn(CircuitBreakerConfigTemplates.buildNonResilientConfig()) - .when(this.factory) - .findCircuitBreakerConfig(); + .when(this.factory) + .findCircuitBreakerConfig(); // act final var circuitBreaker = this.factory.findCircuitBreaker(addr); @@ -137,7 +141,7 @@ void mustBuildNonResilientCircuitBreaker(){ } @Test - void mustReturnNullWhenNoStatusIsFound(){ + void mustReturnNullWhenNoStatusIsFound() { final var addr = InetSocketAddressTemplates._8_8_8_8(); @@ -147,16 +151,16 @@ void mustReturnNullWhenNoStatusIsFound(){ } @Test - void mustBuildCanaryRateThresholdCircuitBreaker(){ + void mustBuildCanaryRateThresholdCircuitBreaker() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8(); doReturn(CircuitBreakerConfigTemplates.fastCanaryRateThreshold()) - .when(this.factory) - .findCircuitBreakerConfig(); + .when(this.factory) + .findCircuitBreakerConfig(); doReturn(CircuitBreakerDelegateTemplates.buildCanaryRateThreshold()) - .when(this.factory) - .buildCanaryRateThreshold(any(), any()); + .when(this.factory) + .buildCanaryRateThreshold(any(), any()); // act final var circuitBreaker = this.factory.findCircuitBreaker(addr); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java index 169da8b60..6c7582601 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/failsafe/CircuitBreakerPingCheckerServiceTest.java @@ -1,19 +1,21 @@ package com.mageddo.dnsproxyserver.solver.remote.application.failsafe; +import java.net.InetSocketAddress; + import com.mageddo.dnsproxyserver.solver.remote.Result; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.CircuitBreakerDelegateStaticThresholdFailsafe; import com.mageddo.net.SocketUtils; -import dev.failsafe.CircuitBreaker; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + +import dev.failsafe.CircuitBreaker; import testing.templates.InetSocketAddressTemplates; import testing.templates.solver.remote.FailSafeCircuitBreakerTemplates; -import java.net.InetSocketAddress; - import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; @@ -32,10 +34,13 @@ void mustReturnTrueWhenPingGetSuccess() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8(); final var circuitBreaker = FailSafeCircuitBreakerTemplates.buildDefault(); - doReturn(true).when(this.service).ping(any()); + doReturn(true).when(this.service) + .ping(any()); // act - final var ok = this.service.safeCheck(addr, new CircuitBreakerDelegateStaticThresholdFailsafe(circuitBreaker)); + final var ok = this.service.safeCheck(addr, + new CircuitBreakerDelegateStaticThresholdFailsafe(circuitBreaker) + ); // assert assertTrue(ok); @@ -45,8 +50,10 @@ void mustReturnTrueWhenPingGetSuccess() { void mustReturnFalseWhenPingReturnsFalse() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8(); - final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe(FailSafeCircuitBreakerTemplates.buildDefault()) ; - doReturn(false).when(this.service).ping(any()); + final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe( + FailSafeCircuitBreakerTemplates.buildDefault()); + doReturn(false).when(this.service) + .ping(any()); // act final var ok = this.service.safeCheck(addr, circuitBreaker); @@ -59,8 +66,10 @@ void mustReturnFalseWhenPingReturnsFalse() { void mustReturnFalseWhenThereIsAFatalException() { // arrange final var addr = InetSocketAddressTemplates._8_8_8_8(); - final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe(FailSafeCircuitBreakerTemplates.buildDefault()); - doThrow(new RuntimeException("unknown error")).when(this.service).ping(any()); + final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe( + FailSafeCircuitBreakerTemplates.buildDefault()); + doThrow(new RuntimeException("unknown error")).when(this.service) + .ping(any()); // act final var ok = this.service.safeCheck(addr, circuitBreaker); @@ -75,7 +84,9 @@ void mustPingSpecifiedPort() throws Exception { // arrange final var server = SocketUtils.createServerOnRandomPort(); final var address = (InetSocketAddress) server.getLocalSocketAddress(); - final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe(CircuitBreaker.builder().build()); + final var circuitBreaker = new CircuitBreakerDelegateStaticThresholdFailsafe( + CircuitBreaker.builder() + .build()); try (server) { // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/mapper/ResultMapperTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/mapper/ResultMapperTest.java index 579f254c8..587848159 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/mapper/ResultMapperTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/application/mapper/ResultMapperTest.java @@ -1,16 +1,18 @@ package com.mageddo.dnsproxyserver.solver.remote.application.mapper; +import java.net.SocketTimeoutException; +import java.util.concurrent.CompletableFuture; + import com.mageddo.dnsproxyserver.solver.Response; import com.mageddo.dnsproxyserver.solver.Responses; + import org.junit.jupiter.api.Test; import org.xbill.DNS.Flags; import org.xbill.DNS.Message; + import testing.templates.MessageTemplates; import testing.templates.solver.remote.RequestTemplates; -import java.net.SocketTimeoutException; -import java.util.concurrent.CompletableFuture; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -58,7 +60,8 @@ void mustCacheNxDomainQueryFor1Hour() { void mustReturnNullWhenGetTimeout() { // arrange - final CompletableFuture failedFuture = CompletableFuture.failedFuture(new SocketTimeoutException("Deu ruim")); + final CompletableFuture failedFuture = CompletableFuture.failedFuture( + new SocketTimeoutException("Deu ruim")); final var randomReq = RequestTemplates.buildDefault(); // act @@ -78,7 +81,7 @@ void mustReturnRaEvenWhenRemoteServerDoesntReturnsRA() { // act final var result = ResultMapper.from(future, RequestTemplates.buildDefault()) - .getSuccessResponse(); + .getSuccessResponse(); // assert assertTrue(Responses.hasFlag(result, Flags.RA)); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/CircuitBreakerDelegateStaticThresholdFailsafeTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/CircuitBreakerDelegateStaticThresholdFailsafeTest.java index e2fb5e748..2815fbb9d 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/CircuitBreakerDelegateStaticThresholdFailsafeTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/CircuitBreakerDelegateStaticThresholdFailsafeTest.java @@ -1,13 +1,15 @@ package com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application; +import java.util.function.Supplier; + import com.mageddo.commons.circuitbreaker.CircuitCheckException; import com.mageddo.commons.circuitbreaker.CircuitIsOpenException; import com.mageddo.dnsproxyserver.solver.remote.Result; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.function.Executable; -import testing.templates.solver.remote.FailSafeCircuitBreakerTemplates; -import java.util.function.Supplier; +import testing.templates.solver.remote.FailSafeCircuitBreakerTemplates; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -47,6 +49,7 @@ void mustOpenCircuitAfterThresholdFailures() { } static CircuitBreakerDelegateStaticThresholdFailsafe buildCircuitBreaker() { - return new CircuitBreakerDelegateStaticThresholdFailsafe(FailSafeCircuitBreakerTemplates.fastCircuit()); + return new CircuitBreakerDelegateStaticThresholdFailsafe( + FailSafeCircuitBreakerTemplates.fastCircuit()); } } diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/DpsCircuitBreakerWithManualHalfOpenTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/DpsCircuitBreakerWithManualHalfOpenTest.java index a01b80c87..ca7cad858 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/DpsCircuitBreakerWithManualHalfOpenTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/application/DpsCircuitBreakerWithManualHalfOpenTest.java @@ -1,9 +1,11 @@ package com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Result; + +import org.junit.jupiter.api.Test; + import io.github.resilience4j.circuitbreaker.CircuitBreaker; import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; import testing.templates.circuitbreaker.Resilience4jCircuitBreakerTemplates; import static com.mageddo.supporting.circuitbreaker.testing.sandbox.resilience4j.Resilience4jCircuitBreakerSandBox.testCircuitOnError; diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateCanaryRateThresholdTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateCanaryRateThresholdTest.java index e266d7c16..b3f404944 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateCanaryRateThresholdTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerDelegateCanaryRateThresholdTest.java @@ -1,18 +1,20 @@ package com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.canaryratethreshold; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Supplier; + import com.mageddo.commons.circuitbreaker.CircuitCheckException; import com.mageddo.commons.circuitbreaker.CircuitIsOpenException; import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus; import com.mageddo.dnsproxyserver.solver.remote.Result; -import io.github.resilience4j.circuitbreaker.CircuitBreaker; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; + +import io.github.resilience4j.circuitbreaker.CircuitBreaker; import testing.templates.circuitbreaker.Resilience4jCircuitBreakerTemplates; import testing.templates.solver.remote.ResultTemplates; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.function.Supplier; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; 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 43080cb24..563b31315 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 @@ -1,17 +1,18 @@ package com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.canaryratethreshold; +import java.time.Duration; + import com.mageddo.commons.concurrent.Threads; import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.application.HealthChecker; import com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.statetransitor.StateTransitor; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import java.time.Duration; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.doReturn; @@ -33,9 +34,9 @@ class CircuitBreakerDelegateSelfObservableTest { @BeforeEach void beforeEach() { this.strategy = spy(new CircuitBreakerDelegateSelfObservable( - this.delegate, - Duration.ofMillis(1000 / 30), - this.healthChecker + this.delegate, + Duration.ofMillis(1000 / 30), + this.healthChecker )); } @@ -55,18 +56,18 @@ void mustHalfOpenCircuitAfterConfiguredTimeAndSatisfyHealthCheck() { // arrange doReturn(CircuitStatus.OPEN) - .when(this.delegate) - .findStatus() + .when(this.delegate) + .findStatus() ; doReturn(true) - .when(this.healthChecker) - .isHealthy() + .when(this.healthChecker) + .isHealthy() ; final var stateTransitor = mock(StateTransitor.class); doReturn(stateTransitor) - .when(this.delegate) - .stateTransitor(); + .when(this.delegate) + .stateTransitor(); // act Threads.sleep(1000); @@ -80,8 +81,8 @@ void mustHalfOpenCircuitAfterConfiguredTimeAndSatisfyHealthCheck() { void mustNotHalfOpenCircuitAfterHealthCheckRunAndGetNoSuccess() { // arrange doReturn(CircuitStatus.OPEN) - .when(this.delegate) - .findStatus() + .when(this.delegate) + .findStatus() ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerFactoryCompTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerFactoryCompTest.java index a9fdffce7..39663efaf 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerFactoryCompTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/remote/circuitbreaker/canaryratethreshold/CircuitBreakerFactoryCompTest.java @@ -1,19 +1,22 @@ package com.mageddo.dnsproxyserver.solver.remote.circuitbreaker.canaryratethreshold; +import java.time.Duration; + +import javax.inject.Inject; + import com.mageddo.commons.circuitbreaker.CircuitIsOpenException; import com.mageddo.commons.concurrent.Threads; import com.mageddo.dnsproxyserver.config.CanaryRateThresholdCircuitBreakerStrategyConfig; import com.mageddo.dnsproxyserver.solver.remote.CircuitStatus; -import dagger.sheath.junit.DaggerTest; + import org.junit.jupiter.api.Test; + +import dagger.sheath.junit.DaggerTest; import testing.ContextSupplier; import testing.Events; import testing.templates.CircuitBreakerConfigTemplates; import testing.templates.solver.remote.ResultSupplierTemplates; -import javax.inject.Inject; -import java.time.Duration; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/AddressExpressionsTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/AddressExpressionsTest.java index 59e351f55..c4629da5e 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/AddressExpressionsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/AddressExpressionsTest.java @@ -2,6 +2,7 @@ import com.mageddo.dnsproxyserver.solver.stub.addressexpression.AddressExpressions; import com.mageddo.net.IP; + import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/HostnameIpExtractorTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/HostnameIpExtractorTest.java index db178cf21..f69d7f8bb 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/HostnameIpExtractorTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/HostnameIpExtractorTest.java @@ -1,8 +1,10 @@ package com.mageddo.dnsproxyserver.solver.stub; import com.mageddo.net.IP; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; + import testing.templates.HostnameTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,7 +25,9 @@ void mustExtractIpv4IpFromHostnameStartingWithNameUsingDotDecimalNotation() { } @Test - @DisplayName("Must extract ipv4 from hostname starting with name, separated by dash, using dot-decimal notation") + @DisplayName( + "Must extract ipv4 from hostname starting with name, separated by dash, using dot-decimal " + + "notation") void mustExtractIpv4IpFromHostnameStartingWithNameSeparatedByDashUsingDotDecimalNotation() { final var hostname = HostnameTemplates.startingWithNameDashSeparationDotDecimalNotation(); diff --git a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/SolverStubTest.java b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/SolverStubTest.java index 709452b05..d486cf58c 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/solver/stub/SolverStubTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/solver/stub/SolverStubTest.java @@ -1,12 +1,14 @@ package com.mageddo.dnsproxyserver.solver.stub; import com.mageddo.dns.utils.Messages; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; import org.xbill.DNS.Rcode; + import testing.templates.MessageTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -23,13 +25,13 @@ class SolverStubTest { @BeforeEach void beforeEach() { lenient() - .doReturn("stub") - .when(this.solver) - .findDomainName(); + .doReturn("stub") + .when(this.solver) + .findDomainName(); } @Test - void mustValidateNonSupportedQuestionType(){ + void mustValidateNonSupportedQuestionType() { final var query = MessageTemplates.acmeSoaQuery(); final var response = this.solver.handle(query); @@ -38,7 +40,7 @@ void mustValidateNonSupportedQuestionType(){ } @Test - void mustValidateIncompatibleDomainName(){ + void mustValidateIncompatibleDomainName() { final var query = MessageTemplates.acmeAQuery(); final var response = this.solver.handle(query); @@ -47,7 +49,7 @@ void mustValidateIncompatibleDomainName(){ } @Test - void mustFindRightIpAddress(){ + void mustFindRightIpAddress() { final var query = MessageTemplates.dpsStubAQuery(); final var response = this.solver.handle(query); @@ -57,7 +59,7 @@ void mustFindRightIpAddress(){ } @Test - void willIgnoreHostnameWithRightDomainButNotEmbeddedIp(){ + void willIgnoreHostnameWithRightDomainButNotEmbeddedIp() { final var query = MessageTemplates.stubAQueryWithoutIp(); final var response = this.solver.handle(query); @@ -66,7 +68,7 @@ void willIgnoreHostnameWithRightDomainButNotEmbeddedIp(){ } @Test - void mustAnswerNxWhenQueryTypeIsNotEqualsToIpVersion(){ + void mustAnswerNxWhenQueryTypeIsNotEqualsToIpVersion() { final var query = MessageTemplates.stubAQueryWithIpv6AnswerIp(); final var response = this.solver.handle(query); diff --git a/src/test/java/com/mageddo/dnsproxyserver/systemd/ResolvedServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/systemd/ResolvedServiceTest.java index 04b74d8ae..0360fa053 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/systemd/ResolvedServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/systemd/ResolvedServiceTest.java @@ -10,13 +10,13 @@ class ResolvedServiceTest { @BeforeEach - void beforeEach(){ + void beforeEach() { assumeTrue(OS.isFamilyUnix() && !OS.isFamilyMac()); } @Test @Disabled - void mustRestartResolved(){ + void mustRestartResolved() { // arrange diff --git a/src/test/java/com/mageddo/dnsproxyserver/usecase/HostMachineServiceTest.java b/src/test/java/com/mageddo/dnsproxyserver/usecase/HostMachineServiceTest.java index 014e41497..f25ea9fe8 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/usecase/HostMachineServiceTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/usecase/HostMachineServiceTest.java @@ -1,12 +1,14 @@ package com.mageddo.dnsproxyserver.usecase; import com.mageddo.dnsproxyserver.solver.docker.dataprovider.DockerDAO; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.IpTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,14 +29,14 @@ class HostMachineServiceTest { void mustReturnHostIP() { // arrange doReturn(false) - .when(this.machineService) - .isDpsRunningInsideContainer() + .when(this.machineService) + .isDpsRunningInsideContainer() ; final var expectedIp = IpTemplates.local(); doReturn(expectedIp) - .when(this.machineService) - .findCurrentMachineIp(any()) + .when(this.machineService) + .findCurrentMachineIp(any()) ; // act @@ -48,14 +50,14 @@ void mustReturnHostIP() { void mustReturnHostIPEvenWhenRunningInsideDockerContainer() { // arrange doReturn(true) - .when(this.machineService) - .isDpsRunningInsideContainer() + .when(this.machineService) + .isDpsRunningInsideContainer() ; final var expectedIp = IpTemplates.local(); doReturn(expectedIp) - .when(this.dockerDAO) - .findHostMachineIp(any()) + .when(this.dockerDAO) + .findHostMachineIp(any()) ; // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/utils/EnvsTest.java b/src/test/java/com/mageddo/dnsproxyserver/utils/EnvsTest.java index 49e666e28..cb2db4e8a 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/utils/EnvsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/utils/EnvsTest.java @@ -3,12 +3,14 @@ import org.junit.jupiter.api.Test; import static com.mageddo.dnsproxyserver.utils.Envs.parseBoolean; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; class EnvsTest { @Test - void mustParseAsTrue(){ + void mustParseAsTrue() { // arrange // act @@ -20,7 +22,7 @@ void mustParseAsTrue(){ } @Test - void mustParseAsFalse(){ + void mustParseAsFalse() { // arrange // act @@ -33,7 +35,7 @@ void mustParseAsFalse(){ } @Test - void mustParseAsNull(){ + void mustParseAsNull() { // arrange // act diff --git a/src/test/java/com/mageddo/dnsproxyserver/utils/IpsTest.java b/src/test/java/com/mageddo/dnsproxyserver/utils/IpsTest.java index 8748ea557..7739e1c66 100644 --- a/src/test/java/com/mageddo/dnsproxyserver/utils/IpsTest.java +++ b/src/test/java/com/mageddo/dnsproxyserver/utils/IpsTest.java @@ -2,16 +2,17 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; class IpsTest { @Test - void mustBeIpv4(){ + void mustBeIpv4() { assertTrue(Ips.isIpv4("192.168.1.1")); } @Test - void mustNotBeIpv4(){ + void mustNotBeIpv4() { assertFalse(Ips.isIpv4("a.a.a.a")); } } diff --git a/src/test/java/com/mageddo/dnsserver/DnsQueryTCPHandlerTest.java b/src/test/java/com/mageddo/dnsserver/DnsQueryTCPHandlerTest.java index 3a5717a08..01ae7e510 100644 --- a/src/test/java/com/mageddo/dnsserver/DnsQueryTCPHandlerTest.java +++ b/src/test/java/com/mageddo/dnsserver/DnsQueryTCPHandlerTest.java @@ -1,13 +1,5 @@ package com.mageddo.dnsserver; -import com.mageddo.commons.concurrent.ThreadPool; -import com.mageddo.commons.concurrent.Threads; -import com.mageddo.utils.Shorts; -import org.apache.commons.io.IOUtils; -import org.junit.jupiter.api.Test; -import testing.templates.MessageTemplates; -import testing.templates.SocketClientTemplates; - import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -17,6 +9,16 @@ import java.util.Arrays; import java.util.concurrent.TimeUnit; +import com.mageddo.commons.concurrent.ThreadPool; +import com.mageddo.commons.concurrent.Threads; +import com.mageddo.utils.Shorts; + +import org.apache.commons.io.IOUtils; +import org.junit.jupiter.api.Test; + +import testing.templates.MessageTemplates; +import testing.templates.SocketClientTemplates; + import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -37,23 +39,23 @@ void mustReadEntireMessageBeforeHandleIt() throws Exception { final var queryOut = new PipedOutputStream(in); ThreadPool - .scheduled() - .schedule( - () -> { + .scheduled() + .schedule( + () -> { - writeMsgHeaderSlowly(queryOut, (short) querySize); + writeMsgHeaderSlowly(queryOut, (short) querySize); - final var data = query.toWire(); - writeQueryMsgSlowly(queryOut, data); + final var data = query.toWire(); + writeQueryMsgSlowly(queryOut, data); - // wait some time before "timeout" - Threads.sleep(50); - IOUtils.closeQuietly(queryOut); + // wait some time before "timeout" + Threads.sleep(50); + IOUtils.closeQuietly(queryOut); - }, - 50, - TimeUnit.MILLISECONDS - ); + }, + 50, + TimeUnit.MILLISECONDS + ); final var client = SocketClientTemplates.buildWith(in, out); @@ -65,9 +67,9 @@ void mustReadEntireMessageBeforeHandleIt() throws Exception { assertEquals(querySize, actualSize); assertEquals(querySize, Shorts.fromBytes(out.toByteArray(), 0)); assertArrayEquals( - query.toWire(), - Arrays.copyOfRange(out.toByteArray(), 2, out.size()), - String.format("%s <> %s", query, out) + query.toWire(), + Arrays.copyOfRange(out.toByteArray(), 2, out.size()), + String.format("%s <> %s", query, out) ); } diff --git a/src/test/java/com/mageddo/http/PathTest.java b/src/test/java/com/mageddo/http/PathTest.java index 051e2f7c4..6610cd8ae 100644 --- a/src/test/java/com/mageddo/http/PathTest.java +++ b/src/test/java/com/mageddo/http/PathTest.java @@ -2,12 +2,12 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; class PathTest { @Test - void mustBuildPathFromSubdirs(){ + void mustBuildPathFromSubdirs() { // arrange // ct @@ -18,7 +18,7 @@ void mustBuildPathFromSubdirs(){ } @Test - void mustBuildPathFromOnlyRootDir(){ + void mustBuildPathFromOnlyRootDir() { // arrange // ct @@ -29,7 +29,7 @@ void mustBuildPathFromOnlyRootDir(){ } @Test - void pathWithFile(){ + void pathWithFile() { // arrange // ct diff --git a/src/test/java/com/mageddo/http/WebServerCompTest.java b/src/test/java/com/mageddo/http/WebServerCompTest.java index 1469bb7b1..f0a17d662 100644 --- a/src/test/java/com/mageddo/http/WebServerCompTest.java +++ b/src/test/java/com/mageddo/http/WebServerCompTest.java @@ -1,6 +1,7 @@ package com.mageddo.http; import com.mageddo.http.codec.Encoders; + import org.junit.jupiter.api.Test; import static io.restassured.RestAssured.given; @@ -23,16 +24,16 @@ void mustHandleConfiguredMapper() throws Exception { // act final var response = given() - .port(PORT) - .get("/hello-world") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.OK) - .body(equalTo(body)) + .statusCode(HttpStatus.OK) + .body(equalTo(body)) ; } } @@ -40,23 +41,24 @@ void mustHandleConfiguredMapper() throws Exception { @Test void mustFallbackToNotFoundPage() throws Exception { // arrange - final var theServer = new WebServer(server -> {}); + final var theServer = new WebServer(server -> { + }); try (theServer) { theServer.start(PORT); // act final var response = given() - .port(PORT) - .get("/hello-world") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.NOT_FOUND) - .body(equalTo(WebServer.DEFAULT_RES_BODY)) + .statusCode(HttpStatus.NOT_FOUND) + .body(equalTo(WebServer.DEFAULT_RES_BODY)) ; } } @@ -74,16 +76,16 @@ void mustSolveWildCardPath() throws Exception { // act final var response = given() - .port(PORT) - .get("/hello-world/pateta") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world/pateta") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.OK) - .body(equalTo(body)) + .statusCode(HttpStatus.OK) + .body(equalTo(body)) ; } } @@ -101,16 +103,16 @@ void mustSolveFromMostGenericWildCardPath() throws Exception { // act final var response = given() - .port(PORT) - .get("/hello-world/pateta") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world/pateta") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.OK) - .body(equalTo("Root Path")) + .statusCode(HttpStatus.OK) + .body(equalTo("Root Path")) ; } } @@ -128,16 +130,16 @@ void mustNotMatch() throws Exception { // act final var response = given() - .port(PORT) - .get("/hello-world/pateta.css") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world/pateta.css") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.NOT_FOUND) - .body(equalTo(WebServer.DEFAULT_RES_BODY)) + .statusCode(HttpStatus.NOT_FOUND) + .body(equalTo(WebServer.DEFAULT_RES_BODY)) ; } } @@ -156,16 +158,16 @@ void mustSolveExactPath() throws Exception { // act final var response = given() - .port(PORT) - .get("/hello-world") - .then() - .log() - .ifValidationFails(); + .port(PORT) + .get("/hello-world") + .then() + .log() + .ifValidationFails(); // assert response - .statusCode(HttpStatus.OK) - .body(equalTo(resBody)) + .statusCode(HttpStatus.OK) + .body(equalTo(resBody)) ; } } diff --git a/src/test/java/com/mageddo/net/IPTest.java b/src/test/java/com/mageddo/net/IPTest.java index ca527310c..6c594cf33 100644 --- a/src/test/java/com/mageddo/net/IPTest.java +++ b/src/test/java/com/mageddo/net/IPTest.java @@ -1,14 +1,15 @@ package com.mageddo.net; -import testing.templates.IpTemplates; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import testing.templates.IpTemplates; + +import static org.junit.jupiter.api.Assertions.assertEquals; class IPTest { @Test - void mustBuildIpFromString(){ + void mustBuildIpFromString() { // arrange final var ipStr = IpTemplates.LOCAL; diff --git a/src/test/java/com/mageddo/net/IpAddrTest.java b/src/test/java/com/mageddo/net/IpAddrTest.java index 12bc26bf0..ec49ded04 100644 --- a/src/test/java/com/mageddo/net/IpAddrTest.java +++ b/src/test/java/com/mageddo/net/IpAddrTest.java @@ -1,8 +1,9 @@ package com.mageddo.net; -import testing.templates.IpAddrTemplates; import org.junit.jupiter.api.Test; +import testing.templates.IpAddrTemplates; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -12,7 +13,7 @@ class IpAddrTest { @Test - void mustParseIpv4AddrWithoutPort(){ + void mustParseIpv4AddrWithoutPort() { // arrange final var str = IpAddrTemplates.LOCAL; @@ -22,13 +23,15 @@ void mustParseIpv4AddrWithoutPort(){ // assert assertNotNull(addr); - assertEquals(str, addr.getIp().toText()); + assertEquals(str, addr.getIp() + .toText() + ); assertNull(addr.getPort()); } @Test - void mustParseIpv4AddrWithPort(){ + void mustParseIpv4AddrWithPort() { // arrange final var str = IpAddrTemplates.LOCAL_54; @@ -38,13 +41,15 @@ void mustParseIpv4AddrWithPort(){ // assert assertNotNull(addr); - assertEquals(IpAddrTemplates.LOCAL, addr.getIp().toText()); + assertEquals(IpAddrTemplates.LOCAL, addr.getIp() + .toText() + ); assertEquals(IpAddrTemplates.PORT_54, addr.getPort()); } @Test - void mustParseIpv6AddrWithPort(){ + void mustParseIpv6AddrWithPort() { // arrange final var str = IpAddrTemplates.LOCAL_IPV6_54; @@ -54,13 +59,15 @@ void mustParseIpv6AddrWithPort(){ // assert assertNotNull(addr); - assertEquals(IpAddrTemplates.LOCAL_IPV6, addr.getIp().toText()); + assertEquals(IpAddrTemplates.LOCAL_IPV6, addr.getIp() + .toText() + ); assertEquals(IpAddrTemplates.PORT_54, addr.getPort()); } @Test - void mustParseIpv6AddrWithoutPort(){ + void mustParseIpv6AddrWithoutPort() { // arrange final var str = IpAddrTemplates.LOCAL_IPV6; @@ -70,13 +77,15 @@ void mustParseIpv6AddrWithoutPort(){ // assert assertNotNull(addr); - assertEquals(str, addr.getIp().toText()); + assertEquals(str, addr.getIp() + .toText() + ); assertNull(addr.getPort()); } @Test - void mustLeadWithNullIp(){ + void mustLeadWithNullIp() { // arrange final String str = null; @@ -91,18 +100,21 @@ void mustLeadWithNullIp(){ @Test - void mustFailureWithInvalidValue(){ + void mustFailureWithInvalidValue() { // arrange final String str = "a"; // act final var ex = assertThrows(RuntimeException.class, () -> { - IpAddr.of(str); - }); + IpAddr.of(str); + } + ); // assert - assertTrue(ex.getMessage().contains("valid IP"), ex.getMessage()); + assertTrue(ex.getMessage() + .contains("valid IP"), ex.getMessage() + ); } } diff --git a/src/test/java/com/mageddo/net/NetExecutorWatchdogTest.java b/src/test/java/com/mageddo/net/NetExecutorWatchdogTest.java index de55d3ee8..ae29c48eb 100644 --- a/src/test/java/com/mageddo/net/NetExecutorWatchdogTest.java +++ b/src/test/java/com/mageddo/net/NetExecutorWatchdogTest.java @@ -1,13 +1,14 @@ package com.mageddo.net; +import java.util.concurrent.CompletableFuture; + import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; -import testing.templates.IpAddrTemplates; -import java.util.concurrent.CompletableFuture; +import testing.templates.IpAddrTemplates; @ExtendWith(MockitoExtension.class) class NetExecutorWatchdogTest { @@ -17,7 +18,7 @@ class NetExecutorWatchdogTest { NetExecutorWatchdog watchdog; @Test - void mustCancelPingWhenFutureGetsDoneFirst(){ + void mustCancelPingWhenFutureGetsDoneFirst() { // arrange final var ip = IpAddrTemplates.unknown(); final var future = CompletableFuture.completedFuture(new Object()); diff --git a/src/test/java/com/mageddo/net/NetworksTest.java b/src/test/java/com/mageddo/net/NetworksTest.java index 6c17462e8..16cc2171b 100644 --- a/src/test/java/com/mageddo/net/NetworksTest.java +++ b/src/test/java/com/mageddo/net/NetworksTest.java @@ -1,5 +1,7 @@ package com.mageddo.net; +import java.net.InetSocketAddress; + import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -7,11 +9,10 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Spy; import org.mockito.junit.jupiter.MockitoExtension; + import testing.templates.IpTemplates; import testing.templates.NetworkInterfaceTemplates; -import java.net.InetSocketAddress; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -58,7 +59,8 @@ void mustContainsLocalhostAddress() { // arrange // act - final var ips = Networks.findMachineIps().toString(); + final var ips = Networks.findMachineIps() + .toString(); // assert assertTrue(ips.contains("127"), ips); @@ -68,7 +70,8 @@ void mustContainsLocalhostAddress() { void mustPreferNonLoopbackAddresses() { // arrange doReturn(NetworkInterfaceTemplates.localAndLoopback()) - .when(this.network).findNetworkInterfaces(); + .when(this.network) + .findNetworkInterfaces(); // act final var ip = Networks.findCurrentMachineIP(); diff --git a/src/test/java/com/mageddo/net/osx/NetworksTest.java b/src/test/java/com/mageddo/net/osx/NetworksTest.java index d48f6ab6c..3f40a412f 100644 --- a/src/test/java/com/mageddo/net/osx/NetworksTest.java +++ b/src/test/java/com/mageddo/net/osx/NetworksTest.java @@ -10,12 +10,12 @@ class NetworksTest { @BeforeAll - static void beforeAll(){ + static void beforeAll() { assumeTrue(OS.isFamilyMac()); } @Test - void mustListNetworks(){ + void mustListNetworks() { // arrange // act diff --git a/src/test/java/com/mageddo/net/windows/registry/NetworkRegistryTest.java b/src/test/java/com/mageddo/net/windows/registry/NetworkRegistryTest.java index 522179051..0cbca47d7 100644 --- a/src/test/java/com/mageddo/net/windows/registry/NetworkRegistryTest.java +++ b/src/test/java/com/mageddo/net/windows/registry/NetworkRegistryTest.java @@ -1,14 +1,15 @@ package com.mageddo.net.windows.registry; +import java.util.Collections; + import com.mageddo.jna.net.windows.registry.NetworkRegistry; import com.mageddo.os.Platform; import com.sun.jna.platform.win32.Win32Exception; import com.sun.jna.platform.win32.WinError; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import java.util.Collections; - import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -31,7 +32,9 @@ void mustInterfacesWithIp() { // assert assertFalse(ids.isEmpty()); - final var first = ids.stream().findFirst().get(); + final var first = ids.stream() + .findFirst() + .get(); assertTrue(first.startsWith("{") && first.endsWith("}"), first); } @@ -40,13 +43,15 @@ void mustInterfacesWithIp() { void mustFindInterfaceAndFailOnChangeDnsDuePermission() { // arrange final var nid = NetworkRegistry.findNetworksWithIpIds() - .stream() - .findFirst() - .get(); + .stream() + .findFirst() + .get(); final var expectedConfiguredDns = Collections.singletonList("8.8.8.8"); // act - final var ex = assertThrows(Win32Exception.class, () -> NetworkRegistry.updateDnsServer(nid, expectedConfiguredDns)); + final var ex = assertThrows(Win32Exception.class, + () -> NetworkRegistry.updateDnsServer(nid, expectedConfiguredDns) + ); // arrange assertEquals(WinError.ERROR_ACCESS_DENIED, ex.getErrorCode()); diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/FailSafeCircuitBreakerSandBox.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/FailSafeCircuitBreakerSandBox.java index 1dec37c9f..5fcf34334 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/FailSafeCircuitBreakerSandBox.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/FailSafeCircuitBreakerSandBox.java @@ -1,16 +1,17 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.failsafe; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.time.LocalDateTime; + import com.mageddo.supporting.circuitbreaker.testing.sandbox.AbstractCircuitBreakerSandBox; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Result; import com.mageddo.supporting.circuitbreaker.testing.sandbox.State; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Stats; + import dev.failsafe.CircuitBreaker; import dev.failsafe.Failsafe; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.time.LocalDateTime; - public class FailSafeCircuitBreakerSandBox extends AbstractCircuitBreakerSandBox { @@ -26,7 +27,7 @@ protected State getCircuitBreakerState() { } @Override - public Result calcStats(Stats stats, Runnable r) { + public Result calcStats(Stats stats, Runnable r) { return StatsCalculator.calcStats(stats, r); } @@ -49,7 +50,8 @@ public static String runError(CircuitBreaker breaker) { public static String runSuccess(CircuitBreaker breaker) { return Failsafe.with(breaker) - .get(() -> LocalDateTime.now().toString()); + .get(() -> LocalDateTime.now() + .toString()); } public static void testCircuitOnError( diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StateMapper.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StateMapper.java index c3bd8b1f9..c619657eb 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StateMapper.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StateMapper.java @@ -1,6 +1,7 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.failsafe; import com.mageddo.supporting.circuitbreaker.testing.sandbox.State; + import dev.failsafe.CircuitBreaker; public class StateMapper { diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StatsCalculator.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StatsCalculator.java index b73072a02..77786b451 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StatsCalculator.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/failsafe/StatsCalculator.java @@ -1,10 +1,11 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.failsafe; +import java.io.UncheckedIOException; + import com.mageddo.supporting.circuitbreaker.testing.sandbox.Result; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Stats; -import dev.failsafe.CircuitBreakerOpenException; -import java.io.UncheckedIOException; +import dev.failsafe.CircuitBreakerOpenException; public class StatsCalculator { public static Result calcStats(Stats stats, Runnable r) { diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/Resilience4jCircuitBreakerSandBox.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/Resilience4jCircuitBreakerSandBox.java index 9994dc8bd..ff35e79ec 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/Resilience4jCircuitBreakerSandBox.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/Resilience4jCircuitBreakerSandBox.java @@ -1,14 +1,15 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.resilience4j; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.time.LocalDateTime; + +import com.mageddo.supporting.circuitbreaker.testing.sandbox.AbstractCircuitBreakerSandBox; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Result; import com.mageddo.supporting.circuitbreaker.testing.sandbox.State; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Stats; -import com.mageddo.supporting.circuitbreaker.testing.sandbox.AbstractCircuitBreakerSandBox; -import io.github.resilience4j.circuitbreaker.CircuitBreaker; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.time.LocalDateTime; +import io.github.resilience4j.circuitbreaker.CircuitBreaker; public class Resilience4jCircuitBreakerSandBox extends AbstractCircuitBreakerSandBox { @@ -24,7 +25,7 @@ protected State getCircuitBreakerState() { } @Override - public Result calcStats(Stats stats, Runnable r) { + public Result calcStats(Stats stats, Runnable r) { return StatsCalculator.calcStats(stats, r); } @@ -45,7 +46,8 @@ public static String runError(CircuitBreaker breaker) { } public static String runSuccess(CircuitBreaker breaker) { - return breaker.executeSupplier(() -> LocalDateTime.now().toString()); + return breaker.executeSupplier(() -> LocalDateTime.now() + .toString()); } public static void testCircuitOnError( diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StateMapper.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StateMapper.java index 28e3ecae2..a7e4ab72e 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StateMapper.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StateMapper.java @@ -1,6 +1,7 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.resilience4j; import com.mageddo.supporting.circuitbreaker.testing.sandbox.State; + import io.github.resilience4j.circuitbreaker.CircuitBreaker; public class StateMapper { diff --git a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StatsCalculator.java b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StatsCalculator.java index b80488896..034857659 100644 --- a/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StatsCalculator.java +++ b/src/test/java/com/mageddo/supporting/circuitbreaker/testing/sandbox/resilience4j/StatsCalculator.java @@ -1,10 +1,11 @@ package com.mageddo.supporting.circuitbreaker.testing.sandbox.resilience4j; +import java.io.UncheckedIOException; + import com.mageddo.supporting.circuitbreaker.testing.sandbox.Result; import com.mageddo.supporting.circuitbreaker.testing.sandbox.Stats; -import io.github.resilience4j.circuitbreaker.CallNotPermittedException; -import java.io.UncheckedIOException; +import io.github.resilience4j.circuitbreaker.CallNotPermittedException; public class StatsCalculator { public static Result calcStats(Stats stats, Runnable r) { diff --git a/src/test/java/com/mageddo/utils/Assertions.java b/src/test/java/com/mageddo/utils/Assertions.java index 5ba12036f..aab266f03 100644 --- a/src/test/java/com/mageddo/utils/Assertions.java +++ b/src/test/java/com/mageddo/utils/Assertions.java @@ -7,6 +7,7 @@ public class Assertions { public static void validResponse(Message m) { - assertTrue(m.getHeader().getFlag(Flags.QR)); + assertTrue(m.getHeader() + .getFlag(Flags.QR)); } } diff --git a/src/test/java/com/mageddo/utils/ExecutorsTest.java b/src/test/java/com/mageddo/utils/ExecutorsTest.java index 24f0b29e2..79ba185f5 100644 --- a/src/test/java/com/mageddo/utils/ExecutorsTest.java +++ b/src/test/java/com/mageddo/utils/ExecutorsTest.java @@ -1,8 +1,9 @@ package com.mageddo.utils; -import lombok.SneakyThrows; import org.junit.jupiter.api.Test; +import lombok.SneakyThrows; + import static org.junit.jupiter.api.Assertions.assertTrue; class ExecutorsTest { @@ -13,7 +14,9 @@ void virtualThreadsActiveByDefault() { // arrange try (final var executor = Executors.newThreadExecutor()) { // act - final var isVirtual = executor.submit(() -> Thread.currentThread().isVirtual()).get(); + final var isVirtual = executor.submit(() -> Thread.currentThread() + .isVirtual()) + .get(); // assert assertTrue(isVirtual); diff --git a/src/test/java/com/mageddo/utils/TestUtils.java b/src/test/java/com/mageddo/utils/TestUtils.java index 4ca237dd8..1d614d2c2 100644 --- a/src/test/java/com/mageddo/utils/TestUtils.java +++ b/src/test/java/com/mageddo/utils/TestUtils.java @@ -1,5 +1,12 @@ package com.mageddo.utils; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Iterator; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.MapperFeature; @@ -9,19 +16,14 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.mageddo.json.JsonUtils; -import lombok.SneakyThrows; -import lombok.experimental.UtilityClass; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.mockito.Mockito; import org.mockito.internal.util.MockUtil; -import java.io.InputStream; -import java.lang.reflect.Field; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Iterator; +import lombok.SneakyThrows; +import lombok.experimental.UtilityClass; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -29,10 +31,10 @@ public class TestUtils { public static final ObjectMapper objectMapper = JsonMapper.builder() - .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY) - .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS) - .enable(SerializationFeature.INDENT_OUTPUT) - .build(); + .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY) + .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS) + .enable(SerializationFeature.INDENT_OUTPUT) + .build(); @SneakyThrows public static String readString(String path) { @@ -57,7 +59,8 @@ public static String readAndSortJsonExcluding(Object o, String... excludingField @SneakyThrows public static String readSortDonWriteNullsAndExcludeFields(Object o, String... excludingFields) { final var om = dontWriteNonNullObjectMapper(); - final var excludedFields = om.readTree(sortJsonExcluding(om.writeValueAsString(o), excludingFields)); + final var excludedFields = om.readTree( + sortJsonExcluding(om.writeValueAsString(o), excludingFields)); final var excludedNullFields = om.writeValueAsString(excludedFields); return sortJson(excludedNullFields); } @@ -70,7 +73,8 @@ public static String readSortDonWriteNullsAndExcludeFields(Path path, String... } @SneakyThrows - public static String readSortDonWriteNullsAndExcludeFields(String path, String... excludingFields) { + public static String readSortDonWriteNullsAndExcludeFields(String path, + String... excludingFields) { final var om = dontWriteNonNullObjectMapper(); return sortJson(om.readTree(sortJsonExcluding(readString(path), excludingFields))); } @@ -87,16 +91,17 @@ public static String sortJson(Object o) { @SneakyThrows public static String sortJson(String json) { - return objectMapper.writeValueAsString(objectMapper.treeToValue(objectMapper.readTree(json), Object.class)); + return objectMapper.writeValueAsString( + objectMapper.treeToValue(objectMapper.readTree(json), Object.class)); } @SneakyThrows - public static String sortJsonExcluding(Object o, String ... excludingFields) { + public static String sortJsonExcluding(Object o, String... excludingFields) { return sortJsonExcluding(JsonUtils.writeValueAsString(o), excludingFields); } @SneakyThrows - public static String sortJsonExcluding(String json, String ... excludingFields) { + public static String sortJsonExcluding(String json, String... excludingFields) { final var tree = (ObjectNode) JsonUtils.readTree(json); for (String field : excludingFields) { tree.remove(field); @@ -112,14 +117,15 @@ public static InputStream readAsStream(String path) { @SneakyThrows public static Path readResource(String path) { final var f = TestUtils.class - .getResource(path) - .getFile(); + .getResource(path) + .getFile(); return Paths.get(f); } /** * Refactoring from mockito 3.4 to 5.0 looking at - * https://github.com/mockito/mockito/blob/v3.4.8/src/main/java/org/mockito/internal/util/reflection/Fields.java + * https://github.com/mockito/mockito/blob/v3.4 + * .8/src/main/java/org/mockito/internal/util/reflection/Fields.java */ @SneakyThrows public static void resetMocks(Object jUnitInstance) { @@ -141,27 +147,28 @@ public static String readString(Path path) { private static ObjectMapper dontWriteNonNullObjectMapper() { return new ObjectMapper() - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .registerModule(new JavaTimeModule()) - .enable(SerializationFeature.INDENT_OUTPUT) - ; + .setSerializationInclusion(JsonInclude.Include.NON_NULL) + .registerModule(new JavaTimeModule()) + .enable(SerializationFeature.INDENT_OUTPUT) + ; } public static void stripNulls(JsonNode node) { Iterator it = node.iterator(); while (it.hasNext()) { JsonNode child = it.next(); - if (child.isNull()) + if (child.isNull()) { it.remove(); - else + } else { stripNulls(child); + } } } @SneakyThrows public static String readAsStringAndExcludeNullFields(Path path) { final var in = Files.newInputStream(path); - try(in){ + try (in) { final var tree = JsonUtils.readTree(in); stripNulls(tree); return tree.toPrettyString(); diff --git a/src/test/java/com/mageddo/utils/TestsTest.java b/src/test/java/com/mageddo/utils/TestsTest.java index f2325ccda..1ecd8a470 100644 --- a/src/test/java/com/mageddo/utils/TestsTest.java +++ b/src/test/java/com/mageddo/utils/TestsTest.java @@ -9,12 +9,12 @@ class TestsTest { @BeforeEach - void beforeEach(){ + void beforeEach() { Tests.resetCache(); } @Test - void mustCacheInTestCalls(){ + void mustCacheInTestCalls() { for (int i = 0; i < 3; i++) { assertTrue(Tests.inTest()); @@ -24,12 +24,12 @@ void mustCacheInTestCalls(){ } @Test - void mustBeJunitTest(){ + void mustBeJunitTest() { assertTrue(Tests.inTestHotLoad()); } @Test - void hotCallsAreNotCached(){ + void hotCallsAreNotCached() { for (int i = 0; i < 3; i++) { assertTrue(Tests.inTestHotLoad()); } @@ -38,7 +38,7 @@ void hotCallsAreNotCached(){ @Test void mustBeJunitTestEvenWhenRunningInBackground() throws Exception { - try(final var executor = Executors.newThreadExecutor()){ + try (final var executor = Executors.newThreadExecutor()) { final var task = executor.submit(Tests::inTestHotLoad); assertTrue(task.get()); } diff --git a/src/test/java/com/mageddo/wait/WaitTest.java b/src/test/java/com/mageddo/wait/WaitTest.java index eef8f9b0d..cb75e5b11 100644 --- a/src/test/java/com/mageddo/wait/WaitTest.java +++ b/src/test/java/com/mageddo/wait/WaitTest.java @@ -1,9 +1,9 @@ package com.mageddo.wait; -import org.junit.jupiter.api.Test; - import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -17,7 +17,7 @@ void mustWaitUntilHappen() { final var counter = new AtomicInteger(3); final var res = new Wait<>() - .until(() -> counter.decrementAndGet() == expectedValue ? true : null); + .until(() -> counter.decrementAndGet() == expectedValue ? true : null); assertTrue(res); assertEquals(expectedValue, counter.get()); @@ -27,9 +27,10 @@ void mustWaitUntilHappen() { @Test void mustGetTimeoutWhenExpectationNeverHappen() { assertThrows( - UnsatisfiedConditionException.class, () -> { - new Wait<>().until(() -> null); - }) + UnsatisfiedConditionException.class, () -> { + new Wait<>().until(() -> null); + } + ) ; } } diff --git a/src/test/java/dagger/sheath/CtxWrapper.java b/src/test/java/dagger/sheath/CtxWrapper.java index 5a2ba31e3..4909d89a5 100644 --- a/src/test/java/dagger/sheath/CtxWrapper.java +++ b/src/test/java/dagger/sheath/CtxWrapper.java @@ -1,17 +1,19 @@ package dagger.sheath; -import dagger.sheath.binding.BindingMethod; -import dagger.sheath.reflection.Signature; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.Validate; -import org.apache.commons.lang3.reflect.FieldUtils; - -import javax.inject.Provider; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Objects; import java.util.function.Consumer; +import javax.inject.Provider; + +import org.apache.commons.lang3.Validate; +import org.apache.commons.lang3.reflect.FieldUtils; + +import dagger.sheath.binding.BindingMethod; +import dagger.sheath.reflection.Signature; +import lombok.extern.slf4j.Slf4j; + @Slf4j public class CtxWrapper { @@ -54,8 +56,10 @@ public Object get(Signature signature) { // todo procurar a classe que o obj grah impl estende ou a interface que ele implementa // Pegar a anotação @Component e pegar os modulos - // andar pelos metodos de cada modulo procurando pelo método que retorna o tipo da interface desejada - // e que tenha @Binds , provides nao serve como ele pode receber um tipo pra internamente montar o + // andar pelos metodos de cada modulo procurando pelo método que retorna o tipo da interface + // desejada + // e que tenha @Binds , provides nao serve como ele pode receber um tipo pra internamente + // montar o // tipo retornado mas daih nao da obter a instancia } @@ -63,10 +67,10 @@ public Object get(Signature signature) { private Object findUsingCtx(Signature signature) { try { final var method = MethodUtils - .getAllMethods(this.getCtxClass()) - .stream() - .filter(it -> isAssignable(it, signature)) - .findFirst(); + .getAllMethods(this.getCtxClass()) + .stream() + .filter(it -> isAssignable(it, signature)) + .findFirst(); if (method.isPresent()) { return MethodUtils.invoke(method.get(), this.ctx, true); } diff --git a/src/test/java/dagger/sheath/CtxWrapperTest.java b/src/test/java/dagger/sheath/CtxWrapperTest.java index cb5d81f0b..d391ade4f 100644 --- a/src/test/java/dagger/sheath/CtxWrapperTest.java +++ b/src/test/java/dagger/sheath/CtxWrapperTest.java @@ -1,6 +1,7 @@ package dagger.sheath; import org.junit.jupiter.api.Test; + import dagger.sheath.testing.stub.AppByProvider; import dagger.sheath.testing.stub.DaggerAppByProvider; @@ -9,7 +10,7 @@ class CtxWrapperTest { @Test - void mustFindByCtxMethod(){ + void mustFindByCtxMethod() { // arrange final var ctx = DaggerAppByProvider.create(); ctx.root(); diff --git a/src/test/java/dagger/sheath/EventHandler.java b/src/test/java/dagger/sheath/EventHandler.java index 57dc1adf3..63bcbf060 100644 --- a/src/test/java/dagger/sheath/EventHandler.java +++ b/src/test/java/dagger/sheath/EventHandler.java @@ -8,10 +8,12 @@ public interface EventHandler { * * @param component Dagger created component. */ - default void afterSetup(T component) {} + default void afterSetup(T component) { + } /** * On after all junit event. */ - default void afterAll(T component) {} + default void afterAll(T component) { + } } diff --git a/src/test/java/dagger/sheath/MethodUtils.java b/src/test/java/dagger/sheath/MethodUtils.java index 9bf7ab744..ee51bfb54 100644 --- a/src/test/java/dagger/sheath/MethodUtils.java +++ b/src/test/java/dagger/sheath/MethodUtils.java @@ -20,9 +20,9 @@ public static Set getAllMethods(Class clazz) { return methods; } - public static Object invoke(Method method, Object instance, boolean forceAccessible, Object... args) - throws InvocationTargetException, IllegalAccessException - { + public static Object invoke(Method method, Object instance, boolean forceAccessible, + Object... args) + throws InvocationTargetException, IllegalAccessException { if (forceAccessible && !method.canAccess(instance)) { method.setAccessible(true); } diff --git a/src/test/java/dagger/sheath/ProviderWrapper.java b/src/test/java/dagger/sheath/ProviderWrapper.java index 10bc33f34..81df31a69 100644 --- a/src/test/java/dagger/sheath/ProviderWrapper.java +++ b/src/test/java/dagger/sheath/ProviderWrapper.java @@ -1,8 +1,8 @@ package dagger.sheath; -import dagger.internal.DelegateFactory; -import dagger.internal.DoubleCheck; -import lombok.extern.slf4j.Slf4j; +import java.lang.reflect.InvocationTargetException; +import java.util.Objects; + import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.Validate; import org.apache.commons.lang3.reflect.FieldUtils; @@ -10,8 +10,9 @@ import org.mockito.Mockito; import org.mockito.internal.util.MockUtil; -import java.lang.reflect.InvocationTargetException; -import java.util.Objects; +import dagger.internal.DelegateFactory; +import dagger.internal.DoubleCheck; +import lombok.extern.slf4j.Slf4j; @Slf4j public class ProviderWrapper { @@ -42,8 +43,9 @@ void initialize(Object o) { return; } Validate.isTrue( - Objects.equals(uninitialized, instance), - "Dagger beans were already used, can't mock/spy anymore, please wait DaggerTest to mock them" + Objects.equals(uninitialized, instance), + "Dagger beans were already used, can't mock/spy anymore, please wait DaggerTest to mock" + + " them" ); FieldUtils.writeField(instanceField, this.provider, o, true); } catch (IllegalAccessException e) { @@ -81,7 +83,9 @@ public static ProviderWrapper from(Object o, Class type) { return new ProviderWrapper(o, type); } final var providerClass = ClassUtils.getName(o); - Validate.isTrue(isGeneratedFactory(providerClass), "Unknown dagger provider: %s", providerClass); + Validate.isTrue(isGeneratedFactory(providerClass), "Unknown dagger provider: %s", + providerClass + ); return new ProviderWrapper(o, type); } catch (IllegalAccessException e) { throw new IllegalStateException(e); diff --git a/src/test/java/dagger/sheath/binding/BindingMapMethod.java b/src/test/java/dagger/sheath/binding/BindingMapMethod.java index 6f959f395..f7fac528c 100644 --- a/src/test/java/dagger/sheath/binding/BindingMapMethod.java +++ b/src/test/java/dagger/sheath/binding/BindingMapMethod.java @@ -1,12 +1,13 @@ package dagger.sheath.binding; -import dagger.sheath.CtxWrapper; - -import javax.inject.Provider; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; +import javax.inject.Provider; + +import dagger.sheath.CtxWrapper; + public class BindingMapMethod { private final Object ctx; @@ -19,7 +20,8 @@ public BindingMapMethod(Object ctx, Method method) { public Provider get(Class clazz) { try { - final Map, Provider> bindings = (Map, Provider>) this.method.invoke(this.ctx); + final Map, Provider> bindings = (Map, Provider>) this.method.invoke( + this.ctx); return (Provider) bindings.get(clazz); } catch (IllegalAccessException | InvocationTargetException e) { throw new IllegalStateException(e); @@ -35,7 +37,8 @@ public static BindingMapMethod of(CtxWrapper ctx, Method method) { private static boolean isGetBindingsMap(Method m) { return m.getParameterTypes().length == 0 - && m.getReturnType().isAssignableFrom(Map.class) + && m.getReturnType() + .isAssignableFrom(Map.class) ; } diff --git a/src/test/java/dagger/sheath/binding/BindingMethod.java b/src/test/java/dagger/sheath/binding/BindingMethod.java index 762a786e6..734e2a484 100644 --- a/src/test/java/dagger/sheath/binding/BindingMethod.java +++ b/src/test/java/dagger/sheath/binding/BindingMethod.java @@ -1,17 +1,20 @@ package dagger.sheath.binding; -import com.mageddo.commons.lang.Objects; -import dagger.sheath.CtxWrapper; -import jdk.jfr.Name; -import org.apache.commons.lang3.reflect.MethodUtils; - -import javax.inject.Provider; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; import java.util.function.Function; import java.util.stream.Collectors; +import javax.inject.Provider; + +import com.mageddo.commons.lang.Objects; + +import org.apache.commons.lang3.reflect.MethodUtils; + +import dagger.sheath.CtxWrapper; +import jdk.jfr.Name; + public class BindingMethod { private final Function mapper; @@ -33,7 +36,8 @@ public static BindingMethod findBindingMethod(CtxWrapper ctx) { for (final var method : methods) { final var bindingMethod = BindingMapMethod.of(ctx, method); if (bindingMethod != null) { - return new BindingMethod(clazz -> Objects.mapOrNull(bindingMethod.get(clazz), Provider::get)); + return new BindingMethod( + clazz -> Objects.mapOrNull(bindingMethod.get(clazz), Provider::get)); } else if (isGetByClass(method)) { return buildGetByClass(ctx, method); } @@ -55,7 +59,9 @@ public static BindingMapMethod findBindingMap(CtxWrapper ctx) { static List filterBindingMethods(CtxWrapper ctx) { return MethodUtils.getMethodsListWithAnnotation(ctx.getCtxClass(), Name.class, true, true) .stream() - .filter(it -> it.getAnnotation(Name.class).value().equals("bindings")) + .filter(it -> it.getAnnotation(Name.class) + .value() + .equals("bindings")) .collect(Collectors.toList()); } diff --git a/src/test/java/dagger/sheath/binding/BindingMethodTest.java b/src/test/java/dagger/sheath/binding/BindingMethodTest.java index b88c6bc83..0a8c720c5 100644 --- a/src/test/java/dagger/sheath/binding/BindingMethodTest.java +++ b/src/test/java/dagger/sheath/binding/BindingMethodTest.java @@ -1,6 +1,7 @@ package dagger.sheath.binding; import org.junit.jupiter.api.Test; + import dagger.sheath.testing.stub.AppByBindingMap; import dagger.sheath.testing.stub.AppByGetClass; import dagger.sheath.testing.stub.DaggerAppByBindingMap; @@ -14,7 +15,7 @@ public class BindingMethodTest { @Test - void wontFindBindingMethodWhenTheCtxDontSupportsIt(){ + void wontFindBindingMethodWhenTheCtxDontSupportsIt() { // arrange final var ctx = DaggerAppByProvider.create(); final var nop = ctx.root(); @@ -27,7 +28,7 @@ void wontFindBindingMethodWhenTheCtxDontSupportsIt(){ } @Test - void mustFindBeanUsingBindingMap(){ + void mustFindBeanUsingBindingMap() { // arrange final var ctx = DaggerAppByBindingMap.create(); final var nop = ctx.root(); @@ -43,7 +44,7 @@ void mustFindBeanUsingBindingMap(){ } @Test - void mustFindBeanUsingByGetClass(){ + void mustFindBeanUsingByGetClass() { // arrange final var ctx = DaggerAppByGetClass.create(); final var nop = ctx.root(); diff --git a/src/test/java/dagger/sheath/junit/DaggerExtension.java b/src/test/java/dagger/sheath/junit/DaggerExtension.java index 21eccd57d..c451f1955 100644 --- a/src/test/java/dagger/sheath/junit/DaggerExtension.java +++ b/src/test/java/dagger/sheath/junit/DaggerExtension.java @@ -1,13 +1,15 @@ package dagger.sheath.junit; -import dagger.sheath.CtxWrapper; -import dagger.sheath.EventHandler; -import dagger.sheath.InjectMock; -import dagger.sheath.InjectSpy; -import dagger.sheath.NopSupplier; -import dagger.sheath.ProviderWrapper; -import dagger.sheath.reflection.Signature; -import lombok.extern.slf4j.Slf4j; +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; +import java.util.List; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Predicate; +import java.util.function.Supplier; + +import javax.inject.Inject; + import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.commons.lang3.reflect.MethodUtils; @@ -22,14 +24,14 @@ import org.mockito.Mockito; import org.mockito.internal.util.MockUtil; -import javax.inject.Inject; -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; -import java.util.List; -import java.util.Optional; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.function.Supplier; +import dagger.sheath.CtxWrapper; +import dagger.sheath.EventHandler; +import dagger.sheath.InjectMock; +import dagger.sheath.InjectSpy; +import dagger.sheath.NopSupplier; +import dagger.sheath.ProviderWrapper; +import dagger.sheath.reflection.Signature; +import lombok.extern.slf4j.Slf4j; import static org.junit.jupiter.api.extension.ExtensionContext.Namespace.create; @@ -38,14 +40,14 @@ */ @Slf4j public class DaggerExtension implements Extension, BeforeAllCallback, AfterAllCallback, - BeforeEachCallback, ParameterResolver { + BeforeEachCallback, ParameterResolver { private final static ExtensionContext.Namespace DAGGER = create("dagger2"); private final static String - DAGGER_CTX = "DAGGER_CTX", - DAGGER_CTX_WRAPPER = "DAGGER_CTX_WRAPPER", - DAGGER_LIFECYCLE_HANDLER = "DAGGER_LIFECYCLE_HANDLER", - DAGGER_SETUP = "DAGGER_SETUP"; + DAGGER_CTX = "DAGGER_CTX", + DAGGER_CTX_WRAPPER = "DAGGER_CTX_WRAPPER", + DAGGER_LIFECYCLE_HANDLER = "DAGGER_LIFECYCLE_HANDLER", + DAGGER_SETUP = "DAGGER_SETUP"; @Override public void beforeAll(ExtensionContext context) throws Exception { @@ -53,9 +55,12 @@ public void beforeAll(ExtensionContext context) throws Exception { final var settings = this.mustFindDaggerTestSettings(context); final var ctx = createCtx(settings); - context.getStore(DAGGER).put(DAGGER_CTX, ctx); - context.getStore(DAGGER).put(DAGGER_CTX_WRAPPER, new CtxWrapper(ctx)); - context.getStore(DAGGER).put(DAGGER_LIFECYCLE_HANDLER, createInstance(settings.eventsHandler())); + context.getStore(DAGGER) + .put(DAGGER_CTX, ctx); + context.getStore(DAGGER) + .put(DAGGER_CTX_WRAPPER, new CtxWrapper(ctx)); + context.getStore(DAGGER) + .put(DAGGER_LIFECYCLE_HANDLER, createInstance(settings.eventsHandler())); } @@ -70,20 +75,25 @@ public void beforeEach(ExtensionContext context) throws Exception { injectMocksAndSpies(context); injectFields(context); resetMocks(context); - if (!Boolean.TRUE.equals(context.getStore(DAGGER).get(DAGGER_SETUP, Boolean.class))) { + if (!Boolean.TRUE.equals(context.getStore(DAGGER) + .get(DAGGER_SETUP, Boolean.class))) { triggerSetupEvent(context); } } @Override - public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { + public boolean supportsParameter(ParameterContext parameterContext, + ExtensionContext extensionContext) { return resolveParameter(parameterContext, extensionContext) != null; } @Override - public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext) { - final Class pClass = parameterContext.getParameter().getType(); - final var daggerCtx = extensionContext.getStore(DAGGER).get(DAGGER_CTX); + public Object resolveParameter(ParameterContext parameterContext, + ExtensionContext extensionContext) { + final Class pClass = parameterContext.getParameter() + .getType(); + final var daggerCtx = extensionContext.getStore(DAGGER) + .get(DAGGER_CTX); if (pClass.isAssignableFrom(daggerCtx.getClass())) { return daggerCtx; } @@ -91,7 +101,8 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte } void resetMocks(ExtensionContext context) { - final var testInstances = context.getRequiredTestInstances().getAllInstances(); + final var testInstances = context.getRequiredTestInstances() + .getAllInstances(); for (Object instance : testInstances) { final var fields = FieldUtils.getAllFields(instance.getClass()); for (Field field : fields) { @@ -108,47 +119,55 @@ void resetMocks(ExtensionContext context) { } void injectMocksAndSpies(ExtensionContext context) { - final var testInstances = context.getRequiredTestInstances().getAllInstances(); + final var testInstances = context.getRequiredTestInstances() + .getAllInstances(); final var ctxWrapper = findCtxWrapper(context); for (Object testInstance : testInstances) { { - final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), InjectMock.class); + final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), + InjectMock.class + ); inject( - ctxWrapper, - testInstance, - fields, - ProviderWrapper::mock, - MockUtil::isMock + ctxWrapper, + testInstance, + fields, + ProviderWrapper::mock, + MockUtil::isMock ); } { - final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), InjectSpy.class); + final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), + InjectSpy.class + ); inject( - ctxWrapper, - testInstance, - fields, - ProviderWrapper::spy, - MockUtil::isSpy + ctxWrapper, + testInstance, + fields, + ProviderWrapper::spy, + MockUtil::isSpy ); } } } private static void inject( - CtxWrapper ctxWrapper, - Object instance, - List fields, - Consumer initializer, - Predicate validator + CtxWrapper ctxWrapper, + Object instance, + List fields, + Consumer initializer, + Predicate validator ) { for (Field field : fields) { try { - log.debug("status=injectMockSpyInField, field={} {}", field.getType().getSimpleName(), field.getName()); + log.debug("status=injectMockSpyInField, field={} {}", field.getType() + .getSimpleName(), field.getName() + ); ctxWrapper.initializeWithOrThrows(field.getType(), initializer); final var mock = ctxWrapper.get(Signature.of(field)); if (!validator.test(mock)) { - throw new IllegalStateException(String.format("Mock/Stub didn't work for type: %s", field.getType())); + throw new IllegalStateException( + String.format("Mock/Stub didn't work for type: %s", field.getType())); } writeTo(instance, field, mock); } catch (IllegalAccessException e) { @@ -159,21 +178,24 @@ private static void inject( DaggerTest mustFindDaggerTestSettings(ExtensionContext context) { return this.findAnnotation(context, DaggerTest.class) - .orElseThrow(() -> new IllegalArgumentException("You need to use @DaggerTest annotation")) - ; + .orElseThrow(() -> new IllegalArgumentException("You need to use @DaggerTest annotation")) + ; } - Optional findAnnotation(final ExtensionContext context, final Class ann) { + Optional findAnnotation(final ExtensionContext context, + final Class ann) { ExtensionContext currentContext = context; Optional annotation; do { annotation = AnnotationSupport.findAnnotation(currentContext.getElement(), ann); - if (!currentContext.getParent().isPresent()) { + if (!currentContext.getParent() + .isPresent()) { break; } - currentContext = currentContext.getParent().get(); + currentContext = currentContext.getParent() + .get(); } while (!annotation.isPresent() && currentContext != context.getRoot()); return annotation; @@ -181,9 +203,12 @@ Optional findAnnotation(final ExtensionContext context static void injectFields(ExtensionContext context) throws IllegalAccessException { final var ctx = findCtxWrapper(context); - final var testInstances = context.getRequiredTestInstances().getAllInstances(); + final var testInstances = context.getRequiredTestInstances() + .getAllInstances(); for (Object testInstance : testInstances) { - final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), Inject.class); + final var fields = FieldUtils.getFieldsListWithAnnotation(testInstance.getClass(), + Inject.class + ); for (Field field : fields) { final var foundInstance = ctx.get(Signature.of(field)); writeTo(testInstance, field, foundInstance); @@ -191,58 +216,69 @@ static void injectFields(ExtensionContext context) throws IllegalAccessException } } - private static void writeTo(Object testInstance, Field field, Object foundInstance) throws IllegalAccessException { + private static void writeTo(Object testInstance, Field field, Object foundInstance) + throws IllegalAccessException { FieldUtils.writeField(field, testInstance, foundInstance, true); log.debug( - "status=written, testClass={}, field={}, value={}, classToFind={}, generic={}", - field.getName(), ClassUtils.getSimpleName(testInstance), foundInstance, field.getType(), field.getGenericType() + "status=written, testClass={}, field={}, value={}, classToFind={}, generic={}", + field.getName(), ClassUtils.getSimpleName(testInstance), foundInstance, field.getType(), + field.getGenericType() ); } static CtxWrapper findCtxWrapper(ExtensionContext context) { - return context.getStore(DAGGER).get(DAGGER_CTX_WRAPPER, CtxWrapper.class); + return context.getStore(DAGGER) + .get(DAGGER_CTX_WRAPPER, CtxWrapper.class); } static Object findCtx(ExtensionContext context) { - return context.getStore(DAGGER).get(DAGGER_CTX); + return context.getStore(DAGGER) + .get(DAGGER_CTX); } static Object createCtx(DaggerTest settings) throws Exception { if (settings.component() != Void.class) { - log.debug("strategy=component, component={}, method={}", settings.component(), settings.createMethod()); + log.debug("strategy=component, component={}, method={}", settings.component(), + settings.createMethod() + ); return MethodUtils.invokeStaticMethod(settings.component(), settings.createMethod()); } else if (settings.initializer() != NopSupplier.class) { final var instance = (Supplier) createInstance(settings.initializer()); return instance.get(); } - throw new IllegalArgumentException("You need to inform either: component or initializer options"); + throw new IllegalArgumentException( + "You need to inform either: component or initializer options"); } static void triggerSetupEvent(ExtensionContext context) { findLifecycleHander(context).afterSetup(findCtx(context)); - final var parent = context.getParent().get(); - parent.getStore(DAGGER).put(DAGGER_SETUP, true); + final var parent = context.getParent() + .get(); + parent.getStore(DAGGER) + .put(DAGGER_SETUP, true); log.debug( - "status=triggeredSetupEvent, context={}, parent={}, root={}", - context.hashCode(), parent.hashCode(), context.getRoot().hashCode() + "status=triggeredSetupEvent, context={}, parent={}, root={}", + context.hashCode(), parent.hashCode(), context.getRoot() + .hashCode() ); } private void triggerAfterAllEvent(ExtensionContext context) { findLifecycleHander(context).afterAll(findCtx(context)); log.debug( - "status=triggeredAfterAllEvent" + "status=triggeredAfterAllEvent" ); } private static EventHandler findLifecycleHander(ExtensionContext context) { return context - .getStore(DAGGER) - .get(DAGGER_LIFECYCLE_HANDLER, EventHandler.class); + .getStore(DAGGER) + .get(DAGGER_LIFECYCLE_HANDLER, EventHandler.class); } static Object createInstance(Class clazz) throws Exception { - return clazz.getDeclaredConstructor().newInstance(); + return clazz.getDeclaredConstructor() + .newInstance(); } } diff --git a/src/test/java/dagger/sheath/junit/DaggerTest.java b/src/test/java/dagger/sheath/junit/DaggerTest.java index 0bf7c5980..0df549e44 100644 --- a/src/test/java/dagger/sheath/junit/DaggerTest.java +++ b/src/test/java/dagger/sheath/junit/DaggerTest.java @@ -1,33 +1,38 @@ package dagger.sheath.junit; -import dagger.sheath.EventHandler; -import dagger.sheath.NopEventHandler; -import dagger.sheath.NopSupplier; -import org.junit.jupiter.api.extension.ExtendWith; - import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.function.Supplier; +import org.junit.jupiter.api.extension.ExtendWith; + +import dagger.sheath.EventHandler; +import dagger.sheath.NopEventHandler; +import dagger.sheath.NopSupplier; + @Inherited @Retention(RetentionPolicy.RUNTIME) @ExtendWith(DaggerExtension.class) public @interface DaggerTest { /** - * Instead of let DaggerTest create a dagger component directly using {@link #component()}, you can - * specify a customized, no args Supplier to provide the component instance, it's useful when you need to run + * Instead of let DaggerTest create a dagger component directly using {@link #component()}, you + * can + * specify a customized, no args Supplier to provide the component instance, it's useful when + * you need to run * some code at the tests before create the dagger component instance. *

- * Obs: Be aware you can't access the Component Beans which will be mocked or spied otherwise DaggerTest won't + * Obs: Be aware you can't access the Component Beans which will be mocked or spied otherwise + * DaggerTest won't * be able to mock them as Dagger will already has initialized them. If you need to access them, * then use {@link #eventsHandler()} */ Class> initializer() default NopSupplier.class; /** - * Dagger componenent class, it can be the class annotated with `@Component` or the Dagger component generated class. + * Dagger componenent class, it can be the class annotated with `@Component` or the Dagger + * component generated class. */ Class component() default Void.class; @@ -37,7 +42,8 @@ String createMethod() default "create"; /** - *A handler class which you can listen to intermediate events on the test and do things with the Dagger Component. + * A handler class which you can listen to intermediate events on the test and do things with + * the Dagger Component. */ Class> eventsHandler() default NopEventHandler.class; diff --git a/src/test/java/dagger/sheath/reflection/Signature.java b/src/test/java/dagger/sheath/reflection/Signature.java index 407bc123d..e9b56f8f3 100644 --- a/src/test/java/dagger/sheath/reflection/Signature.java +++ b/src/test/java/dagger/sheath/reflection/Signature.java @@ -1,16 +1,18 @@ package dagger.sheath.reflection; -import com.google.common.reflect.TypeToken; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Value; -import org.apache.commons.lang3.ObjectUtils; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; +import com.google.common.reflect.TypeToken; + +import org.apache.commons.lang3.ObjectUtils; + +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Value; + @Value @Builder @EqualsAndHashCode(of = "typeArguments") @@ -21,7 +23,8 @@ public class Signature { public boolean isSameOrInheritFrom(Signature sig) { - return this.clazz.isAssignableFrom(sig.getClazz()) && this.areTypeArgumentsSameOrInheritFrom(sig); + return this.clazz.isAssignableFrom(sig.getClazz()) && this.areTypeArgumentsSameOrInheritFrom( + sig); } boolean areTypeArgumentsSameOrInheritFrom(Signature sig) { @@ -46,8 +49,10 @@ boolean areTypeArgumentsSameOrInheritFrom(Signature sig) { } private boolean isTypeArgumentSameOrInheritFrom(Signature sig, int i) { - final var type = TypeToken.of(this.typeArguments[i]).getRawType(); - final var otherType = TypeToken.of(sig.typeArguments[i]).getRawType(); + final var type = TypeToken.of(this.typeArguments[i]) + .getRawType(); + final var otherType = TypeToken.of(sig.typeArguments[i]) + .getRawType(); return type.isAssignableFrom(otherType); } @@ -60,18 +65,19 @@ public String getFirstTypeArgumentName() { public static Signature of(Field f) { return Signature - .builder() - .clazz(f.getType()) - .typeArguments(findTypeArguments(f.getGenericType())) - .build(); + .builder() + .clazz(f.getType()) + .typeArguments(findTypeArguments(f.getGenericType())) + .build(); } public static Signature of(Type type) { return Signature - .builder() - .clazz(TypeToken.of(type).getRawType()) - .typeArguments(findTypeArguments(type)) - .build(); + .builder() + .clazz(TypeToken.of(type) + .getRawType()) + .typeArguments(findTypeArguments(type)) + .build(); } public static Signature ofMethodReturnType(Method m) { diff --git a/src/test/java/dagger/sheath/reflection/SignatureTest.java b/src/test/java/dagger/sheath/reflection/SignatureTest.java index 9ab8b46a8..6e174de00 100644 --- a/src/test/java/dagger/sheath/reflection/SignatureTest.java +++ b/src/test/java/dagger/sheath/reflection/SignatureTest.java @@ -1,11 +1,12 @@ package dagger.sheath.reflection; -import dagger.sheath.templates.SignatureTemplates; +import java.util.ArrayList; +import java.util.List; + import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.Test; -import java.util.ArrayList; -import java.util.List; +import dagger.sheath.templates.SignatureTemplates; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -15,13 +16,16 @@ class SignatureTest { @Test - void mustConvertFieldToSignature(){ + void mustConvertFieldToSignature() { final var sig = fieldToSignature(Car.class, "passengers"); - assertEquals("Signature(clazz=interface java.util.List, typeArguments=[class java.lang.String])", sig.toString()); + assertEquals( + "Signature(clazz=interface java.util.List, typeArguments=[class java.lang.String])", + sig.toString() + ); } @Test - void mustGetCorrectTypeFromField(){ + void mustGetCorrectTypeFromField() { final var signature = fieldToSignature(Car.class, "passengers"); assertEquals(List.class, signature.getClazz()); assertEquals("java.lang.String", signature.getFirstTypeArgumentName()); @@ -29,7 +33,7 @@ void mustGetCorrectTypeFromField(){ } @Test - void mustMatchFieldsWithSameTypeAndGenerics(){ + void mustMatchFieldsWithSameTypeAndGenerics() { final var passengers = fieldToSignature(Car.class, "passengers"); final var accessories = fieldToSignature(Car.class, "accessories"); @@ -39,7 +43,7 @@ void mustMatchFieldsWithSameTypeAndGenerics(){ } @Test - void fieldsWithDifferentGenericCantMatch(){ + void fieldsWithDifferentGenericCantMatch() { final var passengers = fieldToSignature(Car.class, "passengers"); final var accessories = fieldToSignature(Car.class, "tripsKms"); @@ -49,7 +53,7 @@ void fieldsWithDifferentGenericCantMatch(){ } @Test - void mustMatchFieldsWithCompatibleTypes(){ + void mustMatchFieldsWithCompatibleTypes() { final var ancestor = SignatureTemplates.listOfNumber(); final var impl = SignatureTemplates.listOfInteger(); @@ -60,7 +64,7 @@ void mustMatchFieldsWithCompatibleTypes(){ @Test - void differentNumberOfTypeArgumentsMustNotMatch(){ + void differentNumberOfTypeArgumentsMustNotMatch() { final var ancestor = SignatureTemplates.pairOfString(); final var impl = SignatureTemplates.listOfString(); @@ -70,7 +74,7 @@ void differentNumberOfTypeArgumentsMustNotMatch(){ } @Test - void fieldsWithIncompatibleTypesArgumentsMustNotMatch(){ + void fieldsWithIncompatibleTypesArgumentsMustNotMatch() { final var ancestor = SignatureTemplates.listOfNumber(); final var impl = SignatureTemplates.listOfString(); @@ -80,7 +84,7 @@ void fieldsWithIncompatibleTypesArgumentsMustNotMatch(){ } @Test - void fieldsWithMoreThanOneTypeArgumentAndIncompatibleTypesArgumentsMustNotMatch(){ + void fieldsWithMoreThanOneTypeArgumentAndIncompatibleTypesArgumentsMustNotMatch() { final var ancestor = SignatureTemplates.pairOfString(); final var impl = SignatureTemplates.pairOfStringAndInteger(); @@ -90,7 +94,7 @@ void fieldsWithMoreThanOneTypeArgumentAndIncompatibleTypesArgumentsMustNotMatch( } @Test - void whenImplHasNotTypeArgumentsTheyCantMatch(){ + void whenImplHasNotTypeArgumentsTheyCantMatch() { final var ancestor = SignatureTemplates.pairOfString(); final var impl = SignatureTemplates.pair(); @@ -100,7 +104,7 @@ void whenImplHasNotTypeArgumentsTheyCantMatch(){ } @Test - void ancestorsWithoutTypeArgumentsSpecificationMustMatch(){ + void ancestorsWithoutTypeArgumentsSpecificationMustMatch() { final var ancestor = SignatureTemplates.list(); final var impl = SignatureTemplates.listOfString(); @@ -110,12 +114,14 @@ void ancestorsWithoutTypeArgumentsSpecificationMustMatch(){ } @Test - void mustParseMethodReturnTypeWithTypeArguments(){ + void mustParseMethodReturnTypeWithTypeArguments() { final var method = SignatureTemplates.ofMethodIteratorList(); final var sig = Signature.ofMethodReturnType(method); - assertEquals("Signature(clazz=interface java.util.Iterator, typeArguments=[E])", sig.toString()); + assertEquals("Signature(clazz=interface java.util.Iterator, typeArguments=[E])", + sig.toString() + ); } private static Signature fieldToSignature(final Class clazz, final String fieldName) { diff --git a/src/test/java/dagger/sheath/templates/SignatureTemplates.java b/src/test/java/dagger/sheath/templates/SignatureTemplates.java index 9109160b7..8a62a9c88 100644 --- a/src/test/java/dagger/sheath/templates/SignatureTemplates.java +++ b/src/test/java/dagger/sheath/templates/SignatureTemplates.java @@ -1,12 +1,14 @@ package dagger.sheath.templates; +import java.lang.reflect.Method; +import java.util.List; + import com.fasterxml.jackson.core.type.TypeReference; -import dagger.sheath.reflection.Signature; + import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.commons.lang3.tuple.Pair; -import java.lang.reflect.Method; -import java.util.List; +import dagger.sheath.reflection.Signature; public class SignatureTemplates { public static Signature listOfNumber() { diff --git a/src/test/java/dagger/sheath/testing/stub/AppByBindingMap.java b/src/test/java/dagger/sheath/testing/stub/AppByBindingMap.java index 51ceb7549..e51718eca 100644 --- a/src/test/java/dagger/sheath/testing/stub/AppByBindingMap.java +++ b/src/test/java/dagger/sheath/testing/stub/AppByBindingMap.java @@ -1,5 +1,10 @@ package dagger.sheath.testing.stub; +import java.util.Map; + +import javax.inject.Inject; +import javax.inject.Provider; + import dagger.Binds; import dagger.Component; import dagger.Module; @@ -7,12 +12,6 @@ import dagger.multibindings.IntoMap; import jdk.jfr.Name; -import javax.inject.Inject; -import javax.inject.Provider; -import javax.inject.Singleton; - -import java.util.Map; - @Component(modules = AppByBindingMap.MainModule.class) public interface AppByBindingMap { diff --git a/src/test/java/dagger/sheath/testing/stub/AppByProvider.java b/src/test/java/dagger/sheath/testing/stub/AppByProvider.java index 6bdd9d98a..d54ca21bf 100644 --- a/src/test/java/dagger/sheath/testing/stub/AppByProvider.java +++ b/src/test/java/dagger/sheath/testing/stub/AppByProvider.java @@ -1,12 +1,11 @@ package dagger.sheath.testing.stub; +import javax.inject.Inject; + import dagger.Binds; import dagger.Component; import dagger.Module; -import javax.inject.Inject; -import javax.inject.Singleton; - @Component(modules = AppByProvider.MainModule.class) public interface AppByProvider { diff --git a/src/test/java/testing/ContextSupplier.java b/src/test/java/testing/ContextSupplier.java index a95d7a6f8..28946d1ea 100644 --- a/src/test/java/testing/ContextSupplier.java +++ b/src/test/java/testing/ContextSupplier.java @@ -1,12 +1,12 @@ package testing; +import java.util.function.Supplier; + import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.ConfigDAOCmdArgs; import com.mageddo.dnsproxyserver.di.Context; import com.mageddo.net.SocketUtils; -import java.util.function.Supplier; - public class ContextSupplier implements Supplier { @Override public Context get() { diff --git a/src/test/java/testing/Events.java b/src/test/java/testing/Events.java index 990852ca8..56eeb92b2 100644 --- a/src/test/java/testing/Events.java +++ b/src/test/java/testing/Events.java @@ -2,6 +2,7 @@ import com.mageddo.dnsproxyserver.config.application.Configs; import com.mageddo.dnsproxyserver.di.Context; + import dagger.sheath.EventHandler; import io.restassured.RestAssured; import io.restassured.config.HttpClientConfig; diff --git a/src/test/java/testing/JsonAssertion.java b/src/test/java/testing/JsonAssertion.java index ffdb5ca95..0f604aaea 100644 --- a/src/test/java/testing/JsonAssertion.java +++ b/src/test/java/testing/JsonAssertion.java @@ -1,10 +1,11 @@ package testing; import com.mageddo.json.JsonUtils; + import io.restassured.path.json.JsonPath; public class JsonAssertion { - public static JsonPath jsonPath(String json){ + public static JsonPath jsonPath(String json) { return new JsonPath(json); } diff --git a/src/test/java/testing/mocks/DockerClientStub.java b/src/test/java/testing/mocks/DockerClientStub.java index ec63838ed..b368865c9 100644 --- a/src/test/java/testing/mocks/DockerClientStub.java +++ b/src/test/java/testing/mocks/DockerClientStub.java @@ -1,5 +1,10 @@ package testing.mocks; +import java.util.HashMap; +import java.util.Map; + +import javax.annotation.Nonnull; + import com.github.dockerjava.api.DockerClientDelegate; import com.github.dockerjava.api.command.ConnectToNetworkCmd; import com.github.dockerjava.api.command.DockerCmdSyncExec; @@ -8,12 +13,8 @@ import com.github.dockerjava.core.command.ConnectToNetworkCmdImpl; import com.github.dockerjava.core.command.InspectContainerCmdImpl; import com.github.dockerjava.core.command.ListContainersCmdImpl; -import lombok.Getter; -import javax.annotation.Nonnull; - -import java.util.HashMap; -import java.util.Map; +import lombok.Getter; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -54,7 +55,8 @@ public InspectContainerCmd inspectContainerCmd(@Nonnull String containerId) { if (this.inspectContainerCmdMap.containsKey(containerId)) { return this.inspectContainerCmdMap.get(containerId); } else { - final var inspectCmd = spy(new InspectContainerCmdImpl(this.inspectContainerExecution, containerId)); + final var inspectCmd = spy( + new InspectContainerCmdImpl(this.inspectContainerExecution, containerId)); inspectContainerCmdMap.put(containerId, inspectCmd); return inspectCmd; } diff --git a/src/test/java/testing/templates/CircuitBreakerConfigTemplates.java b/src/test/java/testing/templates/CircuitBreakerConfigTemplates.java index 6496e8397..7dec11752 100644 --- a/src/test/java/testing/templates/CircuitBreakerConfigTemplates.java +++ b/src/test/java/testing/templates/CircuitBreakerConfigTemplates.java @@ -16,12 +16,12 @@ public static StaticThresholdCircuitBreakerStrategyConfig buildDefault() { public static StaticThresholdCircuitBreakerStrategyConfig oneTryFailSuccess() { return StaticThresholdCircuitBreakerStrategyConfig - .builder() - .successThreshold(1) - .failureThreshold(1) - .failureThresholdCapacity(10) - .testDelay(Duration.ofMillis(10)) - .build(); + .builder() + .successThreshold(1) + .failureThreshold(1) + .failureThresholdCapacity(10) + .testDelay(Duration.ofMillis(10)) + .build(); } public static CircuitBreakerStrategyConfig buildNonResilientConfig() { @@ -30,10 +30,10 @@ public static CircuitBreakerStrategyConfig buildNonResilientConfig() { public static CanaryRateThresholdCircuitBreakerStrategyConfig fastCanaryRateThreshold() { return CanaryRateThresholdCircuitBreakerStrategyConfig.builder() - .permittedNumberOfCallsInHalfOpenState(10) - .minimumNumberOfCalls(1) - .failureRateThreshold(1) - .build(); + .permittedNumberOfCallsInHalfOpenState(10) + .minimumNumberOfCalls(1) + .failureRateThreshold(1) + .build(); } } diff --git a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java index 4298d916a..5f1a00bb1 100644 --- a/src/test/java/testing/templates/ConfigFlagArgsTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagArgsTemplates.java @@ -19,7 +19,7 @@ public class ConfigFlagArgsTemplates { public static String[] withRandomPortsAndNotAsDefaultDnsUsingRemote(IpAddr addr) { final var configPath = makeConfigFileRandomPortAndCustomRemote(addr); return new String[]{ - "--conf-path=" + configPath.toString() + "--conf-path=" + configPath.toString() }; } @@ -28,10 +28,10 @@ public static String[] withRandomPortsAndNotAsDefaultDns() { final var dnsServerPort = SocketUtils.findRandomFreePort(); return new String[]{ - "--default-dns=false", - "--web-server-port=" + webServerPort, - "--server-port=" + dnsServerPort, - "--log-level=TRACE", + "--default-dns=false", + "--web-server-port=" + webServerPort, + "--server-port=" + dnsServerPort, + "--log-level=TRACE", }; } @@ -40,25 +40,25 @@ private static Path makeConfigFileRandomPortAndCustomRemote(IpAddr remoteAddr) { final var webServerPort = SocketUtils.findRandomFreePort(); final var dnsServerPort = SocketUtils.findRandomFreePort(); final var configJsonContent = """ - { - "version": 2, - "webServerPort" : %d, - "dnsServerPort" : %d, - "defaultDns" : false, - "logLevel" : "TRACE", - "remoteDnsServers": ["%s"], - "envs": [], - "solverRemote" : { - "circuitBreaker": { - "name": "STATIC_THRESHOLD", - "failureThreshold": 3, - "failureThresholdCapacity": 10, - "successThreshold": 5, - "testDelay": "PT20S" + { + "version": 2, + "webServerPort" : %d, + "dnsServerPort" : %d, + "defaultDns" : false, + "logLevel" : "TRACE", + "remoteDnsServers": ["%s"], + "envs": [], + "solverRemote" : { + "circuitBreaker": { + "name": "STATIC_THRESHOLD", + "failureThreshold": 3, + "failureThresholdCapacity": 10, + "successThreshold": 5, + "testDelay": "PT20S" + } } } - } - """.formatted(webServerPort, dnsServerPort, remoteAddr.toString()); + """.formatted(webServerPort, dnsServerPort, remoteAddr.toString()); return writeToTempPath(configJsonContent); } @@ -69,7 +69,7 @@ private static Path writeToTempPath(String content) throws IOException { public static String[] withConfigFilePath() { return new String[]{ - "--conf-path=flag-relative-path/flag-config.json" + "--conf-path=flag-relative-path/flag-config.json" }; } diff --git a/src/test/java/testing/templates/ConfigFlagTemplates.java b/src/test/java/testing/templates/ConfigFlagTemplates.java index 3f41b7f7e..0ceaa6d01 100644 --- a/src/test/java/testing/templates/ConfigFlagTemplates.java +++ b/src/test/java/testing/templates/ConfigFlagTemplates.java @@ -1,9 +1,9 @@ package testing.templates; -import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.vo.ConfigFlag; - import java.nio.file.Path; +import com.mageddo.dnsproxyserver.config.dataformat.v2.cmdargs.vo.ConfigFlag; + public class ConfigFlagTemplates { public static ConfigFlag build() { return ConfigFlag.parse(new String[]{}); @@ -13,7 +13,7 @@ public static ConfigFlag defaultWithConfigPath(Path path) { return ConfigFlag.parse(new String[]{"--conf-path", path.toString()}); } - public static ConfigFlag withHelpFlag(){ + public static ConfigFlag withHelpFlag() { return ConfigFlag.parse(new String[]{"--help"}); } diff --git a/src/test/java/testing/templates/ConfigJsonFileTemplates.java b/src/test/java/testing/templates/ConfigJsonFileTemplates.java index 9cc13a1e5..90667f9ca 100644 --- a/src/test/java/testing/templates/ConfigJsonFileTemplates.java +++ b/src/test/java/testing/templates/ConfigJsonFileTemplates.java @@ -10,35 +10,35 @@ public class ConfigJsonFileTemplates { public static final String RANDOM_PORTS_NO_DEFAULT_CUSTOM_LOCAL_DB_ENTRY = """ - { - "version": 2, - "webServerPort" : %d, - "dnsServerPort" : %d, - "defaultDns" : false, - "logLevel" : "TRACE", - "remoteDnsServers": [], - "envs": [ - { - "name": "", - "hostnames": [ - { - "id" : 1, - "type": "A", - "hostname": "%s", - "ip": "192.168.0.1", - "ttl": 255 - } - ] - } - ] - } - """; + { + "version": 2, + "webServerPort" : %d, + "dnsServerPort" : %d, + "defaultDns" : false, + "logLevel" : "TRACE", + "remoteDnsServers": [], + "envs": [ + { + "name": "", + "hostnames": [ + { + "id" : 1, + "type": "A", + "hostname": "%s", + "ip": "192.168.0.1", + "ttl": 255 + } + ] + } + ] + } + """; public static Path withRandomPortsAndNotAsDefaultDnsAndCustomLocalDBEntry(String host) { final var webServerPort = SocketUtils.findRandomFreePort(); final var dnsServerPort = SocketUtils.findRandomFreePort(); return writeToTempPathReplacing( - RANDOM_PORTS_NO_DEFAULT_CUSTOM_LOCAL_DB_ENTRY, webServerPort, dnsServerPort, host + RANDOM_PORTS_NO_DEFAULT_CUSTOM_LOCAL_DB_ENTRY, webServerPort, dnsServerPort, host ); } diff --git a/src/test/java/testing/templates/ConfigTemplates.java b/src/test/java/testing/templates/ConfigTemplates.java index c92f5abe2..ef0fd6516 100644 --- a/src/test/java/testing/templates/ConfigTemplates.java +++ b/src/test/java/testing/templates/ConfigTemplates.java @@ -1,75 +1,75 @@ package testing.templates; +import java.nio.file.Paths; +import java.util.List; + import com.mageddo.dnsproxyserver.config.Config; import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigEnv; import com.mageddo.dnsserver.SimpleServer; import com.mageddo.net.IP; -import java.nio.file.Paths; -import java.util.List; - public class ConfigTemplates { public static Config defaultWithoutId() { return defaultBuilder() - .build(); + .build(); } private static Config.ConfigBuilder defaultBuilder() { return Config - .builder() - .server(Config.Server - .builder() - .serverProtocol(SimpleServer.Protocol.UDP_TCP) - .webServerPort(8080) - .dnsServerPort(53) - .dnsServerNoEntriesResponseCode(3) - .build() - ) - .log(Config.Log - .builder() - .file("/tmp/dps.log") - .level(Config.Log.Level.WARNING) - .build() - ) - .defaultDns(Config.DefaultDns .builder() - .active(true) - .resolvConf(Config.DefaultDns.ResolvConf - .builder() - .paths(ConfigEnv.DEFAULT_RESOLV_CONF_PATH) - .overrideNameServers(true) - .build() + .server(Config.Server + .builder() + .serverProtocol(SimpleServer.Protocol.UDP_TCP) + .webServerPort(8080) + .dnsServerPort(53) + .dnsServerNoEntriesResponseCode(3) + .build() ) - .build() - ) - .configPath(Paths.get("/tmp/config.json")) - .version("3.0.0") - .solverRemote(Config.SolverRemote - .builder() - .active(true) - .build() - ) - .solverDocker(Config.SolverDocker - .builder() - .domain("docker") - .registerContainerNames(false) - .hostMachineFallback(true) - .dpsNetwork(Config.SolverDocker.DpsNetwork - .builder() - .autoConnect(false) - .autoCreate(false) - .build() + .log(Config.Log + .builder() + .file("/tmp/dps.log") + .level(Config.Log.Level.WARNING) + .build() ) - .build() - ) - .solverSystem(Config.SolverSystem - .builder() - .hostMachineHostname("host.docker") - .build() - ) - .source(Config.Source.TESTS_TEMPLATE) - ; + .defaultDns(Config.DefaultDns + .builder() + .active(true) + .resolvConf(Config.DefaultDns.ResolvConf + .builder() + .paths(ConfigEnv.DEFAULT_RESOLV_CONF_PATH) + .overrideNameServers(true) + .build() + ) + .build() + ) + .configPath(Paths.get("/tmp/config.json")) + .version("3.0.0") + .solverRemote(Config.SolverRemote + .builder() + .active(true) + .build() + ) + .solverDocker(Config.SolverDocker + .builder() + .domain("docker") + .registerContainerNames(false) + .hostMachineFallback(true) + .dpsNetwork(Config.SolverDocker.DpsNetwork + .builder() + .autoConnect(false) + .autoCreate(false) + .build() + ) + .build() + ) + .solverSystem(Config.SolverSystem + .builder() + .hostMachineHostname("host.docker") + .build() + ) + .source(Config.Source.TESTS_TEMPLATE) + ; } @@ -77,51 +77,52 @@ public static Config withRegisterContainerNames() { final var builder = defaultBuilder(); final var tmp = builder.build(); return builder - .solverDocker( - tmp.getSolverDocker() - .toBuilder() - .registerContainerNames(true) - .build() - ) - .build(); + .solverDocker( + tmp.getSolverDocker() + .toBuilder() + .registerContainerNames(true) + .build() + ) + .build(); } public static Config withSolverRemoteDisabled() { return defaultBuilder() - .solverRemote(Config.SolverRemote - .builder() - .active(false) - .build() - ) - .build(); + .solverRemote(Config.SolverRemote + .builder() + .active(false) + .build() + ) + .build(); } public static Config acmeSolverStub() { return defaultBuilder() - .solverStub(Config.SolverStub.builder() - .domainName("acme") - .build() - ) - .build(); + .solverStub(Config.SolverStub.builder() + .domainName("acme") + .build() + ) + .build(); } public static Config acmeSolverLocal() { return defaultBuilder() - .solverLocal(Config.SolverLocal.builder() - .activeEnv(Config.Env.DEFAULT_ENV) - .envs(List.of( - Config.Env.of("", List.of( - Config.Entry - .builder() - .hostname("acme.com") - .ip(IP.of("192.168.0.3")) - .type(Config.Entry.Type.A) - .ttl(300) - .build() - )) - )) - .build() - ) - .build(); + .solverLocal(Config.SolverLocal.builder() + .activeEnv(Config.Env.DEFAULT_ENV) + .envs(List.of( + Config.Env.of("", List.of( + Config.Entry + .builder() + .hostname("acme.com") + .ip(IP.of("192.168.0.3")) + .type(Config.Entry.Type.A) + .ttl(300) + .build() + ) + ) + )) + .build() + ) + .build(); } } diff --git a/src/test/java/testing/templates/EntryTemplates.java b/src/test/java/testing/templates/EntryTemplates.java index 907ff7012..fd468def6 100644 --- a/src/test/java/testing/templates/EntryTemplates.java +++ b/src/test/java/testing/templates/EntryTemplates.java @@ -10,32 +10,32 @@ public class EntryTemplates { public static Config.Entry a(String host) { return Config.Entry - .builder() - .hostname(host) - .ip(IP.of("10.10.0.1")) - .ttl(45) - .type(Type.A) - .build() - ; + .builder() + .hostname(host) + .ip(IP.of("10.10.0.1")) + .ttl(45) + .type(Type.A) + .build() + ; } public static Config.Entry cname(String from, String to) { return Config.Entry - .builder() - .hostname(from) - .target(to) - .ttl(45) - .type(Type.CNAME) - .build() - ; + .builder() + .hostname(from) + .target(to) + .ttl(45) + .type(Type.CNAME) + .build() + ; } public static Config.Entry aaaa(String host) { return a(host) - .toBuilder() - .type(Type.AAAA) - .ip(IP.of(IpTemplates.LOCAL_IPV6)) - .build(); + .toBuilder() + .type(Type.AAAA) + .ip(IP.of(IpTemplates.LOCAL_IPV6)) + .build(); } public static Config.Entry acmeQuadA() { diff --git a/src/test/java/testing/templates/EnvTemplates.java b/src/test/java/testing/templates/EnvTemplates.java index fbc5b2217..8a3f9e64f 100644 --- a/src/test/java/testing/templates/EnvTemplates.java +++ b/src/test/java/testing/templates/EnvTemplates.java @@ -8,49 +8,50 @@ public class EnvTemplates { public static final String MAGEDDO_COM = "mageddo.com"; public static final String MAGEDDO_COM_CAMEL_CASE = "mAgeDdo.cOm"; - public static Config.Env buildWithoutId(){ + public static Config.Env buildWithoutId() { return Config.Env.theDefault() - .add(Config.Entry - .builder() - .ip(IP.of("192.168.0.1")) - .ttl(30) - .type(Config.Entry.Type.A) - .hostname(MAGEDDO_COM) - .build() - ); + .add(Config.Entry + .builder() + .ip(IP.of("192.168.0.1")) + .ttl(30) + .type(Config.Entry.Type.A) + .hostname(MAGEDDO_COM) + .build() + ); } - public static Config.Env buildWithCamelCaseHost(){ + public static Config.Env buildWithCamelCaseHost() { return Config.Env.theDefault() - .add(Config.Entry - .builder() - .ip(IP.of("192.168.0.1")) - .ttl(30) - .type(Config.Entry.Type.A) - .hostname(MAGEDDO_COM_CAMEL_CASE) - .build() - ); + .add(Config.Entry + .builder() + .ip(IP.of("192.168.0.1")) + .ttl(30) + .type(Config.Entry.Type.A) + .hostname(MAGEDDO_COM_CAMEL_CASE) + .build() + ); } - public static Config.Env acmeQuadA(){ + + public static Config.Env acmeQuadA() { return Config.Env.theDefault() - .add(EntryTemplates.acmeQuadA()); + .add(EntryTemplates.acmeQuadA()); } - public static Config.Env acmeA(){ + public static Config.Env acmeA() { return Config.Env.theDefault() - .add(EntryTemplates.acmeA()); + .add(EntryTemplates.acmeA()); } - public static Config.Env acmeAAndQuadA(){ + public static Config.Env acmeAAndQuadA() { return Config.Env.theDefault() - .add(EntryTemplates.acmeA()) - .add(EntryTemplates.acmeQuadA()) - ; + .add(EntryTemplates.acmeA()) + .add(EntryTemplates.acmeQuadA()) + ; } public static Config.Env acmeCname() { return Config.Env.theDefault() - .add(EntryTemplates.acmeCname()) - ; + .add(EntryTemplates.acmeCname()) + ; } } diff --git a/src/test/java/testing/templates/HostnameQueryTemplates.java b/src/test/java/testing/templates/HostnameQueryTemplates.java index 9f4a845b6..f3a65ed8f 100644 --- a/src/test/java/testing/templates/HostnameQueryTemplates.java +++ b/src/test/java/testing/templates/HostnameQueryTemplates.java @@ -5,11 +5,11 @@ public class HostnameQueryTemplates { - public static HostnameQuery acmeComWildcard(){ + public static HostnameQuery acmeComWildcard() { return HostnameQuery.ofWildcard(HostnameTemplates.ACME_HOSTNAME); } - public static HostnameQuery orangeAcmeComWildcard(){ + public static HostnameQuery orangeAcmeComWildcard() { return HostnameQuery.ofWildcard(HostnameTemplates.ORANGE_ACME_HOSTNAME); } diff --git a/src/test/java/testing/templates/InetAddressTemplates.java b/src/test/java/testing/templates/InetAddressTemplates.java index 67ade7122..eb81558f5 100644 --- a/src/test/java/testing/templates/InetAddressTemplates.java +++ b/src/test/java/testing/templates/InetAddressTemplates.java @@ -1,9 +1,9 @@ package testing.templates; -import lombok.SneakyThrows; - import java.net.InetAddress; +import lombok.SneakyThrows; + public class InetAddressTemplates { @SneakyThrows diff --git a/src/test/java/testing/templates/InetSocketAddressTemplates.java b/src/test/java/testing/templates/InetSocketAddressTemplates.java index 60306865b..11a599f63 100644 --- a/src/test/java/testing/templates/InetSocketAddressTemplates.java +++ b/src/test/java/testing/templates/InetSocketAddressTemplates.java @@ -1,17 +1,17 @@ package testing.templates; +import java.net.InetSocketAddress; + import com.mageddo.dnsproxyserver.utils.Ips; import com.mageddo.net.IpAddr; import com.mageddo.net.IpAddrs; -import java.net.InetSocketAddress; - public class InetSocketAddressTemplates { - public static InetSocketAddress _8_8_8_8(){ + public static InetSocketAddress _8_8_8_8() { return new InetSocketAddress(Ips.toAddress("8.8.8.8"), 53); } - public static IpAddr _8_8_8_8_addr(){ + public static IpAddr _8_8_8_8_addr() { return IpAddrs.from(_8_8_8_8()); } @@ -22,6 +22,7 @@ public static InetSocketAddress _8_8_4_4() { public static IpAddr _1_1_1_1_addr() { return IpAddrs.from(_1_1_1_1()); } + public static InetSocketAddress _1_1_1_1() { return new InetSocketAddress(Ips.toAddress("1.1.1.1"), 53); } diff --git a/src/test/java/testing/templates/IpTemplates.java b/src/test/java/testing/templates/IpTemplates.java index 08a0fcb70..cd1f1c557 100644 --- a/src/test/java/testing/templates/IpTemplates.java +++ b/src/test/java/testing/templates/IpTemplates.java @@ -10,11 +10,11 @@ public class IpTemplates { public static final String LOCAL_192 = "192.168.0.10"; public static final String ZERO = "0.0.0.0"; - public static IP local(){ + public static IP local() { return IP.of(LOCAL); } - public static IP loopback(){ + public static IP loopback() { return IP.of("127.0.0.1"); } } diff --git a/src/test/java/testing/templates/MessageTemplates.java b/src/test/java/testing/templates/MessageTemplates.java index 6e4c854a9..220fb819b 100644 --- a/src/test/java/testing/templates/MessageTemplates.java +++ b/src/test/java/testing/templates/MessageTemplates.java @@ -1,6 +1,7 @@ package testing.templates; import com.mageddo.dns.utils.Messages; + import org.xbill.DNS.Flags; import org.xbill.DNS.Message; @@ -40,7 +41,8 @@ public static Message randomHostnameAQuery() { public static Message buildAAnswerWithoutRA(Message query) { final var answer = buildAAnswer(query); - answer.getHeader().unsetFlag(Flags.RA); + answer.getHeader() + .unsetFlag(Flags.RA); return answer; } diff --git a/src/test/java/testing/templates/NetworkInterfaceTemplates.java b/src/test/java/testing/templates/NetworkInterfaceTemplates.java index 4c74413f1..b7f8f62d4 100644 --- a/src/test/java/testing/templates/NetworkInterfaceTemplates.java +++ b/src/test/java/testing/templates/NetworkInterfaceTemplates.java @@ -1,13 +1,14 @@ package testing.templates; -import lombok.SneakyThrows; -import org.mockito.Mockito; -import org.mockito.quality.Strictness; - import java.net.InetAddress; import java.net.NetworkInterface; import java.util.stream.Stream; +import org.mockito.Mockito; +import org.mockito.quality.Strictness; + +import lombok.SneakyThrows; + import static org.mockito.Mockito.doReturn; public class NetworkInterfaceTemplates { @@ -21,34 +22,34 @@ public static Stream localAndLoopback() { @SneakyThrows static NetworkInterface buildNetworkInterface( - final boolean isLoopback, - final int index, - final InetAddress address + final boolean isLoopback, + final int index, + final InetAddress address ) { final var loopback = Mockito.mock( - NetworkInterface.class, - Mockito - .withSettings() - .strictness(Strictness.LENIENT) + NetworkInterface.class, + Mockito + .withSettings() + .strictness(Strictness.LENIENT) ); doReturn(isLoopback) - .when(loopback) - .isLoopback() + .when(loopback) + .isLoopback() ; doReturn(index) - .when(loopback) - .getIndex() + .when(loopback) + .getIndex() ; doReturn(Stream.of(address)) - .when(loopback) - .inetAddresses() + .when(loopback) + .inetAddresses() ; doReturn(true) - .when(loopback) - .isUp() + .when(loopback) + .isUp() ; return loopback; } diff --git a/src/test/java/testing/templates/ResponseTemplates.java b/src/test/java/testing/templates/ResponseTemplates.java index c2d8c11c9..e56dab995 100644 --- a/src/test/java/testing/templates/ResponseTemplates.java +++ b/src/test/java/testing/templates/ResponseTemplates.java @@ -1,17 +1,18 @@ package testing.templates; +import java.time.Duration; + import com.mageddo.dns.utils.Messages; import com.mageddo.dnsproxyserver.solver.Response; -import org.xbill.DNS.Message; -import java.time.Duration; +import org.xbill.DNS.Message; public class ResponseTemplates { public static Response to(Message query) { return Response.of(Messages.aAnswer(query, "0.0.0.0"), Duration.ofSeconds(5)); } - public static Response acmeAResponse(){ + public static Response acmeAResponse() { return to(MessageTemplates.acmeAResponse()); } diff --git a/src/test/java/testing/templates/SocketClientTemplates.java b/src/test/java/testing/templates/SocketClientTemplates.java index b3043e58c..14cb0f236 100644 --- a/src/test/java/testing/templates/SocketClientTemplates.java +++ b/src/test/java/testing/templates/SocketClientTemplates.java @@ -1,11 +1,11 @@ package testing.templates; -import com.mageddo.dnsserver.SocketClient; - import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; +import com.mageddo.dnsserver.SocketClient; + import static org.mockito.Mockito.mock; public class SocketClientTemplates { diff --git a/src/test/java/testing/templates/SolverMockTemplates.java b/src/test/java/testing/templates/SolverMockTemplates.java index e96f17b30..d50f4d631 100644 --- a/src/test/java/testing/templates/SolverMockTemplates.java +++ b/src/test/java/testing/templates/SolverMockTemplates.java @@ -1,18 +1,19 @@ package testing.templates; +import java.util.stream.Collectors; +import java.util.stream.Stream; + import com.mageddo.dnsproxyserver.solver.SolverMock; import com.mageddo.net.IP; -import org.apache.commons.lang3.tuple.Pair; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import org.apache.commons.lang3.tuple.Pair; public class SolverMockTemplates { - public static SolverMock whateverMock(String ... hostnames){ + public static SolverMock whateverMock(String... hostnames) { final var mocks = Stream - .of(hostnames) - .map(it -> Pair.of(it, IP.of("0.0.0.0"))) - .collect(Collectors.toList()); + .of(hostnames) + .map(it -> Pair.of(it, IP.of("0.0.0.0"))) + .collect(Collectors.toList()); return new SolverMock(mocks); } } diff --git a/src/test/java/testing/templates/circuitbreaker/Resilience4jCircuitBreakerTemplates.java b/src/test/java/testing/templates/circuitbreaker/Resilience4jCircuitBreakerTemplates.java index 753ef62a8..f53e879c5 100644 --- a/src/test/java/testing/templates/circuitbreaker/Resilience4jCircuitBreakerTemplates.java +++ b/src/test/java/testing/templates/circuitbreaker/Resilience4jCircuitBreakerTemplates.java @@ -1,65 +1,66 @@ package testing.templates.circuitbreaker; +import java.io.UncheckedIOException; +import java.time.Duration; + import com.mageddo.commons.circuitbreaker.CircuitCheckException; + import io.github.resilience4j.circuitbreaker.CircuitBreaker; import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig; import lombok.extern.slf4j.Slf4j; -import java.io.UncheckedIOException; -import java.time.Duration; - @Slf4j public class Resilience4jCircuitBreakerTemplates { public static CircuitBreaker theDefault() { return CircuitBreaker.of( - "defaultCircuitBreaker", - CircuitBreakerConfig - .custom() + "defaultCircuitBreaker", + CircuitBreakerConfig + .custom() - .failureRateThreshold(21f) - .minimumNumberOfCalls(100) - .permittedNumberOfCallsInHalfOpenState(10) + .failureRateThreshold(21f) + .minimumNumberOfCalls(100) + .permittedNumberOfCallsInHalfOpenState(10) - .waitDurationInOpenState(Duration.ofDays(365)) - .recordExceptions(CircuitCheckException.class) + .waitDurationInOpenState(Duration.ofDays(365)) + .recordExceptions(CircuitCheckException.class) - .build() + .build() ); } public static CircuitBreaker theDefaultHandlingIoException() { return CircuitBreaker.of( - "defaultCircuitBreaker", - CircuitBreakerConfig - .custom() + "defaultCircuitBreaker", + CircuitBreakerConfig + .custom() - .failureRateThreshold(21f) - .minimumNumberOfCalls(100) - .permittedNumberOfCallsInHalfOpenState(10) + .failureRateThreshold(21f) + .minimumNumberOfCalls(100) + .permittedNumberOfCallsInHalfOpenState(10) - .waitDurationInOpenState(Duration.ofDays(365)) - .recordExceptions(UncheckedIOException.class) + .waitDurationInOpenState(Duration.ofDays(365)) + .recordExceptions(UncheckedIOException.class) - .build() + .build() ); } public static CircuitBreaker fastFail() { return CircuitBreaker.of( - "defaultCircuitBreaker", - CircuitBreakerConfig - .custom() + "defaultCircuitBreaker", + CircuitBreakerConfig + .custom() - .failureRateThreshold(21f) - .minimumNumberOfCalls(1) - .permittedNumberOfCallsInHalfOpenState(1) + .failureRateThreshold(21f) + .minimumNumberOfCalls(1) + .permittedNumberOfCallsInHalfOpenState(1) - .waitDurationInOpenState(Duration.ofDays(365)) - .recordExceptions(CircuitCheckException.class) + .waitDurationInOpenState(Duration.ofDays(365)) + .recordExceptions(CircuitCheckException.class) - .build() + .build() ); } } diff --git a/src/test/java/testing/templates/config/ConfigEnvTemplates.java b/src/test/java/testing/templates/config/ConfigEnvTemplates.java index fdb119024..9c92faaf4 100644 --- a/src/test/java/testing/templates/config/ConfigEnvTemplates.java +++ b/src/test/java/testing/templates/config/ConfigEnvTemplates.java @@ -1,27 +1,27 @@ package testing.templates.config; -import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigEnv; - import java.nio.file.Paths; +import com.mageddo.dnsproxyserver.config.dataformat.v2.legacyenv.ConfigEnv; + public class ConfigEnvTemplates { public static ConfigEnv withConfigFilePath() { return ConfigEnv - .builder() - .configFilePath(Paths.get("some-place/config.json")) - .build(); + .builder() + .configFilePath(Paths.get("some-place/config.json")) + .build(); } public static ConfigEnv empty() { return ConfigEnv - .builder() - .build(); + .builder() + .build(); } public static ConfigEnv withStubSolverDomainName() { return ConfigEnv - .builder() - .solverStubDomainName("acme") - .build(); + .builder() + .solverStubDomainName("acme") + .build(); } } diff --git a/src/test/java/testing/templates/docker/ContainerTemplates.java b/src/test/java/testing/templates/docker/ContainerTemplates.java index 6cea3e35b..66a820d24 100644 --- a/src/test/java/testing/templates/docker/ContainerTemplates.java +++ b/src/test/java/testing/templates/docker/ContainerTemplates.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.dockerjava.api.model.Container; import com.mageddo.json.JsonUtils; + import lombok.SneakyThrows; import static testing.templates.docker.InspectContainerResponseTemplates.buildTree; @@ -25,7 +26,7 @@ public static Container buildRegularContainerCoffeeMakerCheckout() { @SneakyThrows private static Container parse(ObjectNode tree) { return JsonUtils - .instance() - .treeToValue(tree, Container.class); + .instance() + .treeToValue(tree, Container.class); } } diff --git a/src/test/java/testing/templates/docker/DockerClientTemplates.java b/src/test/java/testing/templates/docker/DockerClientTemplates.java index 66ad70b55..fd7fa56e0 100644 --- a/src/test/java/testing/templates/docker/DockerClientTemplates.java +++ b/src/test/java/testing/templates/docker/DockerClientTemplates.java @@ -1,10 +1,11 @@ package testing.templates.docker; import org.mockito.Mockito; + import testing.mocks.DockerClientStub; public class DockerClientTemplates { - public static DockerClientStub buildSpy(){ + public static DockerClientStub buildSpy() { return Mockito.spy(new DockerClientStub()); } } diff --git a/src/test/java/testing/templates/docker/EntryTemplates.java b/src/test/java/testing/templates/docker/EntryTemplates.java index bc74c5770..73cbac0bd 100644 --- a/src/test/java/testing/templates/docker/EntryTemplates.java +++ b/src/test/java/testing/templates/docker/EntryTemplates.java @@ -1,38 +1,39 @@ package testing.templates.docker; import com.mageddo.dnsproxyserver.solver.docker.Entry; -import testing.templates.IpTemplates; import com.mageddo.net.IP; +import testing.templates.IpTemplates; + public class EntryTemplates { public static Entry zeroIp() { return Entry - .builder() - .ip(IP.of(IpTemplates.ZERO)) - .hostnameMatched(true) - .build(); + .builder() + .ip(IP.of(IpTemplates.ZERO)) + .hostnameMatched(true) + .build(); } public static Entry localIpv6() { return Entry - .builder() - .hostnameMatched(true) - .ip(IP.of(IpTemplates.LOCAL_EXTENDED_IPV6)) - .build(); + .builder() + .hostnameMatched(true) + .ip(IP.of(IpTemplates.LOCAL_EXTENDED_IPV6)) + .build(); } public static Entry hostnameMatchedButNoAddress() { return Entry - .builder() - .hostnameMatched(true) - .build() - ; + .builder() + .hostnameMatched(true) + .build() + ; } public static Entry hostnameNotMatched() { return Entry - .builder() - .build() - ; + .builder() + .build() + ; } } diff --git a/src/test/java/testing/templates/docker/InspectContainerResponseTemplates.java b/src/test/java/testing/templates/docker/InspectContainerResponseTemplates.java index 25c87caf3..6ed2fb0f5 100644 --- a/src/test/java/testing/templates/docker/InspectContainerResponseTemplates.java +++ b/src/test/java/testing/templates/docker/InspectContainerResponseTemplates.java @@ -4,6 +4,7 @@ import com.github.dockerjava.api.command.InspectContainerResponse; import com.mageddo.json.JsonUtils; import com.mageddo.utils.TestUtils; + import lombok.SneakyThrows; public class InspectContainerResponseTemplates { @@ -43,17 +44,20 @@ public static InspectContainerResponse buildWithHostnameAndWithoutDomain() { return build(); } - public static InspectContainerResponse buildWithHostnameAndDomain(String hostname, String domain) { + public static InspectContainerResponse buildWithHostnameAndDomain(String hostname, + String domain) { final var tree = buildTree(NGINX); final var config = (ObjectNode) tree.at("/Config"); config.put("Hostname", hostname); config.put("Domainname", domain); return parse(tree); } + public static InspectContainerResponse buildWithHostnamesEnv(String hostname) { final var tree = buildTree(NGINX); final var config = (ObjectNode) tree.at("/Config"); - config.putArray("Env").add("HOSTNAMES=" + hostname); + config.putArray("Env") + .add("HOSTNAMES=" + hostname); return parse(tree); } @@ -97,8 +101,8 @@ private static InspectContainerResponse parse() { @SneakyThrows private static InspectContainerResponse parse(final ObjectNode tree) { return JsonUtils - .instance() - .treeToValue(tree, InspectContainerResponse.class); + .instance() + .treeToValue(tree, InspectContainerResponse.class); } static ObjectNode buildTree(final String path) { diff --git a/src/test/java/testing/templates/docker/NetworkTemplates.java b/src/test/java/testing/templates/docker/NetworkTemplates.java index 1f051219a..ae6c3aaf4 100644 --- a/src/test/java/testing/templates/docker/NetworkTemplates.java +++ b/src/test/java/testing/templates/docker/NetworkTemplates.java @@ -4,6 +4,7 @@ import com.github.dockerjava.api.model.Network; import com.mageddo.dnsproxyserver.docker.domain.Drivers; import com.mageddo.json.JsonUtils; + import lombok.SneakyThrows; import static com.mageddo.utils.TestUtils.readString; @@ -13,23 +14,23 @@ public class NetworkTemplates { @SneakyThrows public static Network withBridgeDriver(String name) { final var node = JsonNodeFactory.instance.objectNode() - .put("Name", name) - .put("Driver", Drivers.BRIDGE); + .put("Name", name) + .put("Driver", Drivers.BRIDGE); return JsonUtils - .instance() - .treeToValue(node, Network.class) - ; + .instance() + .treeToValue(node, Network.class) + ; } @SneakyThrows public static Network withOverlayDriver(String name) { final var node = JsonNodeFactory.instance.objectNode() - .put("Name", name) - .put("Driver", Drivers.OVERLAY); + .put("Name", name) + .put("Driver", Drivers.OVERLAY); return JsonUtils - .instance() - .treeToValue(node, Network.class) - ; + .instance() + .treeToValue(node, Network.class) + ; } public static Network buildBridgeIpv4AndIpv6Network() { diff --git a/src/test/java/testing/templates/docker/SolverTemplates.java b/src/test/java/testing/templates/docker/SolverTemplates.java index bf0b7390e..08d6645df 100644 --- a/src/test/java/testing/templates/docker/SolverTemplates.java +++ b/src/test/java/testing/templates/docker/SolverTemplates.java @@ -1,11 +1,11 @@ package testing.templates.docker; +import java.util.List; + import com.mageddo.dns.utils.Messages; import com.mageddo.dnsproxyserver.solver.Response; import com.mageddo.dnsproxyserver.solver.Solver; -import java.util.List; - public class SolverTemplates { public static List mockTo192() { return List.of(reqMsg -> { diff --git a/src/test/java/testing/templates/server/dns/solver/docker/ContainerNetworkTemplates.java b/src/test/java/testing/templates/server/dns/solver/docker/ContainerNetworkTemplates.java index 644722e3d..6fc33b3b9 100644 --- a/src/test/java/testing/templates/server/dns/solver/docker/ContainerNetworkTemplates.java +++ b/src/test/java/testing/templates/server/dns/solver/docker/ContainerNetworkTemplates.java @@ -1,14 +1,16 @@ package testing.templates.server.dns.solver.docker; +import java.util.stream.Stream; + import com.mageddo.dnsproxyserver.solver.docker.Container; import com.mageddo.net.IP; -import java.util.stream.Stream; - public class ContainerNetworkTemplates { - public static Container.Network build(String ... ips) { + public static Container.Network build(String... ips) { return Container.Network.builder() - .ips(Stream.of(ips).map(IP::of).toList()) - .build(); + .ips(Stream.of(ips) + .map(IP::of) + .toList()) + .build(); } } diff --git a/src/test/java/testing/templates/server/dns/solver/docker/ContainerTemplates.java b/src/test/java/testing/templates/server/dns/solver/docker/ContainerTemplates.java index c238fd311..cb7cf4568 100644 --- a/src/test/java/testing/templates/server/dns/solver/docker/ContainerTemplates.java +++ b/src/test/java/testing/templates/server/dns/solver/docker/ContainerTemplates.java @@ -1,101 +1,101 @@ package testing.templates.server.dns.solver.docker; +import java.util.Collections; +import java.util.List; +import java.util.Map; + import com.mageddo.dnsproxyserver.solver.docker.Container; import com.mageddo.dnsproxyserver.solver.docker.application.DpsContainerService; import com.mageddo.net.IP; import com.mageddo.utils.Sets; -import java.util.Collections; -import java.util.List; -import java.util.Map; - public class ContainerTemplates { public static Container dpsContainer() { return builder() - .preferredNetworkNames(Sets.ordered("shibata", "dps", "bridge")) - .networks(Map.of( - "dps", ContainerNetworkTemplates.build(DpsContainerService.DPS_CONTAINER_IP), - "shibata", ContainerNetworkTemplates.build("172.23.0.2"), - "bridge", ContainerNetworkTemplates.build("172.17.0.4") - )) - .ips(List.of(IP.of("172.17.0.5"))) - .build(); + .preferredNetworkNames(Sets.ordered("shibata", "dps", "bridge")) + .networks(Map.of( + "dps", ContainerNetworkTemplates.build(DpsContainerService.DPS_CONTAINER_IP), + "shibata", ContainerNetworkTemplates.build("172.23.0.2"), + "bridge", ContainerNetworkTemplates.build("172.17.0.4") + )) + .ips(List.of(IP.of("172.17.0.5"))) + .build(); } public static Container withDpsLabel() { return builder() - .preferredNetworkNames(Sets.ordered("shibata", "dps", "bridge")) - .networks(Map.of( - "dps", ContainerNetworkTemplates.build("172.157.5.3"), - "shibata", ContainerNetworkTemplates.build("172.23.0.2"), - "bridge", ContainerNetworkTemplates.build("172.17.0.4") - )) - .ips(List.of(IP.of("172.17.0.5"))) - .build(); + .preferredNetworkNames(Sets.ordered("shibata", "dps", "bridge")) + .networks(Map.of( + "dps", ContainerNetworkTemplates.build("172.157.5.3"), + "shibata", ContainerNetworkTemplates.build("172.23.0.2"), + "bridge", ContainerNetworkTemplates.build("172.17.0.4") + )) + .ips(List.of(IP.of("172.17.0.5"))) + .build(); } public static Container withDefaultBridgeNetworkOnly() { return builder() - .networks(Map.of( - "bridge", ContainerNetworkTemplates.build("172.17.0.4") - )) - .ips(List.of(IP.of("172.17.0.5"))) - .build(); + .networks(Map.of( + "bridge", ContainerNetworkTemplates.build("172.17.0.4") + )) + .ips(List.of(IP.of("172.17.0.5"))) + .build(); } public static Container withCustomBridgeAndOverlayNetwork() { return builder() - .networks(Map.of( - "shibata", ContainerNetworkTemplates.build("172.23.0.2"), - "custom-bridge", ContainerNetworkTemplates.build("172.17.0.8") - )) - .build(); + .networks(Map.of( + "shibata", ContainerNetworkTemplates.build("172.23.0.2"), + "custom-bridge", ContainerNetworkTemplates.build("172.17.0.8") + )) + .build(); } public static Container withIpv6DefaultBridgeNetworkOnly() { return builder() - .networks(Map.of( - "bridge", ContainerNetworkTemplates.build("172.17.0.4", "2001:db8:abc1::242:ac11:4") - )) - .ips(IP.listOf("172.17.0.4", "2001:db8:abc1::242:ac11:4")) - .build(); + .networks(Map.of( + "bridge", ContainerNetworkTemplates.build("172.17.0.4", "2001:db8:abc1::242:ac11:4") + )) + .ips(IP.listOf("172.17.0.4", "2001:db8:abc1::242:ac11:4")) + .build(); } public static Container withIpv6CustomBridgeNetwork() { return builder() - .networks(Map.of( - "my-net1", ContainerNetworkTemplates.build("172.21.0.2", "2001:db8:1::2") - )) - .build(); + .networks(Map.of( + "my-net1", ContainerNetworkTemplates.build("172.21.0.2", "2001:db8:1::2") + )) + .build(); } public static Container withDefaultIpv6Only() { return builder() - .networks(Map.of( - "my-net1", ContainerNetworkTemplates.build("172.21.0.2") - )) - .ips(IP.listOf("2001:db8:1:0:0:0:0:2")) - .build(); + .networks(Map.of( + "my-net1", ContainerNetworkTemplates.build("172.21.0.2") + )) + .ips(IP.listOf("2001:db8:1:0:0:0:0:2")) + .build(); } public static Container withIpv4DefaultBridgeAndIpv6CustomBridgeNetwork() { return builder() - .networks(Map.of( - "bridge", ContainerNetworkTemplates.build("172.17.0.4"), - "my-net1", ContainerNetworkTemplates.build("172.21.0.2", "2001:db8:1::2") - )) - .ips(Collections.emptyList()) - .build(); + .networks(Map.of( + "bridge", ContainerNetworkTemplates.build("172.17.0.4"), + "my-net1", ContainerNetworkTemplates.build("172.21.0.2", "2001:db8:1::2") + )) + .ips(Collections.emptyList()) + .build(); } private static Container.ContainerBuilder builder() { return Container.builder() - .id("ccb1becce0235218556b8de161d54383782f0ac6de5f83eff88d4c360068c536") - .name("/laughing_swanson") - .preferredNetworkNames(Sets.ordered("dps", "bridge")) - ; + .id("ccb1becce0235218556b8de161d54383782f0ac6de5f83eff88d4c360068c536") + .name("/laughing_swanson") + .preferredNetworkNames(Sets.ordered("dps", "bridge")) + ; } } diff --git a/src/test/java/testing/templates/server/dns/solver/docker/NetworkTemplates.java b/src/test/java/testing/templates/server/dns/solver/docker/NetworkTemplates.java index 3be8cd461..e0adbe95f 100644 --- a/src/test/java/testing/templates/server/dns/solver/docker/NetworkTemplates.java +++ b/src/test/java/testing/templates/server/dns/solver/docker/NetworkTemplates.java @@ -1,64 +1,64 @@ package testing.templates.server.dns.solver.docker; +import java.util.Collections; + import com.mageddo.dnsproxyserver.docker.domain.Drivers; import com.mageddo.dnsproxyserver.solver.docker.Network; import com.mageddo.net.IP; -import java.util.Collections; - public class NetworkTemplates { public static Network withOverlayDriver(String name) { return builder() - .name(name) - .driver(Drivers.OVERLAY) - .build() - ; + .name(name) + .driver(Drivers.OVERLAY) + .build() + ; } public static Network withBridgeDriver(String name) { return builder() - .name(name) - .driver(Drivers.BRIDGE) - .build() - ; + .name(name) + .driver(Drivers.BRIDGE) + .build() + ; } public static Network withBridgeIpv4AndIpv6Network() { return builder() - .name("my-net1") - .driver(Drivers.BRIDGE) - .gateways(IP.listOf("2001:db8:1::1", "172.21.0.1")) - .ipv6Active(true) - .build() - ; + .name("my-net1") + .driver(Drivers.BRIDGE) + .gateways(IP.listOf("2001:db8:1::1", "172.21.0.1")) + .ipv6Active(true) + .build() + ; } public static Network withOverlayIpv4AndIpv6Network() { return builder() - .name("overlay-net1") - .driver(Drivers.OVERLAY) - .gateways(IP.listOf("2001:db4:1::1", "172.24.0.1")) - .ipv6Active(true) - .build() - ; + .name("overlay-net1") + .driver(Drivers.OVERLAY) + .gateways(IP.listOf("2001:db4:1::1", "172.24.0.1")) + .ipv6Active(true) + .build() + ; } public static Network withHostDriverWithoutIps() { return builder() - .name("host") - .driver(Drivers.HOST) - .gateways(Collections.emptyList()) - .ipv6Active(false) - .build() - ; + .name("host") + .driver(Drivers.HOST) + .gateways(Collections.emptyList()) + .ipv6Active(false) + .build() + ; } static Network.NetworkBuilder builder() { return Network.builder() - .gateways(Collections.emptyList()) - ; + .gateways(Collections.emptyList()) + ; } } diff --git a/src/test/java/testing/templates/solver/remote/CircuitBreakerDelegateTemplates.java b/src/test/java/testing/templates/solver/remote/CircuitBreakerDelegateTemplates.java index d57157898..09fa4c3b5 100644 --- a/src/test/java/testing/templates/solver/remote/CircuitBreakerDelegateTemplates.java +++ b/src/test/java/testing/templates/solver/remote/CircuitBreakerDelegateTemplates.java @@ -8,7 +8,7 @@ public class CircuitBreakerDelegateTemplates { public static CircuitBreakerDelegate buildCanaryRateThreshold() { return new CircuitBreakerDelegateSelfObservable( - new CircuitBreakerDelegateNonResilient(), new HealthCheckerStatic(true) + new CircuitBreakerDelegateNonResilient(), new HealthCheckerStatic(true) ); } } diff --git a/src/test/java/testing/templates/solver/remote/FailSafeCircuitBreakerTemplates.java b/src/test/java/testing/templates/solver/remote/FailSafeCircuitBreakerTemplates.java index 7c98a7075..a5b65d024 100644 --- a/src/test/java/testing/templates/solver/remote/FailSafeCircuitBreakerTemplates.java +++ b/src/test/java/testing/templates/solver/remote/FailSafeCircuitBreakerTemplates.java @@ -1,27 +1,28 @@ package testing.templates.solver.remote; +import java.time.Duration; + import com.mageddo.commons.circuitbreaker.CircuitCheckException; import com.mageddo.dnsproxyserver.solver.remote.Result; -import dev.failsafe.CircuitBreaker; -import java.time.Duration; +import dev.failsafe.CircuitBreaker; public class FailSafeCircuitBreakerTemplates { public static CircuitBreaker buildDefault() { return CircuitBreaker.builder() - .handle(CircuitCheckException.class) - .withFailureThreshold(1) - .withSuccessThreshold(2) - .build(); + .handle(CircuitCheckException.class) + .withFailureThreshold(1) + .withSuccessThreshold(2) + .build(); } public static CircuitBreaker fastCircuit() { return CircuitBreaker.builder() - .handle(CircuitCheckException.class) - .withFailureThreshold(1) - .withSuccessThreshold(1) - .withDelay(Duration.ofMillis(50)) - .build(); + .handle(CircuitCheckException.class) + .withFailureThreshold(1) + .withSuccessThreshold(1) + .withDelay(Duration.ofMillis(50)) + .build(); } public static CircuitBreaker fastOpenCircuit() { diff --git a/src/test/java/testing/templates/solver/remote/RemoteResolversTemplates.java b/src/test/java/testing/templates/solver/remote/RemoteResolversTemplates.java index 563f04423..2ceef4c00 100644 --- a/src/test/java/testing/templates/solver/remote/RemoteResolversTemplates.java +++ b/src/test/java/testing/templates/solver/remote/RemoteResolversTemplates.java @@ -1,9 +1,9 @@ package testing.templates.solver.remote; -import com.mageddo.dnsproxyserver.solver.Resolver; - import java.util.List; +import com.mageddo.dnsproxyserver.solver.Resolver; + public class RemoteResolversTemplates { public static List buildSuccessAnswerResolverStub() { diff --git a/src/test/java/testing/templates/solver/remote/RequestTemplates.java b/src/test/java/testing/templates/solver/remote/RequestTemplates.java index 68ad1831a..749b2e650 100644 --- a/src/test/java/testing/templates/solver/remote/RequestTemplates.java +++ b/src/test/java/testing/templates/solver/remote/RequestTemplates.java @@ -2,7 +2,9 @@ import com.mageddo.dnsproxyserver.solver.remote.Request; import com.mageddo.dnsproxyserver.solver.remote.mapper.ResolverMapper; + import org.apache.commons.lang3.time.StopWatch; + import testing.templates.InetSocketAddressTemplates; import testing.templates.MessageTemplates; @@ -11,11 +13,11 @@ public static Request buildDefault() { final var stopWatch = StopWatch.createStarted(); stopWatch.split(); return Request - .builder() - .query(MessageTemplates.acmeAQuery()) - .resolver(ResolverMapper.from(InetSocketAddressTemplates._8_8_8_8())) - .resolverIndex(0) - .stopWatch(stopWatch) - .build(); + .builder() + .query(MessageTemplates.acmeAQuery()) + .resolver(ResolverMapper.from(InetSocketAddressTemplates._8_8_8_8())) + .resolverIndex(0) + .stopWatch(stopWatch) + .build(); } } diff --git a/src/test/java/testing/templates/solver/remote/ResolverTemplates.java b/src/test/java/testing/templates/solver/remote/ResolverTemplates.java index 7d7dd7cef..938ad316f 100644 --- a/src/test/java/testing/templates/solver/remote/ResolverTemplates.java +++ b/src/test/java/testing/templates/solver/remote/ResolverTemplates.java @@ -1,14 +1,15 @@ package testing.templates.solver.remote; +import java.util.List; +import java.util.concurrent.Executor; + import com.mageddo.dnsproxyserver.solver.Resolver; import com.mageddo.dnsproxyserver.solver.SimpleResolver; + import lombok.SneakyThrows; import testing.templates.InetSocketAddressTemplates; import testing.templates.MessageTemplates; -import java.util.List; -import java.util.concurrent.Executor; - import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; @@ -22,16 +23,16 @@ public static Resolver successAAcmeAnswer() { final var resolver = new SimpleResolver(); doReturn(MessageTemplates.acmeAResponse()) - .when(resolver) - .send(any()); + .when(resolver) + .send(any()); ; doReturn(MessageTemplates.acmeAResponse()) - .when(resolver) - .sendAsync(any()) + .when(resolver) + .sendAsync(any()) ; doReturn(MessageTemplates.acmeAResponse()) - .when(resolver) - .sendAsync(any(), any(Executor.class)); + .when(resolver) + .sendAsync(any(), any(Executor.class)); ; return resolver; } diff --git a/src/test/java/testing/templates/solver/remote/ResultSupplierTemplates.java b/src/test/java/testing/templates/solver/remote/ResultSupplierTemplates.java index 422cc02a4..ada56f8c7 100644 --- a/src/test/java/testing/templates/solver/remote/ResultSupplierTemplates.java +++ b/src/test/java/testing/templates/solver/remote/ResultSupplierTemplates.java @@ -1,11 +1,11 @@ package testing.templates.solver.remote; -import com.mageddo.commons.circuitbreaker.CircuitCheckException; -import com.mageddo.dnsproxyserver.solver.remote.Result; - import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; +import com.mageddo.commons.circuitbreaker.CircuitCheckException; +import com.mageddo.dnsproxyserver.solver.remote.Result; + public class ResultSupplierTemplates { public static Supplier alwaysFail() { return () -> { diff --git a/src/test/java/testing/templates/solver/remote/ResultTemplates.java b/src/test/java/testing/templates/solver/remote/ResultTemplates.java index ef84c185c..2c04b3424 100644 --- a/src/test/java/testing/templates/solver/remote/ResultTemplates.java +++ b/src/test/java/testing/templates/solver/remote/ResultTemplates.java @@ -1,21 +1,22 @@ package testing.templates.solver.remote; import com.mageddo.dnsproxyserver.solver.remote.Result; + import testing.templates.MessageTemplates; import testing.templates.ResponseTemplates; public class ResultTemplates { public static Result success() { return Result - .builder() - .successResponse(ResponseTemplates.acmeAResponse()) - .build(); + .builder() + .successResponse(ResponseTemplates.acmeAResponse()) + .build(); } public static Result error() { return Result - .builder() - .errorMessage(MessageTemplates.acmeNxDomain()) - .build(); + .builder() + .errorMessage(MessageTemplates.acmeNxDomain()) + .build(); } }