From e84eb92ddfc63579427d08bedb89afc792ad9235 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Apr 2025 08:24:01 +0000 Subject: [PATCH 1/2] Bump org.apache.maven:maven-parent from 42 to 44 Bumps [org.apache.maven:maven-parent](https://github.com/apache/maven-parent) from 42 to 44. - [Release notes](https://github.com/apache/maven-parent/releases) - [Commits](https://github.com/apache/maven-parent/commits/v44) --- updated-dependencies: - dependency-name: org.apache.maven:maven-parent dependency-version: '44' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4239fdba3..68af2ad93 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.maven maven-parent - 42 + 44 From 581facb070b661f04e5b17250931a924ca8ddda3 Mon Sep 17 00:00:00 2001 From: Slawomir Jaranowski Date: Mon, 28 Apr 2025 20:43:34 +0200 Subject: [PATCH 2/2] Fix checkstyle --- ...ForwardingRepositorySystemSessionTest.java | 2 +- .../AbstractRepositoryListenerTest.java | 2 +- .../aether/DefaultRepositoryCacheTest.java | 7 +- .../aether/DefaultSessionDataTest.java | 9 +- .../aether/RepositoryExceptionTest.java | 32 ++--- .../org/eclipse/aether/RequestTraceTest.java | 3 +- .../aether/artifact/DefaultArtifactTest.java | 5 +- .../eclipse/aether/graph/DependencyTest.java | 4 +- .../repository/AuthenticationContextTest.java | 21 +-- .../repository/AuthenticationDigestTest.java | 13 +- .../RemoteRepositoryBuilderTest.java | 3 +- .../repository/RemoteRepositoryTest.java | 2 +- .../AbstractTransferListenerTest.java | 2 +- .../aether/transfer/TransferEventTest.java | 4 +- .../basic/ChecksumCalculatorTest.java | 4 +- .../basic/ChecksumValidatorTest.java | 43 +++--- .../basic/TestChecksumAlgorithmSelector.java | 2 +- .../maven-resolver-demo-maven-plugin/pom.xml | 1 + .../examples/resolver/ResolverDemo.java | 2 +- .../impl/DefaultServiceLocatorTest.java | 6 +- .../aether/impl/guice/AetherModuleTest.java | 2 +- .../impl/DefaultArtifactResolverTest.java | 8 +- .../DefaultChecksumPolicyProviderTest.java | 14 +- .../impl/DefaultFileProcessorTest.java | 3 +- .../impl/DefaultMetadataResolverTest.java | 7 +- .../impl/DefaultOfflineControllerTest.java | 12 +- .../DefaultRemoteRepositoryManagerTest.java | 10 +- .../DefaultRepositoryEventDispatcherTest.java | 5 +- .../impl/DefaultRepositorySystemTest.java | 4 +- .../impl/DefaultTrackingFileManagerTest.java | 5 +- .../impl/DefaultUpdateCheckManagerTest.java | 13 +- .../impl/DefaultUpdatePolicyAnalyzerTest.java | 28 ++-- .../EnhancedLocalRepositoryManagerTest.java | 6 +- .../internal/impl/FailChecksumPolicyTest.java | 5 +- .../Maven2RepositoryLayoutFactoryTest.java | 46 +++--- .../impl/PrioritizedComponentTest.java | 4 +- .../impl/PrioritizedComponentsTest.java | 6 +- .../impl/RecordingRepositoryConnector.java | 8 +- .../impl/SafeTransferListenerTest.java | 2 +- .../SimpleLocalRepositoryManagerTest.java | 4 +- .../impl/StaticUpdateCheckManager.java | 4 +- .../impl/StubRepositoryConnectorProvider.java | 4 +- .../internal/impl/WarnChecksumPolicyTest.java | 4 +- ...ependencyCollectorDelegateTestSupport.java | 8 +- .../collect/bf/BfDependencyCollectorTest.java | 1 + .../aether/internal/impl/filter/Filters.java | 1 + ...oupIdRemoteRepositoryFilterSourceTest.java | 3 +- .../NamedLockFactoryAdapterTestSupport.java | 7 +- .../named/BasedirNameMapperTest.java | 2 +- .../named/HashingNameMapperTest.java | 12 +- .../HazelcastCPSemaphoreAdapterIT.java | 4 +- ...azelcastCPSemaphoreNamedLockFactoryIT.java | 4 +- .../HazelcastClientCPSemaphoreAdapterIT.java | 6 +- ...stClientCPSemaphoreNamedLockFactoryIT.java | 6 +- .../NamedLockFactoryAdapterTestSupport.java | 6 +- .../NamedLockFactoryTestSupport.java | 6 +- .../named/NamedLockFactoryTestSupport.java | 7 +- .../layout/ChecksumLocationTest.java | 12 +- .../test/util/DependencyGraphParserTest.java | 6 +- .../test/util/IniArtifactDataReaderTest.java | 5 +- .../util/IniArtifactDescriptorReaderTest.java | 4 +- .../test/util/NodeDefinitionTest.java | 9 +- .../classpath/ClasspathTransporterTest.java | 52 +++---- .../classpath/RecordingTransportListener.java | 1 + .../transport/file/FileTransporterTest.java | 75 +++++----- .../file/RecordingTransportListener.java | 1 + .../aether/transport/http/HttpServer.java | 5 +- .../transport/http/HttpTransporterTest.java | 132 +++++++++--------- .../http/RecordingTransportListener.java | 1 + .../aether/transport/http/UriUtilsTest.java | 16 +-- .../wagon/AbstractWagonTransporterTest.java | 56 ++++---- .../aether/transport/wagon/MemWagonUtils.java | 6 +- .../wagon/RecordingTransportListener.java | 1 + .../graph/transformer/ConflictResolver.java | 13 +- .../eclipse/aether/util/ChecksumUtilTest.java | 7 +- .../eclipse/aether/util/ConfigUtilsTest.java | 53 +++---- .../eclipse/aether/util/StringUtilsTest.java | 3 +- .../util/artifact/ArtifactIdUtilsTest.java | 5 +- .../aether/util/artifact/SubArtifactTest.java | 6 +- .../util/filter/AndDependencyFilterTest.java | 4 +- .../filter/DependencyFilterUtilsTest.java | 5 +- .../filter/ExclusionDependencyFilterTest.java | 3 +- .../util/filter/OrDependencyFilterTest.java | 4 +- ...PatternExclusionsDependencyFilterTest.java | 3 +- ...PatternInclusionsDependencyFilterTest.java | 3 +- .../filter/ScopeDependencyFilterTest.java | 3 +- .../manager/ClassicDependencyManagerTest.java | 12 +- .../selector/AndDependencySelectorTest.java | 20 ++- .../ExclusionDependencySelectorTest.java | 2 +- .../OptionalDependencySelectorTest.java | 2 +- .../selector/ScopeDependencySelectorTest.java | 2 +- .../StaticDependencySelectorTest.java | 2 +- ...bstractDependencyGraphTransformerTest.java | 2 +- .../transformer/ConflictIdSorterTest.java | 5 +- .../graph/transformer/ConflictMarkerTest.java | 6 +- .../JavaDependencyContextRefinerTest.java | 2 +- .../transformer/JavaScopeSelectorTest.java | 3 +- .../NearestVersionSelectorTest.java | 4 +- .../util/graph/transformer/RootQueueTest.java | 4 +- .../SimpleOptionalitySelectorTest.java | 9 +- .../traverser/AndDependencyTraverserTest.java | 20 ++- .../traverser/FatArtifactTraverserTest.java | 6 +- .../StaticDependencyTraverserTest.java | 6 +- .../versions/AbstractVersionFilterTest.java | 3 +- .../versions/ChainedVersionFilterTest.java | 4 +- .../ContextualSnapshotVersionFilterTest.java | 5 +- .../versions/HighestVersionFilterTest.java | 4 +- .../versions/SnapshotVersionFilterTest.java | 4 +- .../FilteringDependencyVisitorTest.java | 2 +- .../PathRecordingDependencyVisitorTest.java | 12 +- .../PostorderNodeListGeneratorTest.java | 2 - .../PreorderNodeListGeneratorTest.java | 2 - .../visitor/TreeDependencyVisitorTest.java | 2 +- .../ChainedRepositoryListenerTest.java | 2 +- .../listener/ChainedTransferListenerTest.java | 2 +- .../ComponentAuthenticationTest.java | 5 +- .../repository/DefaultProxySelectorTest.java | 13 +- .../util/repository/JreProxySelectorTest.java | 16 ++- .../repository/SecretAuthenticationTest.java | 7 +- .../repository/StringAuthenticationTest.java | 4 +- .../util/version/GenericVersionRangeTest.java | 5 +- .../version/GenericVersionSchemeTest.java | 5 +- .../util/version/UnionVersionRangeTest.java | 4 +- 123 files changed, 676 insertions(+), 472 deletions(-) diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java index 1dd24ed66..864b274d7 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java @@ -22,7 +22,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class AbstractForwardingRepositorySystemSessionTest { diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java index 39302e93e..616bf6956 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java index 596900451..5dbc861e2 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java @@ -23,7 +23,8 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class DefaultRepositoryCacheTest { @@ -40,12 +41,12 @@ private void put(Object key, Object value) { } @Test(expected = RuntimeException.class) - public void testGet_NullKey() { + public void testGetNullKey() { get(null); } @Test(expected = RuntimeException.class) - public void testPut_NullKey() { + public void testPutNullKey() { put(null, "data"); } diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java index f59eaaab9..13aad33ed 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java @@ -24,7 +24,10 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class DefaultSessionDataTest { @@ -47,12 +50,12 @@ private Object computeIfAbsent(Object key, Supplier supplier) { } @Test(expected = RuntimeException.class) - public void testGet_NullKey() { + public void testGetNullKey() { get(null); } @Test(expected = RuntimeException.class) - public void testSet_NullKey() { + public void testSetNullKey() { set(null, "data"); } diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java index 0b4e993fc..8c9edef11 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java @@ -96,7 +96,7 @@ private RemoteRepository newRepo() { } @Test - public void testArtifactDescriptorException_Serializable() { + public void testArtifactDescriptorExceptionSerializable() { ArtifactDescriptorRequest request = new ArtifactDescriptorRequest(); request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace()); ArtifactDescriptorResult result = new ArtifactDescriptorResult(request); @@ -104,7 +104,7 @@ public void testArtifactDescriptorException_Serializable() { } @Test - public void testArtifactResolutionException_Serializable() { + public void testArtifactResolutionExceptionSerializable() { ArtifactRequest request = new ArtifactRequest(); request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace()); ArtifactResult result = new ArtifactResult(request); @@ -112,17 +112,17 @@ public void testArtifactResolutionException_Serializable() { } @Test - public void testArtifactTransferException_Serializable() { + public void testArtifactTransferExceptionSerializable() { assertSerializable(new ArtifactTransferException(newArtifact(), newRepo(), "error")); } @Test - public void testArtifactNotFoundException_Serializable() { + public void testArtifactNotFoundExceptionSerializable() { assertSerializable(new ArtifactNotFoundException(newArtifact(), newRepo(), "error")); } @Test - public void testDependencyCollectionException_Serializable() { + public void testDependencyCollectionExceptionSerializable() { CollectRequest request = new CollectRequest(); request.addDependency(new Dependency(newArtifact(), "compile")); request.addRepository(newRepo()); @@ -132,7 +132,7 @@ public void testDependencyCollectionException_Serializable() { } @Test - public void testDependencyResolutionException_Serializable() { + public void testDependencyResolutionExceptionSerializable() { CollectRequest request = new CollectRequest(); request.addDependency(new Dependency(newArtifact(), "compile")); request.addRepository(newRepo()); @@ -145,48 +145,48 @@ public void testDependencyResolutionException_Serializable() { } @Test - public void testMetadataTransferException_Serializable() { + public void testMetadataTransferExceptionSerializable() { assertSerializable(new MetadataTransferException(newMetadata(), newRepo(), "error")); } @Test - public void testMetadataNotFoundException_Serializable() { + public void testMetadataNotFoundExceptionSerializable() { assertSerializable(new MetadataNotFoundException(newMetadata(), newRepo(), "error")); } @Test - public void testNoLocalRepositoryManagerException_Serializable() { + public void testNoLocalRepositoryManagerExceptionSerializable() { assertSerializable(new NoLocalRepositoryManagerException(new LocalRepository("/tmp"))); } @Test - public void testNoRepositoryConnectorException_Serializable() { + public void testNoRepositoryConnectorExceptionSerializable() { assertSerializable(new NoRepositoryConnectorException(newRepo())); } @Test - public void testNoRepositoryLayoutException_Serializable() { + public void testNoRepositoryLayoutExceptionSerializable() { assertSerializable(new NoRepositoryLayoutException(newRepo())); } @Test - public void testNoTransporterException_Serializable() { + public void testNoTransporterExceptionSerializable() { assertSerializable(new NoTransporterException(newRepo())); } @Test - public void testRepositoryOfflineException_Serializable() { + public void testRepositoryOfflineExceptionSerializable() { assertSerializable(new RepositoryOfflineException(newRepo())); } @Test - public void testUnsolvableVersionConflictException_Serializable() { + public void testUnsolvableVersionConflictExceptionSerializable() { DependencyNode node = new DefaultDependencyNode(new Dependency(newArtifact(), "test")); assertSerializable(new UnsolvableVersionConflictException(Collections.singleton(Arrays.asList(node)))); } @Test - public void testVersionResolutionException_Serializable() { + public void testVersionResolutionExceptionSerializable() { VersionRequest request = new VersionRequest(); request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace()); VersionResult result = new VersionResult(request); @@ -194,7 +194,7 @@ public void testVersionResolutionException_Serializable() { } @Test - public void testVersionRangeResolutionException_Serializable() { + public void testVersionRangeResolutionExceptionSerializable() { VersionRangeRequest request = new VersionRangeRequest(); request.setArtifact(newArtifact()).addRepository(newRepo()).setTrace(newTrace()); VersionRangeResult result = new VersionRangeResult(request); diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java index 80e6a7813..20f1679c2 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/RequestTraceTest.java @@ -20,7 +20,8 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java index d8e02bfbc..47bab2086 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java @@ -25,7 +25,10 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java index 97178d258..af8001dd6 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java @@ -24,7 +24,9 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java index 18d26fceb..96864ae56 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java @@ -25,7 +25,12 @@ import org.eclipse.aether.RepositorySystemSession; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; public class AuthenticationContextTest { @@ -74,7 +79,7 @@ public void testForRepository() { } @Test - public void testForRepository_NoAuth() { + public void testForRepositoryNoAuth() { RepositorySystemSession session = newSession(); RemoteRepository repo = newRepo(null, newProxy(newAuth())); AuthenticationContext context = AuthenticationContext.forRepository(session, repo); @@ -96,7 +101,7 @@ public void testForProxy() { } @Test - public void testForProxy_NoProxy() { + public void testForProxyNoProxy() { RepositorySystemSession session = newSession(); Proxy proxy = null; RemoteRepository repo = newRepo(newAuth(), proxy); @@ -105,7 +110,7 @@ public void testForProxy_NoProxy() { } @Test - public void testForProxy_NoProxyAuth() { + public void testForProxyNoProxyAuth() { RepositorySystemSession session = newSession(); Proxy proxy = newProxy(null); RemoteRepository repo = newRepo(newAuth(), proxy); @@ -114,7 +119,7 @@ public void testForProxy_NoProxyAuth() { } @Test - public void testGet_StringVsChars() { + public void testGetStringVsChars() { AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null)); context.put("key", new char[] {'v', 'a', 'l', '1'}); assertEquals("val1", context.get("key")); @@ -123,7 +128,7 @@ public void testGet_StringVsChars() { } @Test - public void testGet_StringVsFile() { + public void testGetStringVsFile() { AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null)); context.put("key", "val1"); assertEquals(new File("val1"), context.get("key", File.class)); @@ -132,7 +137,7 @@ public void testGet_StringVsFile() { } @Test - public void testPut_EraseCharArrays() { + public void testPutEraseCharArrays() { AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null)); char[] secret = {'v', 'a', 'l', 'u', 'e'}; context.put("key", secret); @@ -141,7 +146,7 @@ public void testPut_EraseCharArrays() { } @Test - public void testClose_EraseCharArrays() { + public void testCloseEraseCharArrays() { AuthenticationContext.close(null); AuthenticationContext context = AuthenticationContext.forRepository(newSession(), newRepo(newAuth(), null)); diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java index edad59de0..35b30a445 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java @@ -24,7 +24,12 @@ import org.eclipse.aether.RepositorySystemSession; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class AuthenticationDigestTest { @@ -77,7 +82,7 @@ public void digest(AuthenticationDigest digest) { } @Test - public void testForRepository_NoAuth() { + public void testForRepositoryNoAuth() { RemoteRepository repo = newRepo(null, null); String digest = AuthenticationDigest.forRepository(newSession(), repo); @@ -118,7 +123,7 @@ public void digest(AuthenticationDigest digest) { } @Test - public void testForProxy_NoProxy() { + public void testForProxyNoProxy() { RemoteRepository repo = newRepo(null, null); String digest = AuthenticationDigest.forProxy(newSession(), repo); @@ -126,7 +131,7 @@ public void testForProxy_NoProxy() { } @Test - public void testForProxy_NoProxyAuth() { + public void testForProxyNoProxyAuth() { RemoteRepository repo = newRepo(null, newProxy(null)); String digest = AuthenticationDigest.forProxy(newSession(), repo); diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java index d76fcb8e3..875bc4617 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java @@ -27,7 +27,8 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; public class RemoteRepositoryBuilderTest { diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java index 2f50b7944..e95d22738 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java @@ -20,7 +20,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java index dc9fce91e..91b4ff546 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java index ddf5f1727..ff0226f33 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java @@ -24,7 +24,9 @@ import org.eclipse.aether.RepositorySystemSession; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java index ea6c37626..f4b561a71 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java @@ -35,7 +35,9 @@ import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA1; import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA256; import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA512; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class ChecksumCalculatorTest { diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java index 4718f6b8a..b656ebcab 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java +++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java @@ -40,7 +40,10 @@ import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.MD5; import static org.eclipse.aether.connector.basic.TestChecksumAlgorithmSelector.SHA1; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class ChecksumValidatorTest { @@ -155,18 +158,18 @@ private static URI toUri(String algo) { private File dataFile; - private static final TestChecksumAlgorithmSelector selector = new TestChecksumAlgorithmSelector(); + private static final TestChecksumAlgorithmSelector SELECTOR = new TestChecksumAlgorithmSelector(); private List newChecksumAlgorithmFactories(String... factories) { List checksums = new ArrayList<>(); for (String factory : factories) { - checksums.add(selector.select(factory)); + checksums.add(SELECTOR.select(factory)); } return checksums; } private static RepositoryLayout.ChecksumLocation newChecksum(String factory) { - return RepositoryLayout.ChecksumLocation.forLocation(URI.create("file"), selector.select(factory)); + return RepositoryLayout.ChecksumLocation.forLocation(URI.create("file"), SELECTOR.select(factory)); } private List newChecksums( @@ -217,7 +220,7 @@ public void init() throws Exception { } @Test - public void testValidate_NullPolicy() throws Exception { + public void testValidateNullPolicy() throws Exception { policy = null; ChecksumValidator validator = newValidator(SHA1); validator.validate(checksums(SHA1, "ignored"), null); @@ -225,7 +228,7 @@ public void testValidate_NullPolicy() throws Exception { } @Test - public void testValidate_AcceptOnFirstMatch() throws Exception { + public void testValidateAcceptOnFirstMatch() throws Exception { ChecksumValidator validator = newValidator(SHA1); fetcher.mock(SHA1, "foo"); validator.validate(checksums(SHA1, "foo"), null); @@ -234,7 +237,7 @@ public void testValidate_AcceptOnFirstMatch() throws Exception { } @Test - public void testValidate_FailOnFirstMismatch() { + public void testValidateFailOnFirstMismatch() { ChecksumValidator validator = newValidator(SHA1); fetcher.mock(SHA1, "foo"); try { @@ -251,7 +254,7 @@ public void testValidate_FailOnFirstMismatch() { } @Test - public void testValidate_AcceptOnEnd() throws Exception { + public void testValidateAcceptOnEnd() throws Exception { policy.inspectAll = true; ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(SHA1, "foo"); @@ -262,7 +265,7 @@ public void testValidate_AcceptOnEnd() throws Exception { } @Test - public void testValidate_FailOnEnd() { + public void testValidateFailOnEnd() { policy.inspectAll = true; ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(SHA1, "foo"); @@ -281,7 +284,7 @@ public void testValidate_FailOnEnd() { } @Test - public void testValidate_IncludedBeforeExternal() throws Exception { + public void testValidateIncludedBeforeExternal() throws Exception { policy.inspectAll = true; HashMap provided = new HashMap<>(); provided.put(SHA1, "foo"); @@ -300,7 +303,7 @@ public void testValidate_IncludedBeforeExternal() throws Exception { } @Test - public void testValidate_CaseInsensitive() throws Exception { + public void testValidateCaseInsensitive() throws Exception { policy.inspectAll = true; ChecksumValidator validator = newValidator(SHA1); fetcher.mock(SHA1, "FOO"); @@ -309,7 +312,7 @@ public void testValidate_CaseInsensitive() throws Exception { } @Test - public void testValidate_MissingRemoteChecksum() throws Exception { + public void testValidateMissingRemoteChecksum() throws Exception { ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(MD5, "bar"); validator.validate(checksums(MD5, "bar"), null); @@ -318,7 +321,7 @@ public void testValidate_MissingRemoteChecksum() throws Exception { } @Test - public void testValidate_InaccessibleRemoteChecksum() throws Exception { + public void testValidateInaccessibleRemoteChecksum() throws Exception { ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(SHA1, new IOException("inaccessible")); fetcher.mock(MD5, "bar"); @@ -328,7 +331,7 @@ public void testValidate_InaccessibleRemoteChecksum() throws Exception { } @Test - public void testValidate_InaccessibleLocalChecksum() throws Exception { + public void testValidateInaccessibleLocalChecksum() throws Exception { ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(SHA1, "foo"); fetcher.mock(MD5, "bar"); @@ -338,7 +341,7 @@ public void testValidate_InaccessibleLocalChecksum() throws Exception { } @Test - public void testHandle_Accept() { + public void testHandleAccept() { policy.tolerateFailure = true; ChecksumValidator validator = newValidator(SHA1); assertTrue(validator.handle(new ChecksumFailureException("accept"))); @@ -346,7 +349,7 @@ public void testHandle_Accept() { } @Test - public void testHandle_Reject() { + public void testHandleReject() { policy.tolerateFailure = false; ChecksumValidator validator = newValidator(SHA1); assertFalse(validator.handle(new ChecksumFailureException("reject"))); @@ -354,14 +357,14 @@ public void testHandle_Reject() { } @Test - public void testRetry_ResetPolicy() { + public void testRetryResetPolicy() { ChecksumValidator validator = newValidator(SHA1); validator.retry(); policy.assertCallbacks("retry()"); } @Test - public void testRetry_RemoveTempFiles() throws Exception { + public void testRetryRemoveTempFiles() throws Exception { ChecksumValidator validator = newValidator(SHA1); fetcher.mock(SHA1, "foo"); validator.validate(checksums(SHA1, "foo"), null); @@ -374,7 +377,7 @@ public void testRetry_RemoveTempFiles() throws Exception { } @Test - public void testCommit_SaveChecksumFiles() throws Exception { + public void testCommitSaveChecksumFiles() throws Exception { policy.inspectAll = true; ChecksumValidator validator = newValidator(SHA1, MD5); fetcher.mock(MD5, "bar"); @@ -393,7 +396,7 @@ public void testCommit_SaveChecksumFiles() throws Exception { } @Test - public void testNoCommit_NoTempFiles() throws Exception { + public void testNoCommitNoTempFiles() throws Exception { ChecksumValidator validator = newValidator(SHA1); fetcher.mock(SHA1, "foo"); validator.validate(checksums(SHA1, "foo"), null); diff --git a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java index 59d8a9913..66dbbe972 100644 --- a/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java +++ b/maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/TestChecksumAlgorithmSelector.java @@ -88,7 +88,7 @@ public boolean isChecksumExtension(String extension) { } private static class MessageDigestChecksumAlgorithmFactory extends ChecksumAlgorithmFactorySupport { - public MessageDigestChecksumAlgorithmFactory(String name) { + MessageDigestChecksumAlgorithmFactory(String name) { super(name, name.replace("-", "").toLowerCase(Locale.ENGLISH)); } diff --git a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml index 005b78b6e..63114a4fe 100644 --- a/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml +++ b/maven-resolver-demos/maven-resolver-demo-maven-plugin/pom.xml @@ -64,6 +64,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations + ${version.maven-plugin-tools} provided true diff --git a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java index 47c0a5833..dbbe9551b 100644 --- a/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java +++ b/maven-resolver-demos/maven-resolver-demo-snippets/src/main/java/org/apache/maven/resolver/examples/resolver/ResolverDemo.java @@ -32,7 +32,7 @@ /** */ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "checkstyle:UnusedLocalVariable"}) public class ResolverDemo { public static void main(String[] args) throws Exception { System.out.println("------------------------------------------------------------"); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java index 1d339649b..9d8ebb047 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java @@ -26,7 +26,9 @@ import org.eclipse.aether.spi.locator.ServiceLocator; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; /** */ @@ -76,7 +78,7 @@ public void testInitService() { private static class DummyService implements Service { - public ServiceLocator locator; + ServiceLocator locator; public void initService(ServiceLocator locator) { this.locator = locator; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java index 74649dc13..43c38d82c 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java @@ -36,7 +36,7 @@ import org.eclipse.aether.spi.connector.transport.TransporterFactory; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; public class AetherModuleTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java index f286f13ad..3982807d9 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java @@ -71,7 +71,13 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java index 169738b6f..65a5b02ac 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java @@ -64,7 +64,7 @@ public void teardown() { } @Test - public void testNewChecksumPolicy_Fail() { + public void testNewChecksumPolicyFail() { ChecksumPolicy policy = provider.newChecksumPolicy(session, repository, resource, RepositoryPolicy.CHECKSUM_POLICY_FAIL); assertNotNull(policy); @@ -72,7 +72,7 @@ public void testNewChecksumPolicy_Fail() { } @Test - public void testNewChecksumPolicy_Warn() { + public void testNewChecksumPolicyWarn() { ChecksumPolicy policy = provider.newChecksumPolicy(session, repository, resource, RepositoryPolicy.CHECKSUM_POLICY_WARN); assertNotNull(policy); @@ -80,21 +80,21 @@ public void testNewChecksumPolicy_Warn() { } @Test - public void testNewChecksumPolicy_Ignore() { + public void testNewChecksumPolicyIgnore() { ChecksumPolicy policy = provider.newChecksumPolicy(session, repository, resource, RepositoryPolicy.CHECKSUM_POLICY_IGNORE); assertNull(policy); } @Test(expected = IllegalArgumentException.class) - public void testNewChecksumPolicy_Unknown() { + public void testNewChecksumPolicyUnknown() { ChecksumPolicy policy = provider.newChecksumPolicy(session, repository, resource, CHECKSUM_POLICY_UNKNOWN); assertNotNull(policy); assertEquals(WarnChecksumPolicy.class, policy.getClass()); } @Test - public void testGetEffectiveChecksumPolicy_EqualPolicies() { + public void testGetEffectiveChecksumPolicyEqualPolicies() { String[] policies = { RepositoryPolicy.CHECKSUM_POLICY_FAIL, RepositoryPolicy.CHECKSUM_POLICY_WARN, @@ -106,7 +106,7 @@ public void testGetEffectiveChecksumPolicy_EqualPolicies() { } @Test - public void testGetEffectiveChecksumPolicy_DifferentPolicies() { + public void testGetEffectiveChecksumPolicyDifferentPolicies() { String[][] testCases = { {RepositoryPolicy.CHECKSUM_POLICY_WARN, RepositoryPolicy.CHECKSUM_POLICY_FAIL}, {RepositoryPolicy.CHECKSUM_POLICY_IGNORE, RepositoryPolicy.CHECKSUM_POLICY_FAIL}, @@ -125,7 +125,7 @@ public void testGetEffectiveChecksumPolicy_DifferentPolicies() { } @Test - public void testGetEffectiveChecksumPolicy_UnknownPolicies() { + public void testGetEffectiveChecksumPolicyUnknownPolicies() { String[][] testCases = { {RepositoryPolicy.CHECKSUM_POLICY_WARN, RepositoryPolicy.CHECKSUM_POLICY_FAIL}, {RepositoryPolicy.CHECKSUM_POLICY_WARN, RepositoryPolicy.CHECKSUM_POLICY_WARN}, diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java index 81bc77a2b..f62c6c6b3 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java @@ -31,7 +31,8 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java index 6703e37ee..70ca392a9 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java @@ -49,7 +49,12 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java index 9079f64f5..5d4fae534 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java @@ -47,17 +47,17 @@ public void setup() { } @Test(expected = RepositoryOfflineException.class) - public void testCheckOffline_Online() throws Exception { + public void testCheckOfflineOnline() throws Exception { controller.checkOffline(newSession(false, null, null), newRepo("http://eclipse.org")); } @Test(expected = RepositoryOfflineException.class) - public void testCheckOffline_Offline() throws Exception { + public void testCheckOfflineOffline() throws Exception { controller.checkOffline(newSession(true, null, null), newRepo("http://eclipse.org")); } @Test - public void testCheckOffline_Offline_OfflineProtocol() throws Exception { + public void testCheckOfflineOfflineOfflineProtocol() throws Exception { controller.checkOffline(newSession(true, "file", null), newRepo("file://repo")); controller.checkOffline(newSession(true, "file", null), newRepo("FILE://repo")); controller.checkOffline(newSession(true, " file , classpath ", null), newRepo("file://repo")); @@ -65,12 +65,12 @@ public void testCheckOffline_Offline_OfflineProtocol() throws Exception { } @Test(expected = RepositoryOfflineException.class) - public void testCheckOffline_Offline_OnlineProtocol() throws Exception { + public void testCheckOfflineOfflineOnlineProtocol() throws Exception { controller.checkOffline(newSession(true, "file", null), newRepo("http://eclipse.org")); } @Test - public void testCheckOffline_Offline_OfflineHost() throws Exception { + public void testCheckOfflineOfflineOfflineHost() throws Exception { controller.checkOffline(newSession(true, null, "localhost"), newRepo("http://localhost")); controller.checkOffline(newSession(true, null, "localhost"), newRepo("http://LOCALHOST")); controller.checkOffline(newSession(true, null, " localhost , 127.0.0.1 "), newRepo("http://localhost")); @@ -78,7 +78,7 @@ public void testCheckOffline_Offline_OfflineHost() throws Exception { } @Test(expected = RepositoryOfflineException.class) - public void testCheckOffline_Offline_OnlineHost() throws Exception { + public void testCheckOfflineOfflineOnlineHost() throws Exception { controller.checkOffline(newSession(true, null, "localhost"), newRepo("http://eclipse.org")); } } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java index e788d5182..c3b6561a5 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java @@ -37,7 +37,9 @@ import org.junit.Test; import static java.util.Objects.requireNonNull; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** * @@ -117,7 +119,7 @@ public void testAggregateSimpleRepos() { } @Test - public void testAggregateSimpleRepos_MustKeepDisabledRecessiveRepo() { + public void testAggregateSimpleReposMustKeepDisabledRecessiveRepo() { RemoteRepository dominant = newRepo("a", "file://", true, "", "").build(); RemoteRepository recessive1 = newRepo("b", "http://", false, "", "").build(); @@ -136,7 +138,7 @@ public void testAggregateSimpleRepos_MustKeepDisabledRecessiveRepo() { } @Test - public void testAggregateMirrorRepos_DominantMirrorComplete() { + public void testAggregateMirrorReposDominantMirrorComplete() { RemoteRepository dominant1 = newRepo("a", "http://", false, "", "").build(); RemoteRepository dominantMirror1 = newRepo("x", "file://", false, "", "") .addMirroredRepository(dominant1) @@ -157,7 +159,7 @@ public void testAggregateMirrorRepos_DominantMirrorComplete() { } @Test - public void testAggregateMirrorRepos_DominantMirrorIncomplete() { + public void testAggregateMirrorReposDominantMirrorIncomplete() { RemoteRepository dominant1 = newRepo("a", "http://", false, "", "").build(); RemoteRepository dominantMirror1 = newRepo("x", "file://", false, "", "") .addMirroredRepository(dominant1) diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java index 89bd757af..ed422fb72 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java @@ -29,7 +29,8 @@ import org.eclipse.aether.internal.test.util.TestUtils; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; /** */ @@ -65,7 +66,7 @@ public void testDispatchHandlesAllEventTypes() { static class ListenerHandler implements InvocationHandler { - public String methodName; + String methodName; public Object invoke(Object proxy, Method method, Object[] args) { if (args.length == 1 && args[0] instanceof RepositoryEvent) { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java index 0a6aacd95..f1510f8e8 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; public class DefaultRepositorySystemTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java index f9d9fbe2b..7209ed798 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultTrackingFileManagerTest.java @@ -30,7 +30,10 @@ import org.eclipse.aether.internal.test.util.TestFileUtils; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java index ab61d5754..31bae13fc 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java @@ -44,7 +44,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; /** */ @@ -335,7 +338,7 @@ public void testCheckMetadataSessionStateModes() { } @Test - public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_InvalidFile() { + public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlwaysInvalidFile() { UpdateCheck check = newMetadataCheck(); check.setPolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS); check.setFileValid(false); @@ -361,7 +364,7 @@ public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_Inv } @Test - public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_DifferentRepoIdSameUrl() { + public void testCheckMetadataAtMostOnceDuringSessionEvenIfUpdatePolicyAlwaysDifferentRepoIdSameUrl() { UpdateCheck check = newMetadataCheck(); check.setPolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS); check.setFileValid(false); @@ -650,7 +653,7 @@ public void testCheckArtifactSessionStateModes() { } @Test - public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_InvalidFile() { + public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlwaysInvalidFile() { UpdateCheck check = newArtifactCheck(); check.setPolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS); check.setFileValid(false); @@ -676,7 +679,7 @@ public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_Inv } @Test - public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlways_DifferentRepoIdSameUrl() { + public void testCheckArtifactAtMostOnceDuringSessionEvenIfUpdatePolicyAlwaysDifferentRepoIdSameUrl() { UpdateCheck check = newArtifactCheck(); check.setPolicy(RepositoryPolicy.UPDATE_POLICY_ALWAYS); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java index 762740827..bfb3be1ee 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java @@ -22,12 +22,16 @@ import org.eclipse.aether.DefaultRepositorySystemSession; import org.eclipse.aether.internal.test.util.TestUtils; -import org.eclipse.aether.repository.RepositoryPolicy; import org.junit.Before; import org.junit.Test; -import static org.eclipse.aether.repository.RepositoryPolicy.*; -import static org.junit.Assert.*; +import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_ALWAYS; +import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_DAILY; +import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_INTERVAL; +import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_NEVER; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** */ @@ -48,8 +52,8 @@ private long now() { } @Test - public void testIsUpdateRequired_PolicyNever() { - String policy = RepositoryPolicy.UPDATE_POLICY_NEVER; + public void testIsUpdateRequiredPolicyNever() { + String policy = UPDATE_POLICY_NEVER; assertFalse(analyzer.isUpdatedRequired(session, Long.MIN_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, Long.MAX_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, 0, policy)); @@ -58,8 +62,8 @@ public void testIsUpdateRequired_PolicyNever() { } @Test - public void testIsUpdateRequired_PolicyAlways() { - String policy = RepositoryPolicy.UPDATE_POLICY_ALWAYS; + public void testIsUpdateRequiredPolicyAlways() { + String policy = UPDATE_POLICY_ALWAYS; assertTrue(analyzer.isUpdatedRequired(session, Long.MIN_VALUE, policy)); assertTrue(analyzer.isUpdatedRequired(session, Long.MAX_VALUE, policy)); assertTrue(analyzer.isUpdatedRequired(session, 0, policy)); @@ -68,7 +72,7 @@ public void testIsUpdateRequired_PolicyAlways() { } @Test - public void testIsUpdateRequired_PolicyDaily() { + public void testIsUpdateRequiredPolicyDaily() { Calendar cal = Calendar.getInstance(); cal.set(Calendar.HOUR_OF_DAY, 0); cal.set(Calendar.MINUTE, 0); @@ -76,7 +80,7 @@ public void testIsUpdateRequired_PolicyDaily() { cal.set(Calendar.MILLISECOND, 0); long localMidnight = cal.getTimeInMillis(); - String policy = RepositoryPolicy.UPDATE_POLICY_DAILY; + String policy = UPDATE_POLICY_DAILY; assertTrue(analyzer.isUpdatedRequired(session, Long.MIN_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, Long.MAX_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, localMidnight, policy)); @@ -85,8 +89,8 @@ public void testIsUpdateRequired_PolicyDaily() { } @Test - public void testIsUpdateRequired_PolicyInterval() { - String policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":5"; + public void testIsUpdateRequiredPolicyInterval() { + String policy = UPDATE_POLICY_INTERVAL + ":5"; assertTrue(analyzer.isUpdatedRequired(session, Long.MIN_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, Long.MAX_VALUE, policy)); assertFalse(analyzer.isUpdatedRequired(session, now(), policy)); @@ -94,7 +98,7 @@ public void testIsUpdateRequired_PolicyInterval() { assertFalse(analyzer.isUpdatedRequired(session, now() - 1000 * 5 - 1, policy)); assertTrue(analyzer.isUpdatedRequired(session, now() - 1000 * 60 * 5 - 1, policy)); - policy = RepositoryPolicy.UPDATE_POLICY_INTERVAL + ":invalid"; + policy = UPDATE_POLICY_INTERVAL + ":invalid"; assertFalse(analyzer.isUpdatedRequired(session, now(), policy)); } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java index f5b204060..17d21599c 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java @@ -43,7 +43,11 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class EnhancedLocalRepositoryManagerTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java index a98702c3c..6d02aff14 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java @@ -24,7 +24,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class FailChecksumPolicyTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java index 5db78f196..e066dbed5 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java @@ -38,31 +38,33 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class Maven2RepositoryLayoutFactoryTest { - private final ChecksumAlgorithmFactory SHA512 = new ChecksumAlgorithmFactorySupport("SHA-512", "sha512") { + private static final ChecksumAlgorithmFactory SHA512 = new ChecksumAlgorithmFactorySupport("SHA-512", "sha512") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private final ChecksumAlgorithmFactory SHA256 = new ChecksumAlgorithmFactorySupport("SHA-256", "sha256") { + private static final ChecksumAlgorithmFactory SHA256 = new ChecksumAlgorithmFactorySupport("SHA-256", "sha256") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private final ChecksumAlgorithmFactory SHA1 = new ChecksumAlgorithmFactorySupport("SHA-1", "sha1") { + private static final ChecksumAlgorithmFactory SHA1 = new ChecksumAlgorithmFactorySupport("SHA-1", "sha1") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private final ChecksumAlgorithmFactory MD5 = new ChecksumAlgorithmFactorySupport("MD5", "md5") { + private static final ChecksumAlgorithmFactory MD5 = new ChecksumAlgorithmFactorySupport("MD5", "md5") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); @@ -119,7 +121,7 @@ public void testChecksumAlgorithmNames() { } @Test - public void testArtifactLocation_Release() { + public void testArtifactLocationRelease() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0"); URI uri = layout.getLocation(artifact, false); assertEquals("g/i/d/a-i.d/1.0/a-i.d-1.0-cls.ext", uri.toString()); @@ -128,7 +130,7 @@ public void testArtifactLocation_Release() { } @Test - public void testArtifactLocation_Snapshot() { + public void testArtifactLocationSnapshot() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0-20110329.221805-4"); URI uri = layout.getLocation(artifact, false); assertEquals("g/i/d/a-i.d/1.0-SNAPSHOT/a-i.d-1.0-20110329.221805-4-cls.ext", uri.toString()); @@ -137,7 +139,7 @@ public void testArtifactLocation_Snapshot() { } @Test - public void testMetadataLocation_RootLevel() { + public void testMetadataLocationRootLevel() { DefaultMetadata metadata = new DefaultMetadata("archetype-catalog.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); URI uri = layout.getLocation(metadata, false); assertEquals("archetype-catalog.xml", uri.toString()); @@ -146,7 +148,7 @@ public void testMetadataLocation_RootLevel() { } @Test - public void testMetadataLocation_GroupLevel() { + public void testMetadataLocationGroupLevel() { DefaultMetadata metadata = new DefaultMetadata( "org.apache.maven.plugins", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); URI uri = layout.getLocation(metadata, false); @@ -156,7 +158,7 @@ public void testMetadataLocation_GroupLevel() { } @Test - public void testMetadataLocation_ArtifactLevel() { + public void testMetadataLocationArtifactLevel() { DefaultMetadata metadata = new DefaultMetadata( "org.apache.maven.plugins", "maven-jar-plugin", @@ -169,7 +171,7 @@ public void testMetadataLocation_ArtifactLevel() { } @Test - public void testMetadataLocation_VersionLevel() { + public void testMetadataLocationVersionLevel() { DefaultMetadata metadata = new DefaultMetadata( "org.apache.maven.plugins", "maven-jar-plugin", @@ -183,7 +185,7 @@ public void testMetadataLocation_VersionLevel() { } @Test - public void testArtifactChecksums_Download() { + public void testArtifactChecksumsDownload() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0"); URI uri = layout.getLocation(artifact, false); List checksums = layout.getChecksumLocations(artifact, false, uri); @@ -193,7 +195,7 @@ public void testArtifactChecksums_Download() { } @Test - public void testArtifactChecksums_DownloadWithCustomAlgorithms() throws NoRepositoryLayoutException { + public void testArtifactChecksumsDownloadWithCustomAlgorithms() throws NoRepositoryLayoutException { session.setConfigProperty(Maven2RepositoryLayoutFactory.CONFIG_PROP_CHECKSUMS_ALGORITHMS, "SHA-256,SHA-1"); layout = factory.newInstance(session, newRepo("default")); DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0"); @@ -205,13 +207,13 @@ public void testArtifactChecksums_DownloadWithCustomAlgorithms() throws NoReposi } @Test(expected = IllegalArgumentException.class) - public void testArtifactChecksums_DownloadWithUnsupportedAlgorithms() throws NoRepositoryLayoutException { + public void testArtifactChecksumsDownloadWithUnsupportedAlgorithms() throws NoRepositoryLayoutException { session.setConfigProperty(Maven2RepositoryLayoutFactory.CONFIG_PROP_CHECKSUMS_ALGORITHMS, "FOO,SHA-1"); layout = factory.newInstance(session, newRepo("default")); } @Test - public void testArtifactChecksums_Upload() { + public void testArtifactChecksumsUpload() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0"); URI uri = layout.getLocation(artifact, true); List checksums = layout.getChecksumLocations(artifact, true, uri); @@ -221,7 +223,7 @@ public void testArtifactChecksums_Upload() { } @Test - public void testArtifactChecksums_UploadWithCustomAlgorithms() throws NoRepositoryLayoutException { + public void testArtifactChecksumsUploadWithCustomAlgorithms() throws NoRepositoryLayoutException { session.setConfigProperty(Maven2RepositoryLayoutFactory.CONFIG_PROP_CHECKSUMS_ALGORITHMS, "SHA-512,MD5"); layout = factory.newInstance(session, newRepo("default")); DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "ext", "1.0"); @@ -233,7 +235,7 @@ public void testArtifactChecksums_UploadWithCustomAlgorithms() throws NoReposito } @Test - public void testMetadataChecksums_Download() { + public void testMetadataChecksumsDownload() { DefaultMetadata metadata = new DefaultMetadata( "org.apache.maven.plugins", "maven-jar-plugin", @@ -247,7 +249,7 @@ public void testMetadataChecksums_Download() { } @Test - public void testMetadataChecksums_Upload() { + public void testMetadataChecksumsUpload() { DefaultMetadata metadata = new DefaultMetadata( "org.apache.maven.plugins", "maven-jar-plugin", @@ -261,7 +263,7 @@ public void testMetadataChecksums_Upload() { } @Test - public void testSignatureChecksums_Download() { + public void testSignatureChecksumsDownload() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "asc", "1.0"); URI uri = layout.getLocation(artifact, false); List checksums = layout.getChecksumLocations(artifact, false, uri); @@ -274,7 +276,7 @@ public void testSignatureChecksums_Download() { } @Test - public void testSignatureChecksums_Upload() { + public void testSignatureChecksumsUpload() { DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "asc", "1.0"); URI uri = layout.getLocation(artifact, true); List checksums = layout.getChecksumLocations(artifact, true, uri); @@ -287,7 +289,7 @@ public void testSignatureChecksums_Upload() { } @Test - public void testSignatureChecksums_Force() throws Exception { + public void testSignatureChecksumsForce() throws Exception { session.setConfigProperty(Maven2RepositoryLayoutFactory.CONFIG_PROP_OMIT_CHECKSUMS_FOR_EXTENSIONS, ""); layout = factory.newInstance(session, newRepo("default")); DefaultArtifact artifact = new DefaultArtifact("g.i.d", "a-i.d", "cls", "jar.asc", "1.0"); @@ -316,7 +318,7 @@ public void testNotConfiguredButSupportedChecksumsHandledAsChecksums() throws Ex } @Test - public void testCustomChecksumsIgnored_IllegalInout() throws Exception { + public void testCustomChecksumsIgnoredIllegalInout() throws Exception { session.setConfigProperty(Maven2RepositoryLayoutFactory.CONFIG_PROP_OMIT_CHECKSUMS_FOR_EXTENSIONS, ".asc,foo"); try { layout = factory.newInstance(session, newRepo("default")); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java index 7859a5c0e..d6399cbed 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java @@ -20,7 +20,9 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PrioritizedComponentTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java index 9a90ea7a0..6edee8bab 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java @@ -50,7 +50,7 @@ public void testGetConfigKeys() { } @Test - public void testAdd_PriorityOverride() { + public void testAddPriorityOverride() { Exception comp1 = new IllegalArgumentException(); Exception comp2 = new NullPointerException(); Map config = new HashMap<>(); @@ -68,7 +68,7 @@ public void testAdd_PriorityOverride() { } @Test - public void testAdd_ImplicitPriority() { + public void testAddImplicitPriority() { Exception comp1 = new IllegalArgumentException(); Exception comp2 = new NullPointerException(); Map config = new HashMap<>(); @@ -83,7 +83,7 @@ public void testAdd_ImplicitPriority() { } @Test - public void testAdd_Disabled() { + public void testAddDisabled() { Exception comp1 = new IllegalArgumentException(); Exception comp2 = new NullPointerException(); Map config = new HashMap<>(); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java index e99c23a78..a2c7bb0b3 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java @@ -38,7 +38,7 @@ import org.eclipse.aether.transfer.TransferListener; import org.eclipse.aether.transfer.TransferResource; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** * A repository connector recording all get/put-requests and faking the results. @@ -65,7 +65,7 @@ class RecordingRepositoryConnector implements RepositoryConnector { private List actualPutMD = new ArrayList<>(); - public RecordingRepositoryConnector( + RecordingRepositoryConnector( RepositorySystemSession session, Artifact[] expectGet, Artifact[] expectPut, @@ -78,11 +78,11 @@ public RecordingRepositoryConnector( this.expectPutMD = expectPutMD; } - public RecordingRepositoryConnector(RepositorySystemSession session) { + RecordingRepositoryConnector(RepositorySystemSession session) { this.session = session; } - public RecordingRepositoryConnector() {} + RecordingRepositoryConnector() {} public void get( Collection artifactDownloads, diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java index 6c56c2094..99b4abd7d 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.transfer.TransferListener; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java index 83dbd6fa9..8ca520395 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; /** */ diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java index 366b24bd2..bc4c6d66f 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java @@ -36,11 +36,11 @@ class StaticUpdateCheckManager implements UpdateCheckManager { private boolean localUpToDate; - public StaticUpdateCheckManager(boolean checkRequired) { + StaticUpdateCheckManager(boolean checkRequired) { this(checkRequired, !checkRequired); } - public StaticUpdateCheckManager(boolean checkRequired, boolean localUpToDate) { + StaticUpdateCheckManager(boolean checkRequired, boolean localUpToDate) { this.checkRequired = checkRequired; this.localUpToDate = localUpToDate; } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java index 098afabc6..f0df82e75 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java @@ -26,11 +26,11 @@ class StubRepositoryConnectorProvider implements RepositoryConnectorProvider { - public StubRepositoryConnectorProvider(RepositoryConnector connector) { + StubRepositoryConnectorProvider(RepositoryConnector connector) { setConnector(connector); } - public StubRepositoryConnectorProvider() {} + StubRepositoryConnectorProvider() {} private RepositoryConnector connector; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java index e264dc82b..87890471c 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java @@ -24,7 +24,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class WarnChecksumPolicyTest { diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java index 087483fcf..0be68d60f 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java @@ -277,7 +277,7 @@ public void testCyclicProjects() throws Exception { } @Test - public void testCyclicProjects_ConsiderLabelOfRootlessGraph() throws Exception { + public void testCyclicProjectsConsiderLabelOfRootlessGraph() throws Exception { Dependency dep = newDep("gid:aid:ver", "compile"); CollectRequest request = new CollectRequest() .addDependency(dep) @@ -417,7 +417,7 @@ public void testDependencyManagement() throws IOException, DependencyCollectionE } @Test - public void testDependencyManagement_VerboseMode() throws Exception { + public void testDependencyManagementVerboseMode() throws Exception { String depId = "gid:aid2:ext"; TestDependencyManager depMgmt = new TestDependencyManager(); depMgmt.version(depId, "managedVersion"); @@ -444,7 +444,7 @@ public void testDependencyManagement_VerboseMode() throws Exception { } @Test - public void testDependencyManagement_TransitiveDependencyManager() + public void testDependencyManagementTransitiveDependencyManager() throws DependencyCollectionException, IOException { collector.setArtifactDescriptorReader(newReader("managed/")); parser = new DependencyGraphParser("artifact-descriptions/managed/"); @@ -471,7 +471,7 @@ public void testDependencyManagement_TransitiveDependencyManager() } @Test - public void testDependencyManagement_DefaultDependencyManager() throws DependencyCollectionException, IOException { + public void testDependencyManagementDefaultDependencyManager() throws DependencyCollectionException, IOException { collector.setArtifactDescriptorReader(newReader("managed/")); parser = new DependencyGraphParser("artifact-descriptions/managed/"); session.setDependencyManager(new DefaultDependencyManager()); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java index 1b6aa2c2c..a77d0b778 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/BfDependencyCollectorTest.java @@ -52,6 +52,7 @@ public static List parameters() { return Arrays.asList(Boolean.TRUE, Boolean.FALSE); } + @SuppressWarnings("checkstyle:VisibilityModifier") @Parameterized.Parameter public boolean useSkipper; diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/Filters.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/Filters.java index d9de53608..6b45832d7 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/Filters.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/Filters.java @@ -28,6 +28,7 @@ /** * Some filters used in UTs. */ +@SuppressWarnings("checkstyle:MemberName") public final class Filters { /** * Returns a filter that always accepts. diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSourceTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSourceTest.java index 6802f9362..7f1d452ab 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSourceTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/filter/GroupIdRemoteRepositoryFilterSourceTest.java @@ -40,8 +40,9 @@ public class GroupIdRemoteRepositoryFilterSourceTest extends RemoteRepositoryFil @Override protected GroupIdRemoteRepositoryFilterSource getRemoteRepositoryFilterSource( DefaultRepositorySystemSession session, RemoteRepository remoteRepository) { - return groupIdRemoteRepositoryFilterSource = + groupIdRemoteRepositoryFilterSource = new GroupIdRemoteRepositoryFilterSource(new DefaultRepositorySystemLifecycle()); + return groupIdRemoteRepositoryFilterSource; } @Override diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java index 43f0eab42..93226d814 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/NamedLockFactoryAdapterTestSupport.java @@ -29,7 +29,10 @@ import org.eclipse.aether.RepositorySystemSession; import org.eclipse.aether.SyncContext; import org.eclipse.aether.artifact.DefaultArtifact; -import org.eclipse.aether.internal.impl.synccontext.named.*; +import org.eclipse.aether.internal.impl.synccontext.named.DiscriminatingNameMapper; +import org.eclipse.aether.internal.impl.synccontext.named.GAVNameMapper; +import org.eclipse.aether.internal.impl.synccontext.named.NameMapper; +import org.eclipse.aether.internal.impl.synccontext.named.NamedLockFactoryAdapter; import org.eclipse.aether.named.NamedLockFactory; import org.eclipse.aether.named.support.LockUpgradeNotSupportedException; import org.eclipse.aether.repository.LocalRepository; @@ -238,7 +241,7 @@ private static class Access implements Runnable { final RepositorySystemSession session; final Access chained; - public Access( + Access( boolean shared, CountDownLatch winner, CountDownLatch loser, diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapperTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapperTest.java index 2123e258b..0054b0285 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapperTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapperTest.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.hasSize; public class BasedirNameMapperTest extends NameMapperTestSupport { - private final String PS = File.separator; + private static final String PS = File.separator; BasedirNameMapper mapper = new BasedirNameMapper(new HashingNameMapper(GAVNameMapper.gav())); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/HashingNameMapperTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/HashingNameMapperTest.java index e3285868a..458380ed5 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/HashingNameMapperTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/HashingNameMapperTest.java @@ -54,7 +54,7 @@ public void nullsAndEmptyInputs() { } @Test - public void singleArtifact_depth0() { + public void singleArtifactdepth0() { configProperties.put("aether.syncContext.named.hashing.depth", "0"); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); @@ -64,7 +64,7 @@ public void singleArtifact_depth0() { } @Test - public void singleMetadata_depth0() { + public void singleMetadatadepth0() { configProperties.put("aether.syncContext.named.hashing.depth", "0"); DefaultMetadata metadata = new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); @@ -75,7 +75,7 @@ public void singleMetadata_depth0() { } @Test - public void oneAndOne_depth0() { + public void oneAndOnedepth0() { configProperties.put("aether.syncContext.named.hashing.depth", "0"); DefaultArtifact artifact = new DefaultArtifact("agroup:artifact:1.0"); DefaultMetadata metadata = @@ -91,7 +91,7 @@ public void oneAndOne_depth0() { } @Test - public void singleArtifact_depth2() { + public void singleArtifactdepth2() { configProperties.put("aether.syncContext.named.hashing.depth", "2"); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); @@ -101,7 +101,7 @@ public void singleArtifact_depth2() { } @Test - public void singleMetadata_depth2() { + public void singleMetadatadepth2() { configProperties.put("aether.syncContext.named.hashing.depth", "2"); DefaultMetadata metadata = new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); @@ -112,7 +112,7 @@ public void singleMetadata_depth2() { } @Test - public void oneAndOne_depth2() { + public void oneAndOnedepth2() { configProperties.put("aether.syncContext.named.hashing.depth", "2"); DefaultArtifact artifact = new DefaultArtifact("agroup:artifact:1.0"); DefaultMetadata metadata = diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java index fbd31c7a5..9f102e540 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreAdapterIT.java @@ -24,7 +24,7 @@ public class HazelcastCPSemaphoreAdapterIT extends NamedLockFactoryAdapterTestSu @BeforeClass public static void createNamedLockFactory() { - String clusterName = utils.clusterName(HazelcastCPSemaphoreAdapterIT.class); - setNamedLockFactory(new HazelcastCPSemaphoreNamedLockFactory(utils.createMember(clusterName), true)); + String clusterName = UTILS.clusterName(HazelcastCPSemaphoreAdapterIT.class); + setNamedLockFactory(new HazelcastCPSemaphoreNamedLockFactory(UTILS.createMember(clusterName), true)); } } diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java index cf9807fba..bcc1bffa4 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastCPSemaphoreNamedLockFactoryIT.java @@ -24,7 +24,7 @@ public class HazelcastCPSemaphoreNamedLockFactoryIT extends NamedLockFactoryTest @BeforeClass public static void createNamedLockFactory() { - String clusterName = utils.clusterName(HazelcastCPSemaphoreNamedLockFactoryIT.class); - namedLockFactory = new HazelcastCPSemaphoreNamedLockFactory(utils.createMember(clusterName), true); + String clusterName = UTILS.clusterName(HazelcastCPSemaphoreNamedLockFactoryIT.class); + namedLockFactory = new HazelcastCPSemaphoreNamedLockFactory(UTILS.createMember(clusterName), true); } } diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java index 863b7e87d..a96e50b8a 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreAdapterIT.java @@ -23,8 +23,8 @@ public class HazelcastClientCPSemaphoreAdapterIT extends NamedLockFactoryAdapterTestSupport { @BeforeClass public static void createNamedLockFactory() { - String clusterName = utils.clusterName(HazelcastClientCPSemaphoreAdapterIT.class); - utils.createMember(clusterName); - setNamedLockFactory(new HazelcastClientCPSemaphoreNamedLockFactory(utils.createClient(clusterName), true)); + String clusterName = UTILS.clusterName(HazelcastClientCPSemaphoreAdapterIT.class); + UTILS.createMember(clusterName); + setNamedLockFactory(new HazelcastClientCPSemaphoreNamedLockFactory(UTILS.createClient(clusterName), true)); } } diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java index 3ac2f6dde..1cdbba33e 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/HazelcastClientCPSemaphoreNamedLockFactoryIT.java @@ -23,8 +23,8 @@ public class HazelcastClientCPSemaphoreNamedLockFactoryIT extends NamedLockFactoryTestSupport { @BeforeClass public static void createNamedLockFactory() { - String clusterName = utils.clusterName(HazelcastClientCPSemaphoreNamedLockFactoryIT.class); - utils.createMember(clusterName); - namedLockFactory = new HazelcastClientCPSemaphoreNamedLockFactory(utils.createClient(clusterName), true); + String clusterName = UTILS.clusterName(HazelcastClientCPSemaphoreNamedLockFactoryIT.class); + UTILS.createMember(clusterName); + namedLockFactory = new HazelcastClientCPSemaphoreNamedLockFactory(UTILS.createClient(clusterName), true); } } diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java index b5a57ca96..bc3310035 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryAdapterTestSupport.java @@ -48,7 +48,7 @@ * UT support for {@link SyncContextFactory}. */ public abstract class NamedLockFactoryAdapterTestSupport { - protected static final HazelcastClientUtils utils = new HazelcastClientUtils(); + protected static final HazelcastClientUtils UTILS = new HazelcastClientUtils(); private static final long ADAPTER_TIME = 100L; @@ -72,7 +72,7 @@ public static void cleanup() { adapter.getNamedLockFactory().shutdown(); } - utils.cleanup(); + UTILS.cleanup(); } @Before @@ -202,7 +202,7 @@ private static class Access implements Runnable { final RepositorySystemSession session; final Access chained; - public Access( + Access( boolean shared, CountDownLatch winner, CountDownLatch loser, diff --git a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java index bc1c779af..9afbac73b 100644 --- a/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java +++ b/maven-resolver-named-locks-hazelcast/src/test/java/org/eclipse/aether/named/hazelcast/NamedLockFactoryTestSupport.java @@ -39,7 +39,7 @@ * UT support for {@link NamedLockFactory}. */ public abstract class NamedLockFactoryTestSupport { - protected static final HazelcastClientUtils utils = new HazelcastClientUtils(); + protected static final HazelcastClientUtils UTILS = new HazelcastClientUtils(); protected static NamedLockFactory namedLockFactory; @@ -51,7 +51,7 @@ public static void cleanup() { if (namedLockFactory != null) { namedLockFactory.shutdown(); } - utils.cleanup(); + UTILS.cleanup(); } @Test @@ -176,7 +176,7 @@ private static class Access implements Runnable { final CountDownLatch winner; final CountDownLatch loser; - public Access( + Access( NamedLockFactory namedLockFactory, String name, boolean shared, diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java index 9904a1e90..25bd3e95a 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java +++ b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/NamedLockFactoryTestSupport.java @@ -28,7 +28,10 @@ import org.junit.rules.TestName; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.sameInstance; /** * UT support for {@link NamedLockFactory}. @@ -236,7 +239,7 @@ private static class Access implements Runnable { final CountDownLatch winner; final CountDownLatch loser; - public Access( + Access( NamedLockFactory namedLockFactory, String name, boolean shared, diff --git a/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java b/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java index 73b746ce9..61b74f4dc 100644 --- a/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java +++ b/maven-resolver-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumLocationTest.java @@ -29,28 +29,28 @@ import static org.junit.Assert.assertEquals; public class ChecksumLocationTest { - private ChecksumAlgorithmFactory SHA512 = new ChecksumAlgorithmFactorySupport("SHA-512", "sha512") { + private static final ChecksumAlgorithmFactory SHA512 = new ChecksumAlgorithmFactorySupport("SHA-512", "sha512") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private ChecksumAlgorithmFactory SHA256 = new ChecksumAlgorithmFactorySupport("SHA-256", "sha256") { + private static final ChecksumAlgorithmFactory SHA256 = new ChecksumAlgorithmFactorySupport("SHA-256", "sha256") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private ChecksumAlgorithmFactory SHA1 = new ChecksumAlgorithmFactorySupport("SHA-1", "sha1") { + private static final ChecksumAlgorithmFactory SHA1 = new ChecksumAlgorithmFactorySupport("SHA-1", "sha1") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); } }; - private ChecksumAlgorithmFactory MD5 = new ChecksumAlgorithmFactorySupport("MD5", "md5") { + private static final ChecksumAlgorithmFactory MD5 = new ChecksumAlgorithmFactorySupport("MD5", "md5") { @Override public ChecksumAlgorithm getAlgorithm() { throw new RuntimeException("this should not happen"); @@ -77,12 +77,12 @@ public void testForLocation() { } @Test(expected = IllegalArgumentException.class) - public void testForLocation_WithQueryParams() { + public void testForLocationWithQueryParams() { ChecksumLocation.forLocation(URI.create("file.php?param=1"), SHA1); } @Test(expected = IllegalArgumentException.class) - public void testForLocation_WithFragment() { + public void testForLocationWithFragment() { ChecksumLocation.forLocation(URI.create("file.html#fragment"), SHA1); } } diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java index 197ea4956..a079bed14 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java +++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java @@ -29,7 +29,11 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java index b59d60636..82a3ab76a 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java +++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java @@ -30,7 +30,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java index 08d9cf1fb..81233c2bb 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java +++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java @@ -33,7 +33,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java index 1d4c6d37a..cd02e1aaa 100644 --- a/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java +++ b/maven-resolver-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java @@ -25,7 +25,10 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class NodeDefinitionTest { @@ -108,13 +111,13 @@ public void testPatterns() { } @Test - public void testParsing_Reference() { + public void testParsingReference() { NodeDefinition desc = new NodeDefinition("^id"); assertEquals("id", desc.reference); } @Test - public void testParsing_Node() { + public void testParsingNode() { NodeDefinition desc = new NodeDefinition("g:a:1"); assertNull(desc.reference); assertEquals("g:a:1", desc.coords); diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java index 46fde0e3b..2143b718b 100644 --- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java +++ b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java @@ -38,7 +38,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ @@ -91,7 +93,7 @@ public void testPeek() throws Exception { } @Test - public void testPeek_NotFound() throws Exception { + public void testPeekNotFound() throws Exception { try { transporter.peek(new PeekTask(URI.create("missing.txt"))); fail("Expected error"); @@ -101,7 +103,7 @@ public void testPeek_NotFound() throws Exception { } @Test - public void testPeek_Closed() throws Exception { + public void testPeekClosed() throws Exception { transporter.close(); try { transporter.peek(new PeekTask(URI.create("missing.txt"))); @@ -112,7 +114,7 @@ public void testPeek_Closed() throws Exception { } @Test - public void testGet_ToMemory() throws Exception { + public void testGetToMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); transporter.get(task); @@ -125,7 +127,7 @@ public void testGet_ToMemory() throws Exception { } @Test - public void testGet_ToFile() throws Exception { + public void testGetToFile() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setDataFile(file).setListener(listener); @@ -139,7 +141,7 @@ public void testGet_ToFile() throws Exception { } @Test - public void testGet_EmptyResource() throws Exception { + public void testGetEmptyResource() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("empty.txt")).setDataFile(file).setListener(listener); @@ -153,28 +155,28 @@ public void testGet_EmptyResource() throws Exception { } @Test - public void testGet_EncodedResourcePath() throws Exception { + public void testGetEncodedResourcePath() throws Exception { GetTask task = new GetTask(URI.create("some%20space.txt")); transporter.get(task); assertEquals("space", task.getDataString()); } @Test - public void testGet_Fragment() throws Exception { + public void testGetFragment() throws Exception { GetTask task = new GetTask(URI.create("file.txt#ignored")); transporter.get(task); assertEquals("test", task.getDataString()); } @Test - public void testGet_Query() throws Exception { + public void testGetQuery() throws Exception { GetTask task = new GetTask(URI.create("file.txt?ignored")); transporter.get(task); assertEquals("test", task.getDataString()); } @Test - public void testGet_FileHandleLeak() throws Exception { + public void testGetFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File file = TestFileUtils.createTempFile("failure"); transporter.get(new GetTask(URI.create("file.txt")).setDataFile(file)); @@ -183,7 +185,7 @@ public void testGet_FileHandleLeak() throws Exception { } @Test - public void testGet_NotFound() throws Exception { + public void testGetNotFound() throws Exception { try { transporter.get(new GetTask(URI.create("missing.txt"))); fail("Expected error"); @@ -193,7 +195,7 @@ public void testGet_NotFound() throws Exception { } @Test - public void testGet_Closed() throws Exception { + public void testGetClosed() throws Exception { transporter.close(); try { transporter.get(new GetTask(URI.create("file.txt"))); @@ -204,7 +206,7 @@ public void testGet_Closed() throws Exception { } @Test - public void testGet_StartCancelled() throws Exception { + public void testGetStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -221,7 +223,7 @@ public void testGet_StartCancelled() throws Exception { } @Test - public void testGet_ProgressCancelled() throws Exception { + public void testGetProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -248,7 +250,7 @@ public void testPut() throws Exception { } @Test - public void testPut_Closed() throws Exception { + public void testPutClosed() throws Exception { transporter.close(); try { transporter.put(new PutTask(URI.create("missing.txt"))); @@ -259,54 +261,54 @@ public void testPut_Closed() throws Exception { } @Test(expected = NoTransporterException.class) - public void testInit_BadProtocol() throws Exception { + public void testInitBadProtocol() throws Exception { newTransporter("bad:/void"); } @Test - public void testInit_CaseInsensitiveProtocol() throws Exception { + public void testInitCaseInsensitiveProtocol() throws Exception { newTransporter("classpath:/void"); newTransporter("CLASSPATH:/void"); newTransporter("ClassPath:/void"); } @Test - public void testInit_OpaqueUrl() throws Exception { + public void testInitOpaqueUrl() throws Exception { testInit("classpath:repository"); } @Test - public void testInit_OpaqueUrlTrailingSlash() throws Exception { + public void testInitOpaqueUrlTrailingSlash() throws Exception { testInit("classpath:repository/"); } @Test - public void testInit_OpaqueUrlSpaces() throws Exception { + public void testInitOpaqueUrlSpaces() throws Exception { testInit("classpath:repo%20space"); } @Test - public void testInit_HierarchicalUrl() throws Exception { + public void testInitHierarchicalUrl() throws Exception { testInit("classpath:/repository"); } @Test - public void testInit_HierarchicalUrlTrailingSlash() throws Exception { + public void testInitHierarchicalUrlTrailingSlash() throws Exception { testInit("classpath:/repository/"); } @Test - public void testInit_HierarchicalUrlSpaces() throws Exception { + public void testInitHierarchicalUrlSpaces() throws Exception { testInit("classpath:/repo%20space"); } @Test - public void testInit_HierarchicalUrlRoot() throws Exception { + public void testInitHierarchicalUrlRoot() throws Exception { testInit("classpath:/"); } @Test - public void testInit_HierarchicalUrlNoPath() throws Exception { + public void testInitHierarchicalUrlNoPath() throws Exception { testInit("classpath://reserved"); } diff --git a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java index 400f24dcc..8f040229f 100644 --- a/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java +++ b/maven-resolver-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java @@ -25,6 +25,7 @@ import org.eclipse.aether.spi.connector.transport.TransportListener; import org.eclipse.aether.transfer.TransferCancelledException; +@SuppressWarnings("checkstyle:VisibilityModifier") class RecordingTransportListener extends TransportListener { public final ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java index 23cc631f6..c9787f8b8 100644 --- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java +++ b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java @@ -38,7 +38,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ @@ -97,7 +100,7 @@ public void testPeek() throws Exception { } @Test - public void testPeek_NotFound() throws Exception { + public void testPeekNotFound() throws Exception { try { transporter.peek(new PeekTask(URI.create("missing.txt"))); fail("Expected error"); @@ -107,7 +110,7 @@ public void testPeek_NotFound() throws Exception { } @Test - public void testPeek_Closed() throws Exception { + public void testPeekClosed() throws Exception { transporter.close(); try { transporter.peek(new PeekTask(URI.create("missing.txt"))); @@ -118,7 +121,7 @@ public void testPeek_Closed() throws Exception { } @Test - public void testGet_ToMemory() throws Exception { + public void testGetToMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); transporter.get(task); @@ -131,7 +134,7 @@ public void testGet_ToMemory() throws Exception { } @Test - public void testGet_ToFile() throws Exception { + public void testGetToFile() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setDataFile(file).setListener(listener); @@ -145,7 +148,7 @@ public void testGet_ToFile() throws Exception { } @Test - public void testGet_EmptyResource() throws Exception { + public void testGetEmptyResource() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("empty.txt")).setDataFile(file).setListener(listener); @@ -159,28 +162,28 @@ public void testGet_EmptyResource() throws Exception { } @Test - public void testGet_EncodedResourcePath() throws Exception { + public void testGetEncodedResourcePath() throws Exception { GetTask task = new GetTask(URI.create("some%20space.txt")); transporter.get(task); assertEquals("space", task.getDataString()); } @Test - public void testGet_Fragment() throws Exception { + public void testGetFragment() throws Exception { GetTask task = new GetTask(URI.create("file.txt#ignored")); transporter.get(task); assertEquals("test", task.getDataString()); } @Test - public void testGet_Query() throws Exception { + public void testGetQuery() throws Exception { GetTask task = new GetTask(URI.create("file.txt?ignored")); transporter.get(task); assertEquals("test", task.getDataString()); } @Test - public void testGet_FileHandleLeak() throws Exception { + public void testGetFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File file = TestFileUtils.createTempFile("failure"); transporter.get(new GetTask(URI.create("file.txt")).setDataFile(file)); @@ -189,7 +192,7 @@ public void testGet_FileHandleLeak() throws Exception { } @Test - public void testGet_NotFound() throws Exception { + public void testGetNotFound() throws Exception { try { transporter.get(new GetTask(URI.create("missing.txt"))); fail("Expected error"); @@ -199,7 +202,7 @@ public void testGet_NotFound() throws Exception { } @Test - public void testGet_Closed() throws Exception { + public void testGetClosed() throws Exception { transporter.close(); try { transporter.get(new GetTask(URI.create("file.txt"))); @@ -210,7 +213,7 @@ public void testGet_Closed() throws Exception { } @Test - public void testGet_StartCancelled() throws Exception { + public void testGetStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -227,7 +230,7 @@ public void testGet_StartCancelled() throws Exception { } @Test - public void testGet_ProgressCancelled() throws Exception { + public void testGetProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -244,7 +247,7 @@ public void testGet_ProgressCancelled() throws Exception { } @Test - public void testPut_FromMemory() throws Exception { + public void testPutFromMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); transporter.put(task); @@ -256,7 +259,7 @@ public void testPut_FromMemory() throws Exception { } @Test - public void testPut_FromFile() throws Exception { + public void testPutFromFile() throws Exception { File file = TestFileUtils.createTempFile("upload"); RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataFile(file); @@ -269,7 +272,7 @@ public void testPut_FromFile() throws Exception { } @Test - public void testPut_EmptyResource() throws Exception { + public void testPutEmptyResource() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener); transporter.put(task); @@ -281,7 +284,7 @@ public void testPut_EmptyResource() throws Exception { } @Test - public void testPut_NonExistentParentDir() throws Exception { + public void testPutNonExistentParentDir() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("dir/sub/dir/file.txt")) .setListener(listener) @@ -295,7 +298,7 @@ public void testPut_NonExistentParentDir() throws Exception { } @Test - public void testPut_EncodedResourcePath() throws Exception { + public void testPutEncodedResourcePath() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("some%20space.txt")) .setListener(listener) @@ -309,7 +312,7 @@ public void testPut_EncodedResourcePath() throws Exception { } @Test - public void testPut_FileHandleLeak() throws Exception { + public void testPutFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File src = TestFileUtils.createTempFile("upload"); File dst = new File(repoDir, "file.txt"); @@ -320,7 +323,7 @@ public void testPut_FileHandleLeak() throws Exception { } @Test - public void testPut_Closed() throws Exception { + public void testPutClosed() throws Exception { transporter.close(); try { transporter.put(new PutTask(URI.create("missing.txt"))); @@ -331,7 +334,7 @@ public void testPut_Closed() throws Exception { } @Test - public void testPut_StartCancelled() throws Exception { + public void testPutStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); @@ -349,7 +352,7 @@ public void testPut_StartCancelled() throws Exception { } @Test - public void testPut_ProgressCancelled() throws Exception { + public void testPutProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); @@ -367,69 +370,69 @@ public void testPut_ProgressCancelled() throws Exception { } @Test(expected = NoTransporterException.class) - public void testInit_BadProtocol() throws Exception { + public void testInitBadProtocol() throws Exception { newTransporter("bad:/void"); } @Test - public void testInit_CaseInsensitiveProtocol() throws Exception { + public void testInitCaseInsensitiveProtocol() throws Exception { newTransporter("file:/void"); newTransporter("FILE:/void"); newTransporter("File:/void"); } @Test - public void testInit_OpaqueUrl() throws Exception { + public void testInitOpaqueUrl() throws Exception { testInit("file:repository", "repository"); } @Test - public void testInit_OpaqueUrlTrailingSlash() throws Exception { + public void testInitOpaqueUrlTrailingSlash() throws Exception { testInit("file:repository/", "repository"); } @Test - public void testInit_OpaqueUrlSpaces() throws Exception { + public void testInitOpaqueUrlSpaces() throws Exception { testInit("file:repo%20space", "repo space"); } @Test - public void testInit_OpaqueUrlSpacesDecoded() throws Exception { + public void testInitOpaqueUrlSpacesDecoded() throws Exception { testInit("file:repo space", "repo space"); } @Test - public void testInit_HierarchicalUrl() throws Exception { + public void testInitHierarchicalUrl() throws Exception { testInit("file:/repository", "/repository"); } @Test - public void testInit_HierarchicalUrlTrailingSlash() throws Exception { + public void testInitHierarchicalUrlTrailingSlash() throws Exception { testInit("file:/repository/", "/repository"); } @Test - public void testInit_HierarchicalUrlSpaces() throws Exception { + public void testInitHierarchicalUrlSpaces() throws Exception { testInit("file:/repo%20space", "/repo space"); } @Test - public void testInit_HierarchicalUrlSpacesDecoded() throws Exception { + public void testInitHierarchicalUrlSpacesDecoded() throws Exception { testInit("file:/repo space", "/repo space"); } @Test - public void testInit_HierarchicalUrlRoot() throws Exception { + public void testInitHierarchicalUrlRoot() throws Exception { testInit("file:/", "/"); } @Test - public void testInit_HierarchicalUrlHostNoPath() throws Exception { + public void testInitHierarchicalUrlHostNoPath() throws Exception { testInit("file://host/", "/"); } @Test - public void testInit_HierarchicalUrlHostPath() throws Exception { + public void testInitHierarchicalUrlHostPath() throws Exception { testInit("file://host/dir", "/dir"); } diff --git a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java index 03d1060c2..69e2d450b 100644 --- a/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java +++ b/maven-resolver-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java @@ -25,6 +25,7 @@ import org.eclipse.aether.spi.connector.transport.TransportListener; import org.eclipse.aether.transfer.TransferCancelledException; +@SuppressWarnings("checkstyle:VisibilityModifier") class RecordingTransportListener extends TransportListener { public final ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java index 29ff91a55..d4dee9e3d 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java +++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java @@ -52,6 +52,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +@SuppressWarnings("checkstyle:VisibilityModifier") public class HttpServer { public static class LogEntry { @@ -87,6 +88,8 @@ public enum ChecksumHeader { private static final Logger LOGGER = LoggerFactory.getLogger(HttpServer.class); + private static final Pattern SIMPLE_RANGE = Pattern.compile("bytes=([0-9])+-"); + private File repoDir; private boolean rangeSupport = true; @@ -281,8 +284,6 @@ public void handle(String target, Request req, HttpServletRequest request, HttpS private class RepoHandler extends AbstractHandler { - private final Pattern SIMPLE_RANGE = Pattern.compile("bytes=([0-9])+-"); - public void handle(String target, Request req, HttpServletRequest request, HttpServletResponse response) throws IOException { String path = req.getPathInfo().substring(1); diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java index 5c0de84a9..34c4bca39 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java +++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java @@ -56,7 +56,11 @@ import org.junit.Test; import org.junit.rules.TestName; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ @@ -149,13 +153,13 @@ public void testPeek() throws Exception { } @Test - public void testRetryHandler_defaultCount_positive() throws Exception { + public void testRetryHandlerdefaultCountpositive() throws Exception { httpServer.setConnectionsToClose(3); transporter.peek(new PeekTask(URI.create("repo/file.txt"))); } @Test - public void testRetryHandler_defaultCount_negative() throws Exception { + public void testRetryHandlerdefaultCountnegative() throws Exception { httpServer.setConnectionsToClose(4); try { transporter.peek(new PeekTask(URI.create("repo/file.txt"))); @@ -165,7 +169,7 @@ public void testRetryHandler_defaultCount_negative() throws Exception { } @Test - public void testRetryHandler_explicitCount_positive() throws Exception { + public void testRetryHandlerexplicitCountpositive() throws Exception { session.setConfigProperty(ConfigurationProperties.HTTP_RETRY_HANDLER_COUNT, 10); newTransporter(httpServer.getHttpUrl()); httpServer.setConnectionsToClose(10); @@ -173,7 +177,7 @@ public void testRetryHandler_explicitCount_positive() throws Exception { } @Test - public void testRetryHandler_disabled() throws Exception { + public void testRetryHandlerdisabled() throws Exception { session.setConfigProperty(ConfigurationProperties.HTTP_RETRY_HANDLER_COUNT, 0); newTransporter(httpServer.getHttpUrl()); httpServer.setConnectionsToClose(1); @@ -184,7 +188,7 @@ public void testRetryHandler_disabled() throws Exception { } @Test - public void testPeek_NotFound() throws Exception { + public void testPeekNotFound() throws Exception { try { transporter.peek(new PeekTask(URI.create("repo/missing.txt"))); fail("Expected error"); @@ -195,7 +199,7 @@ public void testPeek_NotFound() throws Exception { } @Test - public void testPeek_Closed() throws Exception { + public void testPeekClosed() throws Exception { transporter.close(); try { transporter.peek(new PeekTask(URI.create("repo/missing.txt"))); @@ -206,7 +210,7 @@ public void testPeek_Closed() throws Exception { } @Test - public void testPeek_Authenticated() throws Exception { + public void testPeekAuthenticated() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -217,7 +221,7 @@ public void testPeek_Authenticated() throws Exception { } @Test - public void testPeek_Unauthenticated() throws Exception { + public void testPeekUnauthenticated() throws Exception { httpServer.setAuthentication("testuser", "testpass"); try { transporter.peek(new PeekTask(URI.create("repo/file.txt"))); @@ -229,7 +233,7 @@ public void testPeek_Unauthenticated() throws Exception { } @Test - public void testPeek_ProxyAuthenticated() throws Exception { + public void testPeekProxyAuthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -241,7 +245,7 @@ public void testPeek_ProxyAuthenticated() throws Exception { } @Test - public void testPeek_ProxyUnauthenticated() throws Exception { + public void testPeekProxyUnauthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); proxy = new Proxy(Proxy.TYPE_HTTP, httpServer.getHost(), httpServer.getHttpPort()); newTransporter("http://bad.localhost:1/"); @@ -255,21 +259,21 @@ public void testPeek_ProxyUnauthenticated() throws Exception { } @Test - public void testPeek_SSL() throws Exception { + public void testPeekSSL() throws Exception { httpServer.addSslConnector(); newTransporter(httpServer.getHttpsUrl()); transporter.peek(new PeekTask(URI.create("repo/file.txt"))); } @Test - public void testPeek_Redirect() throws Exception { + public void testPeekRedirect() throws Exception { httpServer.addSslConnector(); transporter.peek(new PeekTask(URI.create("redirect/file.txt"))); transporter.peek(new PeekTask(URI.create("redirect/file.txt?scheme=https"))); } @Test - public void testGet_ToMemory() throws Exception { + public void testGetToMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener); transporter.get(task); @@ -282,7 +286,7 @@ public void testGet_ToMemory() throws Exception { } @Test - public void testGet_ToFile() throws Exception { + public void testGetToFile() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = @@ -297,7 +301,7 @@ public void testGet_ToFile() throws Exception { } @Test - public void testGet_ToFileTimestamp() throws Exception { + public void testGetToFileTimestamp() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("repo/dir/oldFile.txt")) @@ -314,7 +318,7 @@ public void testGet_ToFileTimestamp() throws Exception { } @Test - public void testGet_EmptyResource() throws Exception { + public void testGetEmptyResource() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = @@ -329,14 +333,14 @@ public void testGet_EmptyResource() throws Exception { } @Test - public void testGet_EncodedResourcePath() throws Exception { + public void testGetEncodedResourcePath() throws Exception { GetTask task = new GetTask(URI.create("repo/some%20space.txt")); transporter.get(task); assertEquals("space", task.getDataString()); } @Test - public void testGet_Authenticated() throws Exception { + public void testGetAuthenticated() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -355,7 +359,7 @@ public void testGet_Authenticated() throws Exception { } @Test - public void testGet_Unauthenticated() throws Exception { + public void testGetUnauthenticated() throws Exception { httpServer.setAuthentication("testuser", "testpass"); try { transporter.get(new GetTask(URI.create("repo/file.txt"))); @@ -367,7 +371,7 @@ public void testGet_Unauthenticated() throws Exception { } @Test - public void testGet_ProxyAuthenticated() throws Exception { + public void testGetProxyAuthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); Authentication auth = new AuthenticationBuilder() .addUsername("testuser") @@ -387,7 +391,7 @@ public void testGet_ProxyAuthenticated() throws Exception { } @Test - public void testGet_ProxyUnauthenticated() throws Exception { + public void testGetProxyUnauthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); proxy = new Proxy(Proxy.TYPE_HTTP, httpServer.getHost(), httpServer.getHttpPort()); newTransporter("http://bad.localhost:1/"); @@ -401,7 +405,7 @@ public void testGet_ProxyUnauthenticated() throws Exception { } @Test - public void testGet_SSL() throws Exception { + public void testGetSSL() throws Exception { httpServer.addSslConnector(); newTransporter(httpServer.getHttpsUrl()); RecordingTransportListener listener = new RecordingTransportListener(); @@ -416,7 +420,7 @@ public void testGet_SSL() throws Exception { } @Test - public void testGet_HTTPS_Unknown_SecurityMode() throws Exception { + public void testGetHTTPSUnknownSecurityMode() throws Exception { session.setConfigProperty("aether.connector.https.securityMode", "unknown"); httpServer.addSelfSignedSslConnector(); try { @@ -428,7 +432,7 @@ public void testGet_HTTPS_Unknown_SecurityMode() throws Exception { } @Test - public void testGet_HTTPS_Insecure_SecurityMode() throws Exception { + public void testGetHTTPSInsecureSecurityMode() throws Exception { // here we use alternate server-store-selfigned key (as the key set it static initalizer is probably already // used to init SSLContext/SSLSocketFactory/etc session.setConfigProperty( @@ -447,7 +451,7 @@ public void testGet_HTTPS_Insecure_SecurityMode() throws Exception { } @Test - public void testGet_WebDav() throws Exception { + public void testGetWebDav() throws Exception { httpServer.setWebDav(true); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("repo/dir/file.txt")).setListener(listener); @@ -466,7 +470,7 @@ public void testGet_WebDav() throws Exception { } @Test - public void testGet_Redirect() throws Exception { + public void testGetRedirect() throws Exception { httpServer.addSslConnector(); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("redirect/file.txt?scheme=https")).setListener(listener); @@ -480,7 +484,7 @@ public void testGet_Redirect() throws Exception { } @Test - public void testGet_Resume() throws Exception { + public void testGetResume() throws Exception { File file = TestFileUtils.createTempFile("re"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("repo/resume.txt")) @@ -496,7 +500,7 @@ public void testGet_Resume() throws Exception { } @Test - public void testGet_ResumeLocalContentsOutdated() throws Exception { + public void testGetResumeLocalContentsOutdated() throws Exception { File file = TestFileUtils.createTempFile("re"); file.setLastModified(System.currentTimeMillis() - 5 * 60 * 1000); RecordingTransportListener listener = new RecordingTransportListener(); @@ -513,7 +517,7 @@ public void testGet_ResumeLocalContentsOutdated() throws Exception { } @Test - public void testGet_ResumeRangesNotSupportedByServer() throws Exception { + public void testGetResumeRangesNotSupportedByServer() throws Exception { httpServer.setRangeSupport(false); File file = TestFileUtils.createTempFile("re"); RecordingTransportListener listener = new RecordingTransportListener(); @@ -530,7 +534,7 @@ public void testGet_ResumeRangesNotSupportedByServer() throws Exception { } @Test - public void testGet_Checksums_Nexus() throws Exception { + public void testGetChecksumsNexus() throws Exception { httpServer.setChecksumHeader(HttpServer.ChecksumHeader.NEXUS); GetTask task = new GetTask(URI.create("repo/file.txt")); transporter.get(task); @@ -540,7 +544,7 @@ public void testGet_Checksums_Nexus() throws Exception { } @Test - public void testGet_Checksums_XChecksum() throws Exception { + public void testGetChecksumsXChecksum() throws Exception { httpServer.setChecksumHeader(HttpServer.ChecksumHeader.XCHECKSUM); GetTask task = new GetTask(URI.create("repo/file.txt")); transporter.get(task); @@ -550,7 +554,7 @@ public void testGet_Checksums_XChecksum() throws Exception { } @Test - public void testGet_FileHandleLeak() throws Exception { + public void testGetFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File file = TestFileUtils.createTempFile("failure"); transporter.get(new GetTask(URI.create("repo/file.txt")).setDataFile(file)); @@ -559,7 +563,7 @@ public void testGet_FileHandleLeak() throws Exception { } @Test - public void testGet_NotFound() throws Exception { + public void testGetNotFound() throws Exception { try { transporter.get(new GetTask(URI.create("repo/missing.txt"))); fail("Expected error"); @@ -570,7 +574,7 @@ public void testGet_NotFound() throws Exception { } @Test - public void testGet_Closed() throws Exception { + public void testGetClosed() throws Exception { transporter.close(); try { transporter.get(new GetTask(URI.create("repo/file.txt"))); @@ -581,7 +585,7 @@ public void testGet_Closed() throws Exception { } @Test - public void testGet_StartCancelled() throws Exception { + public void testGetStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener); @@ -598,7 +602,7 @@ public void testGet_StartCancelled() throws Exception { } @Test - public void testGet_ProgressCancelled() throws Exception { + public void testGetProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; GetTask task = new GetTask(URI.create("repo/file.txt")).setListener(listener); @@ -615,7 +619,7 @@ public void testGet_ProgressCancelled() throws Exception { } @Test - public void testPut_FromMemory() throws Exception { + public void testPutFromMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("repo/file.txt")).setListener(listener).setDataString("upload"); @@ -628,7 +632,7 @@ public void testPut_FromMemory() throws Exception { } @Test - public void testPut_FromFile() throws Exception { + public void testPutFromFile() throws Exception { File file = TestFileUtils.createTempFile("upload"); RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = @@ -642,7 +646,7 @@ public void testPut_FromFile() throws Exception { } @Test - public void testPut_EmptyResource() throws Exception { + public void testPutEmptyResource() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("repo/file.txt")).setListener(listener); transporter.put(task); @@ -654,7 +658,7 @@ public void testPut_EmptyResource() throws Exception { } @Test - public void testPut_EncodedResourcePath() throws Exception { + public void testPutEncodedResourcePath() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("repo/some%20space.txt")) .setListener(listener) @@ -668,7 +672,7 @@ public void testPut_EncodedResourcePath() throws Exception { } @Test - public void testPut_Authenticated_ExpectContinue() throws Exception { + public void testPutAuthenticatedExpectContinue() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -687,7 +691,7 @@ public void testPut_Authenticated_ExpectContinue() throws Exception { } @Test - public void testPut_Authenticated_ExpectContinueBroken() throws Exception { + public void testPutAuthenticatedExpectContinueBroken() throws Exception { // this makes OPTIONS recover, and have only 1 PUT (startedCount=1 as OPTIONS is not counted) session.setConfigProperty(HttpTransporter.SUPPORT_WEBDAV, true); httpServer.setAuthentication("testuser", "testpass"); @@ -709,7 +713,7 @@ public void testPut_Authenticated_ExpectContinueBroken() throws Exception { } @Test - public void testPut_Authenticated_ExpectContinueRejected() throws Exception { + public void testPutAuthenticatedExpectContinueRejected() throws Exception { httpServer.setAuthentication("testuser", "testpass"); httpServer.setExpectSupport(HttpServer.ExpectContinue.FAIL); auth = new AuthenticationBuilder() @@ -729,7 +733,7 @@ public void testPut_Authenticated_ExpectContinueRejected() throws Exception { } @Test - public void testPut_Authenticated_ExpectContinueDisabled() throws Exception { + public void testPutAuthenticatedExpectContinueDisabled() throws Exception { session.setConfigProperty(ConfigurationProperties.HTTP_EXPECT_CONTINUE, false); httpServer.setAuthentication("testuser", "testpass"); httpServer.setExpectSupport(HttpServer.ExpectContinue.FAIL); // if transport tries Expect/Continue explode @@ -750,7 +754,7 @@ public void testPut_Authenticated_ExpectContinueDisabled() throws Exception { } @Test - public void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHeader() throws Exception { + public void testPutAuthenticatedExpectContinueRejectedExplicitlyConfiguredHeader() throws Exception { Map headers = new HashMap<>(); headers.put("Expect", "100-continue"); session.setConfigProperty(ConfigurationProperties.HTTP_HEADERS + ".test", headers); @@ -773,7 +777,7 @@ public void testPut_Authenticated_ExpectContinueRejected_ExplicitlyConfiguredHea } @Test - public void testPut_Unauthenticated() throws Exception { + public void testPutUnauthenticated() throws Exception { httpServer.setAuthentication("testuser", "testpass"); RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = @@ -790,7 +794,7 @@ public void testPut_Unauthenticated() throws Exception { } @Test - public void testPut_ProxyAuthenticated() throws Exception { + public void testPutProxyAuthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); Authentication auth = new AuthenticationBuilder() .addUsername("testuser") @@ -810,7 +814,7 @@ public void testPut_ProxyAuthenticated() throws Exception { } @Test - public void testPut_ProxyUnauthenticated() throws Exception { + public void testPutProxyUnauthenticated() throws Exception { httpServer.setProxyAuthentication("testuser", "testpass"); proxy = new Proxy(Proxy.TYPE_HTTP, httpServer.getHost(), httpServer.getHttpPort()); newTransporter("http://bad.localhost:1/"); @@ -829,7 +833,7 @@ public void testPut_ProxyUnauthenticated() throws Exception { } @Test - public void testPut_SSL() throws Exception { + public void testPutSSL() throws Exception { httpServer.addSslConnector(); httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() @@ -849,7 +853,7 @@ public void testPut_SSL() throws Exception { } @Test - public void testPut_WebDav() throws Exception { + public void testPutWebDav() throws Exception { httpServer.setWebDav(true); session.setConfigProperty(HttpTransporter.SUPPORT_WEBDAV, true); newTransporter(httpServer.getHttpUrl()); @@ -877,7 +881,7 @@ public void testPut_WebDav() throws Exception { } @Test - public void testPut_FileHandleLeak() throws Exception { + public void testPutFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File src = TestFileUtils.createTempFile("upload"); File dst = new File(repoDir, "file.txt"); @@ -888,7 +892,7 @@ public void testPut_FileHandleLeak() throws Exception { } @Test - public void testPut_Closed() throws Exception { + public void testPutClosed() throws Exception { transporter.close(); try { transporter.put(new PutTask(URI.create("repo/missing.txt"))); @@ -899,7 +903,7 @@ public void testPut_Closed() throws Exception { } @Test - public void testPut_StartCancelled() throws Exception { + public void testPutStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; PutTask task = @@ -917,7 +921,7 @@ public void testPut_StartCancelled() throws Exception { } @Test - public void testPut_ProgressCancelled() throws Exception { + public void testPutProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; PutTask task = @@ -935,7 +939,7 @@ public void testPut_ProgressCancelled() throws Exception { } @Test - public void testGetPut_AuthCache() throws Exception { + public void testGetPutAuthCache() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -952,7 +956,7 @@ public void testGetPut_AuthCache() throws Exception { } @Test - public void testPut_PreemptiveIsDefault() throws Exception { + public void testPutPreemptiveIsDefault() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -965,7 +969,7 @@ public void testPut_PreemptiveIsDefault() throws Exception { } @Test - public void testPut_AuthCache() throws Exception { + public void testPutAuthCache() throws Exception { session.setConfigProperty(HttpTransporter.PREEMPTIVE_PUT_AUTH, false); httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() @@ -983,7 +987,7 @@ public void testPut_AuthCache() throws Exception { } @Test - public void testPut_AuthCache_Preemptive() throws Exception { + public void testPutAuthCachePreemptive() throws Exception { httpServer.setAuthentication("testuser", "testpass"); auth = new AuthenticationBuilder() .addUsername("testuser") @@ -1098,7 +1102,7 @@ public void testCustomHeaders() throws Exception { } @Test - public void testServerAuthScope_NotUsedForProxy() throws Exception { + public void testServerAuthScopeNotUsedForProxy() throws Exception { String username = "testuser", password = "testpass"; httpServer.setProxyAuthentication(username, password); auth = new AuthenticationBuilder() @@ -1116,7 +1120,7 @@ public void testServerAuthScope_NotUsedForProxy() throws Exception { } @Test - public void testProxyAuthScope_NotUsedForServer() throws Exception { + public void testProxyAuthScopeNotUsedForServer() throws Exception { String username = "testuser", password = "testpass"; httpServer.setAuthentication(username, password); Authentication auth = new AuthenticationBuilder() @@ -1224,17 +1228,17 @@ public void testConnectionNoReuse() throws Exception { } @Test(expected = NoTransporterException.class) - public void testInit_BadProtocol() throws Exception { + public void testInitBadProtocol() throws Exception { newTransporter("bad:/void"); } @Test(expected = NoTransporterException.class) - public void testInit_BadUrl() throws Exception { + public void testInitBadUrl() throws Exception { newTransporter("http://localhost:NaN"); } @Test - public void testInit_CaseInsensitiveProtocol() throws Exception { + public void testInitCaseInsensitiveProtocol() throws Exception { newTransporter("http://localhost"); newTransporter("HTTP://localhost"); newTransporter("Http://localhost"); diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java index 2c2eb124c..6b5cea0c4 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java +++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java @@ -25,6 +25,7 @@ import org.eclipse.aether.spi.connector.transport.TransportListener; import org.eclipse.aether.transfer.TransferCancelledException; +@SuppressWarnings("checkstyle:VisibilityModifier") class RecordingTransportListener extends TransportListener { public final ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); diff --git a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java index efeb80489..3754ebce7 100644 --- a/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java +++ b/maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java @@ -25,7 +25,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class UriUtilsTest { @@ -34,7 +34,7 @@ private String resolve(URI base, String ref) { } @Test - public void testResolve_BaseEmptyPath() { + public void testResolveBaseEmptyPath() { URI base = URI.create("http://host"); assertEquals("http://host/file.jar", resolve(base, "file.jar")); assertEquals("http://host/dir/file.jar", resolve(base, "dir/file.jar")); @@ -44,7 +44,7 @@ public void testResolve_BaseEmptyPath() { } @Test - public void testResolve_BaseRootPath() { + public void testResolveBaseRootPath() { URI base = URI.create("http://host/"); assertEquals("http://host/file.jar", resolve(base, "file.jar")); assertEquals("http://host/dir/file.jar", resolve(base, "dir/file.jar")); @@ -54,7 +54,7 @@ public void testResolve_BaseRootPath() { } @Test - public void testResolve_BasePathTrailingSlash() { + public void testResolveBasePathTrailingSlash() { URI base = URI.create("http://host/sub/dir/"); assertEquals("http://host/sub/dir/file.jar", resolve(base, "file.jar")); assertEquals("http://host/sub/dir/dir/file.jar", resolve(base, "dir/file.jar")); @@ -64,7 +64,7 @@ public void testResolve_BasePathTrailingSlash() { } @Test - public void testResolve_BasePathNoTrailingSlash() { + public void testResolveBasePathNoTrailingSlash() { URI base = URI.create("http://host/sub/d%20r"); assertEquals("http://host/sub/d%20r/file.jar", resolve(base, "file.jar")); assertEquals("http://host/sub/d%20r/dir/file.jar", resolve(base, "dir/file.jar")); @@ -86,7 +86,7 @@ private void assertUris(List actual, String... expected) { } @Test - public void testGetDirectories_NoBase() { + public void testGetDirectoriesNoBase() { List parents = getDirs(null, "http://host/repo/sub/dir/file.jar"); assertUris(parents, "http://host/repo/sub/dir/", "http://host/repo/sub/", "http://host/repo/"); @@ -98,7 +98,7 @@ public void testGetDirectories_NoBase() { } @Test - public void testGetDirectories_ExplicitBaseTrailingSlash() { + public void testGetDirectoriesExplicitBaseTrailingSlash() { List parents = getDirs("http://host/repo/", "http://host/repo/sub/dir/file.jar"); assertUris(parents, "http://host/repo/sub/dir/", "http://host/repo/sub/"); @@ -110,7 +110,7 @@ public void testGetDirectories_ExplicitBaseTrailingSlash() { } @Test - public void testGetDirectories_ExplicitBaseNoTrailingSlash() { + public void testGetDirectoriesExplicitBaseNoTrailingSlash() { List parents = getDirs("http://host/repo", "http://host/repo/sub/dir/file.jar"); assertUris(parents, "http://host/repo/sub/dir/", "http://host/repo/sub/"); diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java index 9c440154f..cd35e0877 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java +++ b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java @@ -131,7 +131,7 @@ public void testPeek() throws Exception { } @Test - public void testPeek_NotFound() throws Exception { + public void testPeekNotFound() throws Exception { try { transporter.peek(new PeekTask(URI.create("missing.txt"))); fail("Expected error"); @@ -141,7 +141,7 @@ public void testPeek_NotFound() throws Exception { } @Test - public void testPeek_Closed() throws Exception { + public void testPeekClosed() throws Exception { transporter.close(); try { transporter.peek(new PeekTask(URI.create("missing.txt"))); @@ -152,7 +152,7 @@ public void testPeek_Closed() throws Exception { } @Test - public void testGet_ToMemory() throws Exception { + public void testGetToMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); transporter.get(task); @@ -165,7 +165,7 @@ public void testGet_ToMemory() throws Exception { } @Test - public void testGet_ToFile() throws Exception { + public void testGetToFile() throws Exception { File file = TestFileUtils.createTempFile("failure"); RecordingTransportListener listener = new RecordingTransportListener(); GetTask task = new GetTask(URI.create("file.txt")).setDataFile(file).setListener(listener); @@ -179,7 +179,7 @@ public void testGet_ToFile() throws Exception { } @Test - public void testGet_EmptyResource() throws Exception { + public void testGetEmptyResource() throws Exception { File file = TestFileUtils.createTempFile("failure"); assertTrue(file.delete() && !file.exists()); RecordingTransportListener listener = new RecordingTransportListener(); @@ -194,14 +194,14 @@ public void testGet_EmptyResource() throws Exception { } @Test - public void testGet_EncodedResourcePath() throws Exception { + public void testGetEncodedResourcePath() throws Exception { GetTask task = new GetTask(URI.create("some%20space.txt")); transporter.get(task); assertEquals("space", task.getDataString()); } @Test - public void testGet_FileHandleLeak() throws Exception { + public void testGetFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File file = TestFileUtils.createTempFile("failure"); transporter.get(new GetTask(URI.create("file.txt")).setDataFile(file)); @@ -210,7 +210,7 @@ public void testGet_FileHandleLeak() throws Exception { } @Test - public void testGet_NotFound() throws Exception { + public void testGetNotFound() throws Exception { try { transporter.get(new GetTask(URI.create("missing.txt"))); fail("Expected error"); @@ -220,7 +220,7 @@ public void testGet_NotFound() throws Exception { } @Test - public void testGet_Closed() throws Exception { + public void testGetClosed() throws Exception { transporter.close(); try { transporter.get(new GetTask(URI.create("file.txt"))); @@ -231,7 +231,7 @@ public void testGet_Closed() throws Exception { } @Test - public void testGet_StartCancelled() throws Exception { + public void testGetStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -240,7 +240,7 @@ public void testGet_StartCancelled() throws Exception { } @Test - public void testGet_ProgressCancelled() throws Exception { + public void testGetProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; GetTask task = new GetTask(URI.create("file.txt")).setListener(listener); @@ -257,7 +257,7 @@ public void testGet_ProgressCancelled() throws Exception { } @Test - public void testPut_FromMemory() throws Exception { + public void testPutFromMemory() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); transporter.put(task); @@ -269,7 +269,7 @@ public void testPut_FromMemory() throws Exception { } @Test - public void testPut_FromFile() throws Exception { + public void testPutFromFile() throws Exception { File file = TestFileUtils.createTempFile("upload"); RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataFile(file); @@ -282,7 +282,7 @@ public void testPut_FromFile() throws Exception { } @Test - public void testPut_EmptyResource() throws Exception { + public void testPutEmptyResource() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("file.txt")).setListener(listener); transporter.put(task); @@ -294,7 +294,7 @@ public void testPut_EmptyResource() throws Exception { } @Test - public void testPut_NonExistentParentDir() throws Exception { + public void testPutNonExistentParentDir() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("dir/sub/dir/file.txt")) .setListener(listener) @@ -308,7 +308,7 @@ public void testPut_NonExistentParentDir() throws Exception { } @Test - public void testPut_EncodedResourcePath() throws Exception { + public void testPutEncodedResourcePath() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); PutTask task = new PutTask(URI.create("some%20space.txt")) .setListener(listener) @@ -322,7 +322,7 @@ public void testPut_EncodedResourcePath() throws Exception { } @Test - public void testPut_FileHandleLeak() throws Exception { + public void testPutFileHandleLeak() throws Exception { for (int i = 0; i < 100; i++) { File src = TestFileUtils.createTempFile("upload"); transporter.put(new PutTask(URI.create("file.txt")).setDataFile(src)); @@ -331,7 +331,7 @@ public void testPut_FileHandleLeak() throws Exception { } @Test - public void testPut_Closed() throws Exception { + public void testPutClosed() throws Exception { transporter.close(); try { transporter.put(new PutTask(URI.create("missing.txt"))); @@ -342,7 +342,7 @@ public void testPut_Closed() throws Exception { } @Test - public void testPut_StartCancelled() throws Exception { + public void testPutStartCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelStart = true; PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); @@ -351,7 +351,7 @@ public void testPut_StartCancelled() throws Exception { } @Test - public void testPut_ProgressCancelled() throws Exception { + public void testPutProgressCancelled() throws Exception { RecordingTransportListener listener = new RecordingTransportListener(); listener.cancelProgress = true; PutTask task = new PutTask(URI.create("file.txt")).setListener(listener).setDataString("upload"); @@ -368,40 +368,40 @@ public void testPut_ProgressCancelled() throws Exception { } @Test(expected = NoTransporterException.class) - public void testInit_BadProtocol() throws Exception { + public void testInitBadProtocol() throws Exception { newTransporter("bad:/void"); } @Test - public void testInit_CaseInsensitiveProtocol() throws Exception { + public void testInitCaseInsensitiveProtocol() throws Exception { newTransporter("mem:/void"); newTransporter("MEM:/void"); newTransporter("mEm:/void"); } @Test - public void testInit_Configuration() throws Exception { + public void testInitConfiguration() throws Exception { session.setConfigProperty("aether.connector.wagon.config.test", "passed"); newTransporter("mem://" + id + "?config=passed"); transporter.peek(new PeekTask(URI.create("file.txt"))); } @Test - public void testInit_UserAgent() throws Exception { + public void testInitUserAgent() throws Exception { session.setConfigProperty(ConfigurationProperties.USER_AGENT, "Test/1.0"); newTransporter("mem://" + id + "?userAgent=Test/1.0"); transporter.peek(new PeekTask(URI.create("file.txt"))); } @Test - public void testInit_Timeout() throws Exception { + public void testInitTimeout() throws Exception { session.setConfigProperty(ConfigurationProperties.REQUEST_TIMEOUT, "12345678"); newTransporter("mem://" + id + "?requestTimeout=12345678"); transporter.peek(new PeekTask(URI.create("file.txt"))); } @Test - public void testInit_ServerAuth() throws Exception { + public void testInitServerAuth() throws Exception { String url = "mem://" + id + "?serverUsername=testuser&serverPassword=testpass" + "&serverPrivateKey=testkey&serverPassphrase=testphrase"; Authentication auth = new AuthenticationBuilder() @@ -417,7 +417,7 @@ public void testInit_ServerAuth() throws Exception { } @Test - public void testInit_Proxy() throws Exception { + public void testInitProxy() throws Exception { String url = "mem://" + id + "?proxyHost=testhost&proxyPort=8888"; RemoteRepository repo = new RemoteRepository.Builder("test", "default", url) .setProxy(new Proxy("http", "testhost", 8888)) @@ -427,7 +427,7 @@ public void testInit_Proxy() throws Exception { } @Test - public void testInit_ProxyAuth() throws Exception { + public void testInitProxyAuth() throws Exception { String url = "mem://" + id + "?proxyUsername=testuser&proxyPassword=testpass"; Authentication auth = new AuthenticationBuilder() .addUsername("testuser") diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java index aae705737..6c7021309 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java +++ b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java @@ -34,13 +34,13 @@ */ class MemWagonUtils { - private static final ConcurrentMap> mounts = new ConcurrentHashMap<>(); + private static final ConcurrentMap> MOUNTS = new ConcurrentHashMap<>(); public static Map getFilesystem(String id) { - Map fs = mounts.get(id); + Map fs = MOUNTS.get(id); if (fs == null) { fs = new ConcurrentHashMap<>(); - Map prev = mounts.putIfAbsent(id, fs); + Map prev = MOUNTS.putIfAbsent(id, fs); if (prev != null) { fs = prev; } diff --git a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java index ec40fd177..9b53eec4b 100644 --- a/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java +++ b/maven-resolver-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java @@ -25,6 +25,7 @@ import org.eclipse.aether.spi.connector.transport.TransportListener; import org.eclipse.aether.transfer.TransferCancelledException; +@SuppressWarnings("checkstyle:VisibilityModifier") class RecordingTransportListener extends TransportListener { public final ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); diff --git a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java index 39391eb11..e6dd105ed 100644 --- a/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java +++ b/maven-resolver-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java @@ -18,7 +18,18 @@ */ package org.eclipse.aether.util.graph.transformer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Objects; import org.eclipse.aether.RepositoryException; import org.eclipse.aether.RepositorySystemSession; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java index 748405554..70bf97185 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java @@ -30,8 +30,11 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.eclipse.aether.internal.test.util.TestFileUtils.*; -import static org.junit.Assert.*; +import static org.eclipse.aether.internal.test.util.TestFileUtils.createTempFile; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class ChecksumUtilTest { private static final String EMPTY = "EMPTY"; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java index 55a84595a..a8c6a0c9f 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java @@ -28,74 +28,77 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class ConfigUtilsTest { Map config = new HashMap<>(); @Test - public void testGetObject_Default() { + public void testGetObjectDefault() { Object val = new Object(); assertSame(val, ConfigUtils.getObject(config, val, "no-value")); } @Test - public void testGetObject_AlternativeKeys() { + public void testGetObjectAlternativeKeys() { Object val = new Object(); config.put("some-object", val); assertSame(val, ConfigUtils.getObject(config, null, "no-object", "some-object")); } @Test - public void testGetMap_Default() { + public void testGetMapDefault() { Map val = new HashMap(); assertSame(val, ConfigUtils.getMap(config, val, "no-value")); } @Test - public void testGetMap_AlternativeKeys() { + public void testGetMapAlternativeKeys() { Map val = new HashMap(); config.put("some-map", val); assertSame(val, ConfigUtils.getMap(config, null, "no-object", "some-map")); } @Test - public void testGetList_Default() { + public void testGetListDefault() { List val = new ArrayList(); assertSame(val, ConfigUtils.getList(config, val, "no-value")); } @Test - public void testGetList_AlternativeKeys() { + public void testGetListAlternativeKeys() { List val = new ArrayList(); config.put("some-list", val); assertSame(val, ConfigUtils.getList(config, null, "no-object", "some-list")); } @Test - public void testGetList_CollectionConversion() { + public void testGetListCollectionConversion() { Collection val = Collections.singleton("item"); config.put("some-collection", val); assertEquals(Arrays.asList("item"), ConfigUtils.getList(config, null, "some-collection")); } @Test - public void testGetString_Default() { + public void testGetStringDefault() { config.put("no-string", new Object()); assertEquals("default", ConfigUtils.getString(config, "default", "no-value")); assertEquals("default", ConfigUtils.getString(config, "default", "no-string")); } @Test - public void testGetString_AlternativeKeys() { + public void testGetStringAlternativeKeys() { config.put("no-string", new Object()); config.put("some-string", "passed"); assertEquals("passed", ConfigUtils.getString(config, "default", "no-string", "some-string")); } @Test - public void testGetBoolean_Default() { + public void testGetBooleanDefault() { config.put("no-boolean", new Object()); assertTrue(ConfigUtils.getBoolean(config, true, "no-value")); assertFalse(ConfigUtils.getBoolean(config, false, "no-value")); @@ -104,7 +107,7 @@ public void testGetBoolean_Default() { } @Test - public void testGetBoolean_AlternativeKeys() { + public void testGetBooleanAlternativeKeys() { config.put("no-boolean", new Object()); config.put("some-boolean", true); assertTrue(ConfigUtils.getBoolean(config, false, "no-boolean", "some-boolean")); @@ -113,7 +116,7 @@ public void testGetBoolean_AlternativeKeys() { } @Test - public void testGetBoolean_StringConversion() { + public void testGetBooleanStringConversion() { config.put("some-boolean", "true"); assertTrue(ConfigUtils.getBoolean(config, false, "some-boolean")); config.put("some-boolean", "false"); @@ -121,73 +124,73 @@ public void testGetBoolean_StringConversion() { } @Test - public void testGetInteger_Default() { + public void testGetIntegerDefault() { config.put("no-integer", new Object()); assertEquals(-17, ConfigUtils.getInteger(config, -17, "no-value")); assertEquals(43, ConfigUtils.getInteger(config, 43, "no-integer")); } @Test - public void testGetInteger_AlternativeKeys() { + public void testGetIntegerAlternativeKeys() { config.put("no-integer", "text"); config.put("some-integer", 23); assertEquals(23, ConfigUtils.getInteger(config, 0, "no-integer", "some-integer")); } @Test - public void testGetInteger_StringConversion() { + public void testGetIntegerStringConversion() { config.put("some-integer", "-123456"); assertEquals(-123456, ConfigUtils.getInteger(config, 0, "some-integer")); } @Test - public void testGetInteger_NumberConversion() { + public void testGetIntegerNumberConversion() { config.put("some-number", -123456.789); assertEquals(-123456, ConfigUtils.getInteger(config, 0, "some-number")); } @Test - public void testGetLong_Default() { + public void testGetLongDefault() { config.put("no-long", new Object()); assertEquals(-17L, ConfigUtils.getLong(config, -17L, "no-value")); assertEquals(43L, ConfigUtils.getLong(config, 43L, "no-long")); } @Test - public void testGetLong_AlternativeKeys() { + public void testGetLongAlternativeKeys() { config.put("no-long", "text"); config.put("some-long", 23L); assertEquals(23L, ConfigUtils.getLong(config, 0, "no-long", "some-long")); } @Test - public void testGetLong_StringConversion() { + public void testGetLongStringConversion() { config.put("some-long", "-123456789012"); assertEquals(-123456789012L, ConfigUtils.getLong(config, 0, "some-long")); } @Test - public void testGetLong_NumberConversion() { + public void testGetLongNumberConversion() { config.put("some-number", -123456789012.789); assertEquals(-123456789012L, ConfigUtils.getLong(config, 0, "some-number")); } @Test - public void testGetFloat_Default() { + public void testGetFloatDefault() { config.put("no-float", new Object()); assertEquals(-17.1f, ConfigUtils.getFloat(config, -17.1f, "no-value"), 0.01f); assertEquals(43.2f, ConfigUtils.getFloat(config, 43.2f, "no-float"), 0.01f); } @Test - public void testGetFloat_AlternativeKeys() { + public void testGetFloatAlternativeKeys() { config.put("no-float", "text"); config.put("some-float", 12.3f); assertEquals(12.3f, ConfigUtils.getFloat(config, 0, "no-float", "some-float"), 0.01f); } @Test - public void testGetFloat_StringConversion() { + public void testGetFloatStringConversion() { config.put("some-float", "-12.3"); assertEquals(-12.3f, ConfigUtils.getFloat(config, 0, "some-float"), 0.01f); config.put("some-float", "NaN"); @@ -195,7 +198,7 @@ public void testGetFloat_StringConversion() { } @Test - public void testGetFloat_NumberConversion() { + public void testGetFloatNumberConversion() { config.put("some-number", -1234f); assertEquals(-1234f, ConfigUtils.getFloat(config, 0, "some-number"), 0.1f); } diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java index 8bfb0f7b5..12782b5fc 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java @@ -20,7 +20,8 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; @SuppressWarnings("deprecation") public class StringUtilsTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java index 26f755001..333628fd6 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java @@ -22,7 +22,10 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java index 2a6473afa..1c44b08f1 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java @@ -27,7 +27,11 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java index 2c01c8f44..d60659a0b 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java @@ -27,7 +27,9 @@ import org.eclipse.aether.internal.test.util.NodeBuilder; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class AndDependencyFilterTest extends AbstractDependencyFilterTest { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java index 7b6d78e10..a3f858af6 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java @@ -26,13 +26,14 @@ import org.eclipse.aether.internal.test.util.NodeBuilder; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** */ public class DependencyFilterUtilsTest { - private static List PARENTS = Collections.emptyList(); + private static final List PARENTS = Collections.emptyList(); @Test public void testClasspathFilterCompile() { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java index d2bc3b6d4..d17a15595 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java @@ -26,7 +26,8 @@ import org.eclipse.aether.internal.test.util.NodeBuilder; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ExclusionDependencyFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java index 9a93b7452..9f68734b4 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java @@ -27,7 +27,9 @@ import org.eclipse.aether.internal.test.util.NodeBuilder; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class OrDependencyFilterTest extends AbstractDependencyFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java index e6d1c00e3..cd056e1d7 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java @@ -27,7 +27,8 @@ import org.eclipse.aether.version.VersionScheme; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PatternExclusionsDependencyFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java index 9b022d595..b0b2a629d 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java @@ -27,7 +27,8 @@ import org.eclipse.aether.version.VersionScheme; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class PatternInclusionsDependencyFilterTest extends AbstractDependencyFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java index 573277918..35e223431 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java @@ -26,7 +26,8 @@ import org.eclipse.aether.internal.test.util.NodeBuilder; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; public class ScopeDependencyFilterTest extends AbstractDependencyFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java index 00f3d5f3c..7c7fded58 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java @@ -31,17 +31,19 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; public class ClassicDependencyManagerTest { - private final Artifact A = new DefaultArtifact("test", "a", "", ""); + private static final Artifact A = new DefaultArtifact("test", "a", "", ""); - private final Artifact A1 = new DefaultArtifact("test", "a", "", "1"); + private static final Artifact A1 = new DefaultArtifact("test", "a", "", "1"); - private final Artifact B = new DefaultArtifact("test", "b", "", ""); + private static final Artifact B = new DefaultArtifact("test", "b", "", ""); - private final Artifact B1 = new DefaultArtifact("test", "b", "", "1"); + private static final Artifact B1 = new DefaultArtifact("test", "b", "", "1"); private RepositorySystemSession session; diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java index 24c541b32..a2b3d2cd9 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java @@ -29,7 +29,13 @@ import org.junit.Test; import static java.util.Objects.requireNonNull; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class AndDependencySelectorTest { @@ -39,16 +45,16 @@ static class DummyDependencySelector implements DependencySelector { private final DependencySelector child; - public DummyDependencySelector() { + DummyDependencySelector() { this(true); } - public DummyDependencySelector(boolean select) { + DummyDependencySelector(boolean select) { this.select = select; this.child = this; } - public DummyDependencySelector(boolean select, DependencySelector child) { + DummyDependencySelector(boolean select, DependencySelector child) { this.select = select; this.child = child; } @@ -97,7 +103,7 @@ public void testTraverseDependency() { } @Test - public void testDeriveChildSelector_Unchanged() { + public void testDeriveChildSelectorUnchanged() { DependencySelector other1 = new DummyDependencySelector(true); DependencySelector other2 = new DummyDependencySelector(false); DependencySelector selector = new AndDependencySelector(other1, other2); @@ -107,7 +113,7 @@ public void testDeriveChildSelector_Unchanged() { } @Test - public void testDeriveChildSelector_OneRemaining() { + public void testDeriveChildSelectorOneRemaining() { DependencySelector other1 = new DummyDependencySelector(true); DependencySelector other2 = new DummyDependencySelector(false, null); DependencySelector selector = new AndDependencySelector(other1, other2); @@ -117,7 +123,7 @@ public void testDeriveChildSelector_OneRemaining() { } @Test - public void testDeriveChildSelector_ZeroRemaining() { + public void testDeriveChildSelectorZeroRemaining() { DependencySelector other1 = new DummyDependencySelector(true, null); DependencySelector other2 = new DummyDependencySelector(false, null); DependencySelector selector = new AndDependencySelector(other1, other2); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java index d6adf98c0..0a8eab3eb 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelectorTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.graph.Exclusion; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ExclusionDependencySelectorTest { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java index 19e5bd865..9b52d57e6 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelectorTest.java @@ -20,7 +20,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class OptionalDependencySelectorTest { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java index f16f49be8..504914fa6 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelectorTest.java @@ -22,7 +22,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class ScopeDependencySelectorTest { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java index 55344bbff..bdc101f93 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/selector/StaticDependencySelectorTest.java @@ -20,7 +20,7 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class StaticDependencySelectorTest { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java index 43b797331..da914f236 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Before; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java index 1e01033ca..d9857f70d 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java @@ -28,7 +28,10 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java index 878f72c0f..51a98c9bc 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java @@ -25,7 +25,11 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java index 8a5309133..52d09b1e3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java index 62b1b71b4..63e4a2c6c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java @@ -25,7 +25,8 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; public class JavaScopeSelectorTest extends AbstractDependencyGraphTransformerTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java index a5cf77c2a..0edfd8d26 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java @@ -25,7 +25,9 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java index 04d22b351..36f2a3bfc 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java @@ -22,7 +22,9 @@ import org.eclipse.aether.util.graph.transformer.ConflictIdSorter.RootQueue; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class RootQueueTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java index 8fd5733b3..ff589bfe4 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java @@ -23,7 +23,10 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class SimpleOptionalitySelectorTest extends AbstractDependencyGraphTransformerTest { @@ -54,7 +57,7 @@ public void testDeriveOptionality() throws Exception { } @Test - public void testResolveOptionalityConflict_NonOptionalWins() throws Exception { + public void testResolveOptionalityConflictNonOptionalWins() throws Exception { DependencyNode root = parseResource("conflict.txt"); assertSame(root, transform(root)); @@ -65,7 +68,7 @@ public void testResolveOptionalityConflict_NonOptionalWins() throws Exception { } @Test - public void testResolveOptionalityConflict_DirectDeclarationWins() throws Exception { + public void testResolveOptionalityConflictDirectDeclarationWins() throws Exception { DependencyNode root = parseResource("conflict-direct-dep.txt"); assertSame(root, transform(root)); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java index 3fdb5867f..d89911977 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java @@ -32,7 +32,13 @@ import org.junit.Test; import static java.util.Objects.requireNonNull; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class AndDependencyTraverserTest { @@ -42,16 +48,16 @@ static class DummyDependencyTraverser implements DependencyTraverser { private final DependencyTraverser child; - public DummyDependencyTraverser() { + DummyDependencyTraverser() { this(true); } - public DummyDependencyTraverser(boolean traverse) { + DummyDependencyTraverser(boolean traverse) { this.traverse = traverse; this.child = this; } - public DummyDependencyTraverser(boolean traverse, DependencyTraverser child) { + DummyDependencyTraverser(boolean traverse, DependencyTraverser child) { this.traverse = traverse; this.child = child; } @@ -114,7 +120,7 @@ public void testTraverseDependency() { } @Test - public void testDeriveChildTraverser_Unchanged() { + public void testDeriveChildTraverserUnchanged() { DependencyTraverser other1 = new DummyDependencyTraverser(true); DependencyTraverser other2 = new DummyDependencyTraverser(false); DependencyTraverser traverser = new AndDependencyTraverser(other1, other2); @@ -122,7 +128,7 @@ public void testDeriveChildTraverser_Unchanged() { } @Test - public void testDeriveChildTraverser_OneRemaining() { + public void testDeriveChildTraverserOneRemaining() { DependencyTraverser other1 = new DummyDependencyTraverser(true); DependencyTraverser other2 = new DummyDependencyTraverser(false, null); DependencyTraverser traverser = new AndDependencyTraverser(other1, other2); @@ -130,7 +136,7 @@ public void testDeriveChildTraverser_OneRemaining() { } @Test - public void testDeriveChildTraverser_ZeroRemaining() { + public void testDeriveChildTraverserZeroRemaining() { DependencyTraverser other1 = new DummyDependencyTraverser(true, null); DependencyTraverser other2 = new DummyDependencyTraverser(false, null); DependencyTraverser traverser = new AndDependencyTraverser(other1, other2); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java index a23ba82d2..a1e30782f 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java @@ -33,7 +33,11 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class FatArtifactTraverserTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java index a2e6aaaa8..2fee72cfb 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java @@ -31,7 +31,11 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class StaticDependencyTraverserTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java index 0645babd9..917b480a4 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java @@ -34,7 +34,8 @@ import org.junit.After; import org.junit.Before; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public abstract class AbstractVersionFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java index 4a7f35b47..bb13e8209 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java @@ -26,7 +26,9 @@ import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; public class ChainedVersionFilterTest extends AbstractVersionFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java index 99d712f6e..e89d02afd 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java @@ -24,7 +24,10 @@ import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; public class ContextualSnapshotVersionFilterTest extends AbstractVersionFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java index 8d3ee4326..2a5751427 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java @@ -22,7 +22,9 @@ import org.eclipse.aether.util.graph.version.HighestVersionFilter; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; public class HighestVersionFilterTest extends AbstractVersionFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java index cfc0daa87..c9f5a2bea 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java @@ -22,7 +22,9 @@ import org.eclipse.aether.util.graph.version.SnapshotVersionFilter; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertSame; public class SnapshotVersionFilterTest extends AbstractVersionFilterTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java index 015638e51..b7edb7fe0 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import static java.util.Objects.requireNonNull; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class FilteringDependencyVisitorTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java index 998f43f81..de5de1d7a 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import static java.util.Objects.requireNonNull; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class PathRecordingDependencyVisitorTest { @@ -46,7 +46,7 @@ private void assertPath(List actual, String... expected) { } @Test - public void testGetPaths_RecordsMatchesBeneathUnmatchedParents() throws Exception { + public void testGetPathsRecordsMatchesBeneathUnmatchedParents() throws Exception { DependencyNode root = parse("simple.txt"); PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor(new ArtifactMatcher()); @@ -59,7 +59,7 @@ public void testGetPaths_RecordsMatchesBeneathUnmatchedParents() throws Exceptio } @Test - public void testGetPaths_DoesNotRecordMatchesBeneathMatchedParents() throws Exception { + public void testGetPathsDoesNotRecordMatchesBeneathMatchedParents() throws Exception { DependencyNode root = parse("nested.txt"); PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor(new ArtifactMatcher()); @@ -71,7 +71,7 @@ public void testGetPaths_DoesNotRecordMatchesBeneathMatchedParents() throws Exce } @Test - public void testGetPaths_RecordsMatchesBeneathMatchedParentsIfRequested() throws Exception { + public void testGetPathsRecordsMatchesBeneathMatchedParentsIfRequested() throws Exception { DependencyNode root = parse("nested.txt"); PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor(new ArtifactMatcher(), false); @@ -108,7 +108,7 @@ public boolean accept(DependencyNode node, List parents) { } @Test - public void testGetPaths_HandlesCycles() throws Exception { + public void testGetPathsHandlesCycles() throws Exception { DependencyNode root = parse("cycle.txt"); PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor(new ArtifactMatcher(), false); @@ -123,7 +123,7 @@ public void testGetPaths_HandlesCycles() throws Exception { } @Test - public void testGetPaths_HandlesCycles_threePaths() throws Exception { + public void testGetPathsHandlesCyclesthreePaths() throws Exception { DependencyNode root = parse("cycle-3paths.txt"); PathRecordingDependencyVisitor visitor = new PathRecordingDependencyVisitor(new ArtifactMatcher()); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java index 84fcc3dca..9d2093dfe 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java @@ -21,8 +21,6 @@ import org.eclipse.aether.graph.DependencyNode; import org.junit.Test; -import static org.junit.Assert.*; - public class PostorderNodeListGeneratorTest extends AbstractDepthFirstNodeListGeneratorTestSupport { @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java index 72576874f..f1559ac5c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java @@ -21,8 +21,6 @@ import org.eclipse.aether.graph.DependencyNode; import org.junit.Test; -import static org.junit.Assert.*; - public class PreorderNodeListGeneratorTest extends AbstractDepthFirstNodeListGeneratorTestSupport { @Test public void testOrdering() throws Exception { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java index 1c8608c78..d4ebb086c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.internal.test.util.DependencyGraphParser; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class TreeDependencyVisitorTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java index 3b9ae0cb5..3db616047 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.RepositoryListener; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java index b19054eb4..52ab5fb6c 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java @@ -23,7 +23,7 @@ import org.eclipse.aether.transfer.TransferListener; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertNotNull; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java index cef972cd2..8172847c9 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java @@ -26,7 +26,10 @@ import org.eclipse.aether.repository.RemoteRepository; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; public class ComponentAuthenticationTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java index a09ddb08b..5d984ce7b 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java @@ -20,7 +20,8 @@ import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** */ @@ -31,13 +32,13 @@ private boolean isNonProxyHost(String host, String nonProxyHosts) { } @Test - public void testIsNonProxyHost_Blank() { + public void testIsNonProxyHostBlank() { assertFalse(isNonProxyHost("www.eclipse.org", null)); assertFalse(isNonProxyHost("www.eclipse.org", "")); } @Test - public void testIsNonProxyHost_Wildcard() { + public void testIsNonProxyHostWildcard() { assertTrue(isNonProxyHost("www.eclipse.org", "*")); assertTrue(isNonProxyHost("www.eclipse.org", "*.org")); assertFalse(isNonProxyHost("www.eclipse.org", "*.com")); @@ -46,20 +47,20 @@ public void testIsNonProxyHost_Wildcard() { } @Test - public void testIsNonProxyHost_Multiple() { + public void testIsNonProxyHostMultiple() { assertTrue(isNonProxyHost("eclipse.org", "eclipse.org|host2")); assertTrue(isNonProxyHost("eclipse.org", "host1|eclipse.org")); assertTrue(isNonProxyHost("eclipse.org", "host1|eclipse.org|host2")); } @Test - public void testIsNonProxyHost_Misc() { + public void testIsNonProxyHostMisc() { assertFalse(isNonProxyHost("www.eclipse.org", "www.eclipse.com")); assertFalse(isNonProxyHost("www.eclipse.org", "eclipse.org")); } @Test - public void testIsNonProxyHost_CaseInsensitivity() { + public void testIsNonProxyHostCaseInsensitivity() { assertTrue(isNonProxyHost("www.eclipse.org", "www.ECLIPSE.org")); assertTrue(isNonProxyHost("www.ECLIPSE.org", "www.eclipse.org")); } diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java index eb609f063..e5e093568 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java @@ -39,7 +39,9 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; public class JreProxySelectorTest { @@ -64,26 +66,26 @@ public void exit() { } @Test - public void testGetProxy_InvalidUrl() { + public void testGetProxyInvalidUrl() { RemoteRepository repo = new RemoteRepository.Builder("test", "default", "http://host:invalid").build(); assertNull(selector.getProxy(repo)); } @Test - public void testGetProxy_OpaqueUrl() { + public void testGetProxyOpaqueUrl() { RemoteRepository repo = new RemoteRepository.Builder("test", "default", "classpath:base").build(); assertNull(selector.getProxy(repo)); } @Test - public void testGetProxy_NullSelector() { + public void testGetProxyNullSelector() { RemoteRepository repo = new RemoteRepository.Builder("test", "default", "http://repo.eclipse.org/").build(); java.net.ProxySelector.setDefault(null); assertNull(selector.getProxy(repo)); } @Test - public void testGetProxy_NoProxies() { + public void testGetProxyNoProxies() { RemoteRepository repo = new RemoteRepository.Builder("test", "default", "http://repo.eclipse.org/").build(); java.net.ProxySelector.setDefault(new AbstractProxySelector() { @Override @@ -95,7 +97,7 @@ public List select(URI uri) { } @Test - public void testGetProxy_DirectProxy() { + public void testGetProxyDirectProxy() { RemoteRepository repo = new RemoteRepository.Builder("test", "default", "http://repo.eclipse.org/").build(); final InetSocketAddress addr = InetSocketAddress.createUnresolved("proxy", 8080); java.net.ProxySelector.setDefault(new AbstractProxySelector() { @@ -108,7 +110,7 @@ public List select(URI uri) { } @Test - public void testGetProxy_HttpProxy() throws Exception { + public void testGetProxyHttpProxy() throws Exception { final RemoteRepository repo = new RemoteRepository.Builder("test", "default", "http://repo.eclipse.org/").build(); final URL url = new URL(repo.getUrl()); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java index 4da926165..bc12dbbf3 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java @@ -26,7 +26,10 @@ import org.eclipse.aether.repository.RemoteRepository; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; public class SecretAuthenticationTest { @@ -49,7 +52,7 @@ private String newDigest(Authentication auth) { } @Test - public void testConstructor_CopyChars() { + public void testConstructorCopyChars() { char[] value = {'v', 'a', 'l'}; new SecretAuthentication("key", value); assertArrayEquals(new char[] {'v', 'a', 'l'}, value); diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java index ba75713eb..3ad07b0c2 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java @@ -26,7 +26,9 @@ import org.eclipse.aether.repository.RemoteRepository; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; public class StringAuthenticationTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java index 1ff13a260..9d6cc6f79 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java @@ -23,7 +23,10 @@ import org.eclipse.aether.version.VersionRange; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class GenericVersionRangeTest { diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java index 907178d6c..dcc641ae9 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java @@ -23,7 +23,10 @@ import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** */ diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java index a7b57ab8f..3f3b0ebeb 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java @@ -24,7 +24,9 @@ import org.eclipse.aether.version.VersionRange; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; public class UnionVersionRangeTest {