From ef76d9228eb0335ea1dc2edcd64c3b68348d90b7 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Wed, 9 Jul 2025 09:00:28 -0400 Subject: [PATCH 1/2] More semantic asserts --- .../graph/DefaultDependencyNodeTest.java | 5 +- .../basic/ChecksumCalculatorTest.java | 8 +- .../impl/DefaultArtifactResolverTest.java | 21 +++-- .../internal/impl/DefaultInstallerTest.java | 4 +- .../impl/DefaultMetadataResolverTest.java | 4 +- .../impl/DefaultUpdateCheckManagerTest.java | 8 +- ...FileTrustedChecksumsSourceTestSupport.java | 2 +- ...dToProvidedChecksumsSourceAdapterTest.java | 4 +- ...ependencyCollectorDelegateTestSupport.java | 8 +- .../bf/DependencyResolutionSkipperTest.java | 12 +-- .../named/BasedirNameMapperTest.java | 10 +-- .../synccontext/named/GAVNameMapperTest.java | 14 ++-- .../named/HashingNameMapperTest.java | 8 +- .../org/eclipse/aether/named/RetryTest.java | 22 +++--- .../test/util/http/HttpTransporterTest.java | 12 +-- .../aether/util/StringDigestUtilTest.java | 76 ++++++++++++------- .../graph/manager/DependencyManagerTest.java | 36 ++++----- .../ContextualSnapshotVersionFilterTest.java | 8 +- 18 files changed, 148 insertions(+), 114 deletions(-) diff --git a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java index 1bdc53eb5..49de76371 100644 --- a/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java +++ b/maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java @@ -23,6 +23,7 @@ import org.eclipse.aether.artifact.DefaultArtifact; import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; @@ -58,8 +59,8 @@ public boolean visitLeave(DependencyNode node) { t.start(); t.join(); - assertTrue(thrown.get() instanceof RuntimeException, String.valueOf(thrown.get())); - assertTrue(thrown.get().getCause() instanceof InterruptedException, String.valueOf(thrown.get())); + assertInstanceOf(RuntimeException.class, thrown.get(), String.valueOf(thrown.get())); + assertInstanceOf(InterruptedException.class, thrown.get().getCause(), String.valueOf(thrown.get())); assertTrue(t.isInterrupted()); } } 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 6ccfe0edb..0cd4ac147 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 @@ -99,10 +99,10 @@ void testWithExcessiveOffset() { calculator.update(toBuffer("World!")); Map digests = calculator.get(); assertNotNull(digests); - assertTrue(digests.get(SHA512) instanceof IOException); - assertTrue(digests.get(SHA256) instanceof IOException); - assertTrue(digests.get(SHA1) instanceof IOException); - assertTrue(digests.get(MD5) instanceof IOException); + assertInstanceOf(IOException.class, digests.get(SHA512)); + assertInstanceOf(IOException.class, digests.get(SHA256)); + assertInstanceOf(IOException.class, digests.get(SHA1)); + assertInstanceOf(IOException.class, digests.get(MD5)); assertEquals(4, digests.size()); } 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 2098aba60..40f9ea3b4 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 @@ -171,7 +171,8 @@ void testResolveLocalArtifactUnsuccessful() throws IOException { assertSame(request, result.getRequest()); assertFalse(result.getExceptions().isEmpty()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException); + assertInstanceOf( + ArtifactNotFoundException.class, result.getExceptions().get(0)); Artifact resolved = result.getArtifact(); assertNull(resolved); @@ -233,7 +234,8 @@ public void get( assertSame(request, result.getRequest()); assertFalse(result.getExceptions().isEmpty()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException); + assertInstanceOf( + ArtifactNotFoundException.class, result.getExceptions().get(0)); Artifact resolved = result.getArtifact(); assertNull(resolved); @@ -284,7 +286,8 @@ void testResolveRemoteArtifactNeverAcceptFilter() { assertSame(request, result.getRequest()); assertFalse(result.getExceptions().isEmpty()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException); + assertInstanceOf( + ArtifactNotFoundException.class, result.getExceptions().get(0)); assertEquals("never-accept", result.getExceptions().get(0).getMessage()); Artifact resolved = result.getArtifact(); @@ -334,7 +337,8 @@ void testResolveRemoteArtifactNeverAcceptFilterFromRepo() { assertSame(request, result.getRequest()); assertFalse(result.getExceptions().isEmpty()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException); + assertInstanceOf( + ArtifactNotFoundException.class, result.getExceptions().get(0)); assertEquals("never-accept-id", result.getExceptions().get(0).getMessage()); Artifact resolved = result.getArtifact(); @@ -399,9 +403,9 @@ public void get( } catch (ArtifactResolutionException e) { connector.assertSeenExpected(); for (ArtifactResult result : e.getResults()) { - Throwable t = result.getExceptions().get(0); - assertTrue(t instanceof ArtifactNotFoundException, t.toString()); - assertTrue(t.getMessage().contains("cached"), t.toString()); + Exception ex = result.getExceptions().get(0); + assertInstanceOf(ArtifactNotFoundException.class, ex, ex.toString()); + assertTrue(ex.getMessage().contains("cached"), ex.toString()); } } } @@ -651,7 +655,8 @@ public VersionResult resolveVersion(RepositorySystemSession session, VersionRequ assertSame(request, result.getRequest()); assertFalse(result.getExceptions().isEmpty()); - assertTrue(result.getExceptions().get(0) instanceof VersionResolutionException); + assertInstanceOf( + VersionResolutionException.class, result.getExceptions().get(0)); Artifact resolved = result.getArtifact(); assertNull(resolved); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java index 6b0ee49fd..59fb22ac3 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java @@ -127,10 +127,10 @@ void testSuccessfulInstall() throws InstallationException, IOException { assertEquals(result.getRequest(), request); - assertEquals(result.getArtifacts().size(), 1); + assertEquals(1, result.getArtifacts().size()); assertTrue(result.getArtifacts().contains(artifact)); - assertEquals(result.getMetadata().size(), 1); + assertEquals(1, result.getMetadata().size()); assertTrue(result.getMetadata().contains(metadata)); assertEquals(1, lrm.getMetadataRegistration().size()); 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 688656c13..ed7114766 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 @@ -336,7 +336,7 @@ void testResolveNeverAcceptFilter() throws IOException { MetadataResult result = results.get(0); assertSame(request, result.getRequest()); assertNotNull(result.getException()); - assertTrue(result.getException() instanceof MetadataNotFoundException); + assertInstanceOf(MetadataNotFoundException.class, result.getException()); assertEquals("never-accept", result.getException().getMessage()); assertNull(result.getMetadata()); @@ -396,7 +396,7 @@ void testResolveNeverAcceptFromRepoFilter() throws IOException { MetadataResult result = results.get(0); assertSame(request, result.getRequest()); assertNotNull(result.getException()); - assertTrue(result.getException() instanceof MetadataNotFoundException); + assertInstanceOf(MetadataNotFoundException.class, result.getException()); assertEquals("never-accept-" + repository.getId(), result.getException().getMessage()); assertNull(result.getMetadata()); 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 678ab634d..cff834dca 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 @@ -230,7 +230,7 @@ void testCheckMetadataNotFoundInRepoCachingEnabled() { check = newMetadataCheck().setArtifactPolicy(RepositoryPolicy.UPDATE_POLICY_DAILY); manager.checkMetadata(session, check); assertFalse(check.isRequired()); - assertTrue(check.getException() instanceof MetadataNotFoundException); + assertInstanceOf(MetadataNotFoundException.class, check.getException()); assertTrue(check.getException().isFromCache()); } @@ -268,7 +268,7 @@ void testCheckMetadataErrorFromRepoCachingEnabled() { session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(false, true)); manager.checkMetadata(session, check); assertFalse(check.isRequired()); - assertTrue(check.getException() instanceof MetadataTransferException); + assertInstanceOf(MetadataTransferException.class, check.getException()); assertTrue(check.getException().getMessage().contains("some error"), String.valueOf(check.getException())); assertTrue(check.getException().isFromCache()); } @@ -555,7 +555,7 @@ void testCheckArtifactNotFoundInRepoCachingEnabled() { check = newArtifactCheck().setArtifactPolicy(RepositoryPolicy.UPDATE_POLICY_DAILY); manager.checkArtifact(session, check); assertFalse(check.isRequired()); - assertTrue(check.getException() instanceof ArtifactNotFoundException); + assertInstanceOf(ArtifactNotFoundException.class, check.getException()); assertTrue(check.getException().isFromCache()); } @@ -591,7 +591,7 @@ void testCheckArtifactErrorFromRepoCachingEnabled() { session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(false, true)); manager.checkArtifact(session, check); assertFalse(check.isRequired()); - assertTrue(check.getException() instanceof ArtifactTransferException); + assertInstanceOf(ArtifactTransferException.class, check.getException()); assertTrue(check.getException().isFromCache()); } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java index 4f8794c92..eef4f2cc1 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java @@ -114,6 +114,6 @@ void haveProvidedArtifactChecksum() { assertNotNull(providedChecksums); assertFalse(providedChecksums.isEmpty()); assertEquals(1, providedChecksums.size()); - assertEquals(providedChecksums.get(checksumAlgorithmFactory.getName()), ARTIFACT_TRUSTED_CHECKSUM); + assertEquals(ARTIFACT_TRUSTED_CHECKSUM, providedChecksums.get(checksumAlgorithmFactory.getName())); } } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java index cc51d04d4..760fd3a3b 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java @@ -72,7 +72,7 @@ void testSimplePositive() { transfer.setArtifact(artifactWithChecksum); Map chk = adapter.getProvidedArtifactChecksums(session, transfer, repository, checksums); assertNotNull(chk); - assertEquals(chk.get(Sha1ChecksumAlgorithmFactory.NAME), "foo"); + assertEquals("foo", chk.get(Sha1ChecksumAlgorithmFactory.NAME)); } @Test @@ -91,7 +91,7 @@ void testMrmPositive() { transfer.setRepositories(Collections.singletonList(repository)); Map chk = adapter.getProvidedArtifactChecksums(session, transfer, mrm, checksums); assertNotNull(chk); - assertEquals(chk.get(Sha1ChecksumAlgorithmFactory.NAME), "foo"); + assertEquals("foo", chk.get(Sha1ChecksumAlgorithmFactory.NAME)); } @Test 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 74672bc4a..ca2f1b3e6 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 @@ -167,7 +167,7 @@ void testInterruption() throws Exception { }); t.start(); t.join(); - assertTrue(cause.get() instanceof InterruptedException, String.valueOf(cause.get())); + assertInstanceOf(InterruptedException.class, cause.get(), String.valueOf(cause.get())); } @Test @@ -202,7 +202,8 @@ void testMissingDependencyDescription() { assertNotNull(result.getExceptions()); assertEquals(1, result.getExceptions().size()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactDescriptorException); + assertInstanceOf( + ArtifactDescriptorException.class, result.getExceptions().get(0)); assertEquals(request.getRoot(), result.getRoot().getDependency()); } @@ -324,7 +325,8 @@ void testPartialResultOnError() throws IOException { assertNotNull(result.getExceptions()); assertEquals(1, result.getExceptions().size()); - assertTrue(result.getExceptions().get(0) instanceof ArtifactDescriptorException); + assertInstanceOf( + ArtifactDescriptorException.class, result.getExceptions().get(0)); assertEqualSubtree(root, result.getRoot()); } diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java index 9bdf8404b..b95045537 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java @@ -91,12 +91,12 @@ void testSkipVersionConflict() { skipper.cache(gNode, mutableList(aNode, eNode, fNode)); Map results = skipper.getResults(); - assertEquals(results.size(), 7); + assertEquals(7, results.size()); List skipped = results.values().stream() .filter(dependencyResolutionResult -> dependencyResolutionResult.skippedAsVersionConflict) .collect(Collectors.toList()); - assertEquals(skipped.size(), 1); + assertEquals(1, skipped.size()); assertSame(skipped.get(0).current, c3Node); } } @@ -137,13 +137,13 @@ void testSkipDeeperDuplicateNode() { skipper.cache(c1Node, mutableList(aNode, dNode)); Map results = skipper.getResults(); - assertEquals(results.size(), 6); + assertEquals(6, results.size()); List skipped = results.values().stream() .filter(dependencyResolutionResult -> dependencyResolutionResult.skippedAsDuplicate) .collect(Collectors.toList()); - assertEquals(skipped.size(), 2); + assertEquals(2, skipped.size()); assertSame(skipped.get(0).current, b1Node); assertSame(skipped.get(1).current, c1Node); } @@ -190,13 +190,13 @@ void testForceResolution() { skipper.cache(d2Node, mutableList(aNode, bNode, c1Node)); Map results = skipper.getResults(); - assertEquals(results.size(), 7); + assertEquals(7, results.size()); List forceResolved = results.values().stream() .filter(dependencyResolutionResult -> dependencyResolutionResult.forceResolution) .collect(Collectors.toList()); - assertEquals(forceResolved.size(), 3); + assertEquals(3, forceResolved.size()); assertSame(forceResolved.get(0).current, c1Node); assertSame(forceResolved.get(1).current, d1Node); assertSame(forceResolved.get(2).current, d2Node); 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 1b578c856..1eaf5549b 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 @@ -61,7 +61,7 @@ void defaultLocksDir() { configProperties.put("aether.syncContext.named.basedir.locksDir", null); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals( names.iterator().next().name(), basedir.toUri() + PS + ".locks" + PS + "46e98183d232f1e16f863025080c7f2b9797fd10"); @@ -73,7 +73,7 @@ void relativeLocksDir() { configProperties.put("aether.syncContext.named.basedir.locksDir", "my/locks"); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals( names.iterator().next().name(), basedir.toUri() + PS + "my" + PS + "locks" + PS + "46e98183d232f1e16f863025080c7f2b9797fd10"); @@ -89,7 +89,7 @@ void absoluteLocksDir() throws IOException { configProperties.put("aether.syncContext.named.basedir.locksDir", absoluteLocksDir); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals(names.iterator().next().name(), customBaseDir + PS + "46e98183d232f1e16f863025080c7f2b9797fd10"); } @@ -99,7 +99,7 @@ void singleArtifact() { DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals( names.iterator().next().name(), basedir.toUri() + PS + ".locks" + PS + "46e98183d232f1e16f863025080c7f2b9797fd10"); @@ -112,7 +112,7 @@ void singleMetadata() { DefaultMetadata metadata = new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); Collection names = mapper.nameLocks(session, null, singletonList(metadata)); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals( names.iterator().next().name(), basedir.toUri() + PS + ".locks" + PS + "293b3990971f4b4b02b220620d2538eaac5f221b"); diff --git a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java index 26a0b288a..27a65d349 100644 --- a/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java +++ b/maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java @@ -56,8 +56,8 @@ void nullsAndEmptyInputs() { void singleArtifact() { DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); - assertEquals(names.iterator().next().name(), "artifact~group~artifact~1.0.lock"); + assertEquals(1, names.size()); + assertEquals("artifact~group~artifact~1.0.lock", names.iterator().next().name()); } @Test @@ -65,8 +65,8 @@ void singleMetadata() { DefaultMetadata metadata = new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); Collection names = mapper.nameLocks(session, null, singletonList(metadata)); - assertEquals(names.size(), 1); - assertEquals(names.iterator().next().name(), "metadata~group~artifact.lock"); + assertEquals(1, names.size()); + assertEquals("metadata~group~artifact.lock", names.iterator().next().name()); } @Test @@ -76,11 +76,11 @@ void oneAndOne() { new DefaultMetadata("bgroup", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); Collection names = mapper.nameLocks(session, singletonList(artifact), singletonList(metadata)); - assertEquals(names.size(), 2); + assertEquals(2, names.size()); Iterator namesIterator = names.iterator(); // they are sorted as well - assertEquals(namesIterator.next().name(), "artifact~agroup~artifact~1.0.lock"); - assertEquals(namesIterator.next().name(), "metadata~bgroup~artifact.lock"); + assertEquals("artifact~agroup~artifact~1.0.lock", namesIterator.next().name()); + assertEquals("metadata~bgroup~artifact.lock", namesIterator.next().name()); } } 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 3cd2ea8b5..6035ed843 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 @@ -56,7 +56,7 @@ void singleArtifact_depth0() { configProperties.put("aether.syncContext.named.hashing.depth", "0"); DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals(names.iterator().next().name(), "46e98183d232f1e16f863025080c7f2b9797fd10"); } @@ -66,7 +66,7 @@ void singleMetadata_depth0() { DefaultMetadata metadata = new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); Collection names = mapper.nameLocks(session, null, singletonList(metadata)); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals(names.iterator().next().name(), "293b3990971f4b4b02b220620d2538eaac5f221b"); } @@ -92,7 +92,7 @@ void singleArtifact_depth2() { DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0"); Collection names = mapper.nameLocks(session, singletonList(artifact), null); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals(names.iterator().next().name(), "46/e9/46e98183d232f1e16f863025080c7f2b9797fd10"); } @@ -103,7 +103,7 @@ void singleMetadata_depth2() { new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT); Collection names = mapper.nameLocks(session, null, singletonList(metadata)); - assertEquals(names.size(), 1); + assertEquals(1, names.size()); assertEquals(names.iterator().next().name(), "29/3b/293b3990971f4b4b02b220620d2538eaac5f221b"); } diff --git a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java index 6e75e74ae..aed5b06d5 100644 --- a/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java +++ b/maven-resolver-named-locks/src/test/java/org/eclipse/aether/named/RetryTest.java @@ -45,8 +45,8 @@ void happy() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "happy"); - assertEquals(retries.sum(), 1); + assertEquals("happy", result); + assertEquals(1, retries.sum()); } @Test @@ -62,7 +62,7 @@ void notHappy() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "notHappy"); + assertEquals("notHappy", result); assertTrue(retries.sum() > 1, retries.sum() + " > 1"); } @@ -79,8 +79,8 @@ void happyAfterSomeTime() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "got it"); - assertEquals(retries.sum(), 2); + assertEquals("got it", result); + assertEquals(2, retries.sum()); } @Test @@ -95,8 +95,8 @@ void happyFirstAttempt() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "happy"); - assertEquals(retries.sum(), 1); + assertEquals("happy", result); + assertEquals(1, retries.sum()); } @Test @@ -111,8 +111,8 @@ void notHappyAnyAttempt() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "notHappy"); - assertEquals(retries.sum(), 5); + assertEquals("notHappy", result); + assertEquals(5, retries.sum()); } @Test @@ -127,7 +127,7 @@ void happyAfterSomeAttempt() throws InterruptedException { }, null, "notHappy"); - assertEquals(result, "got it"); - assertEquals(retries.sum(), 3); + assertEquals("got it", result); + assertEquals(3, retries.sum()); } } diff --git a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java index 029bd0194..776bcc381 100644 --- a/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java +++ b/maven-resolver-test-http/src/main/java/org/eclipse/aether/internal/test/util/http/HttpTransporterTest.java @@ -388,7 +388,7 @@ protected void testGet_ToFileTimestamp() throws Exception { assertEquals(1, listener.getStartedCount()); assertTrue(listener.getProgressedCount() > 0, "Count: " + listener.getProgressedCount()); assertEquals("oldTest", listener.getBaos().toString(StandardCharsets.UTF_8)); - assertEquals(file.lastModified(), OLD_FILE_TIMESTAMP); + assertEquals(OLD_FILE_TIMESTAMP, file.lastModified()); } @Test @@ -487,10 +487,12 @@ protected void testGet_RFC9457Response() throws Exception { } catch (HttpRFC9457Exception e) { assertEquals(403, e.getStatusCode()); assertEquals(e.getPayload().getType(), URI.create("https://example.com/probs/out-of-credit")); - assertEquals(e.getPayload().getStatus(), 403); - assertEquals(e.getPayload().getTitle(), "You do not have enough credit."); - assertEquals(e.getPayload().getDetail(), "Your current balance is 30, but that costs 50."); - assertEquals(e.getPayload().getInstance(), URI.create("/account/12345/msgs/abc")); + assertEquals(403, e.getPayload().getStatus()); + assertEquals("You do not have enough credit.", e.getPayload().getTitle()); + assertEquals( + "Your current balance is 30, but that costs 50.", + e.getPayload().getDetail()); + assertEquals(URI.create("/account/12345/msgs/abc"), e.getPayload().getInstance()); } } diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringDigestUtilTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringDigestUtilTest.java index 3edae4e47..72d2c6e78 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringDigestUtilTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/StringDigestUtilTest.java @@ -27,43 +27,67 @@ public class StringDigestUtilTest { @Test void sha1Simple() { - assertEquals(StringDigestUtil.sha1(null), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(StringDigestUtil.sha1(""), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(StringDigestUtil.sha1("something"), "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); - assertEquals(StringDigestUtil.sha1().update(null).digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(StringDigestUtil.sha1().update("").digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(StringDigestUtil.sha1().update("something").digest(), "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); - assertEquals( - StringDigestUtil.sha1().update("some").update("thing").digest(), - "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); + assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", StringDigestUtil.sha1(null)); + assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", StringDigestUtil.sha1("")); + assertEquals("1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", StringDigestUtil.sha1("something")); + assertEquals( + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + StringDigestUtil.sha1().update(null).digest()); + assertEquals( + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + StringDigestUtil.sha1().update("").digest()); + assertEquals( + "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", + StringDigestUtil.sha1().update("something").digest()); + assertEquals( + "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", + StringDigestUtil.sha1().update("some").update("thing").digest()); } @Test void sha1Manual() { - assertEquals(new StringDigestUtil("SHA-1").digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(new StringDigestUtil("SHA-1").update("").digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); + assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", new StringDigestUtil("SHA-1").digest()); + assertEquals( + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + new StringDigestUtil("SHA-1").update("").digest()); + assertEquals( + "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", + new StringDigestUtil("SHA-1").update("something").digest()); + assertEquals( + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + new StringDigestUtil("SHA-1").update(null).digest()); assertEquals( - new StringDigestUtil("SHA-1").update("something").digest(), "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); - assertEquals(new StringDigestUtil("SHA-1").update(null).digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); - assertEquals(new StringDigestUtil("SHA-1").update("").digest(), "da39a3ee5e6b4b0d3255bfef95601890afd80709"); + "da39a3ee5e6b4b0d3255bfef95601890afd80709", + new StringDigestUtil("SHA-1").update("").digest()); assertEquals( - new StringDigestUtil("SHA-1").update("something").digest(), "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); + "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", + new StringDigestUtil("SHA-1").update("something").digest()); assertEquals( - new StringDigestUtil("SHA-1").update("some").update("thing").digest(), - "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29"); + "1af17e73721dbe0c40011b82ed4bb1a7dbe3ce29", + new StringDigestUtil("SHA-1").update("some").update("thing").digest()); } @Test void md5Manual() { - assertEquals(new StringDigestUtil("MD5").digest(), "d41d8cd98f00b204e9800998ecf8427e"); - assertEquals(new StringDigestUtil("MD5").update("").digest(), "d41d8cd98f00b204e9800998ecf8427e"); - assertEquals(new StringDigestUtil("MD5").update("something").digest(), "437b930db84b8079c2dd804a71936b5f"); - assertEquals(new StringDigestUtil("MD5").update(null).digest(), "d41d8cd98f00b204e9800998ecf8427e"); - assertEquals(new StringDigestUtil("MD5").update("").digest(), "d41d8cd98f00b204e9800998ecf8427e"); - assertEquals(new StringDigestUtil("MD5").update("something").digest(), "437b930db84b8079c2dd804a71936b5f"); - assertEquals( - new StringDigestUtil("MD5").update("some").update("thing").digest(), - "437b930db84b8079c2dd804a71936b5f"); + assertEquals("d41d8cd98f00b204e9800998ecf8427e", new StringDigestUtil("MD5").digest()); + assertEquals( + "d41d8cd98f00b204e9800998ecf8427e", + new StringDigestUtil("MD5").update("").digest()); + assertEquals( + "437b930db84b8079c2dd804a71936b5f", + new StringDigestUtil("MD5").update("something").digest()); + assertEquals( + "d41d8cd98f00b204e9800998ecf8427e", + new StringDigestUtil("MD5").update(null).digest()); + assertEquals( + "d41d8cd98f00b204e9800998ecf8427e", + new StringDigestUtil("MD5").update("").digest()); + assertEquals( + "437b930db84b8079c2dd804a71936b5f", + new StringDigestUtil("MD5").update("something").digest()); + assertEquals( + "437b930db84b8079c2dd804a71936b5f", + new StringDigestUtil("MD5").update("some").update("thing").digest()); } @Test diff --git a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/DependencyManagerTest.java b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/DependencyManagerTest.java index 41f1df8cd..2b44584cb 100644 --- a/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/DependencyManagerTest.java +++ b/maven-resolver-util/src/test/java/org/eclipse/aether/util/graph/manager/DependencyManagerTest.java @@ -105,10 +105,10 @@ void testClassic() { assertNull(mngt.getVersion()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); @@ -122,10 +122,10 @@ void testClassic() { assertEquals(Boolean.TRUE, mngt.getOptional()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); } @@ -164,10 +164,10 @@ void testClassicTransitive() { assertNull(mngt.getVersion()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); @@ -181,10 +181,10 @@ void testClassicTransitive() { assertEquals(Boolean.TRUE, mngt.getOptional()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); // DO NOT APPLY ONTO ITSELF // assertNotNull(mngt); @@ -226,10 +226,10 @@ void testTransitive() { // assertEquals(B2.getVersion(), mngt.getVersion()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); @@ -243,10 +243,10 @@ void testTransitive() { assertEquals(Boolean.TRUE, mngt.getOptional()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); // DO NOT APPLY ONTO ITSELF // assertNotNull(mngt); @@ -273,10 +273,10 @@ void testDefault() { assertNull(mngt.getVersion()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); @@ -292,10 +292,10 @@ void testDefault() { // assertEquals(B2.getVersion(), mngt.getVersion()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); assertNull(mngt); @@ -309,10 +309,10 @@ void testDefault() { assertEquals(Boolean.TRUE, mngt.getOptional()); mngt = manager.manageDependency(new Dependency(C1, null)); assertNotNull(mngt); - assertEquals(mngt.getScope(), "newscope"); + assertEquals("newscope", mngt.getScope()); mngt = manager.manageDependency(new Dependency(D1, null)); assertNotNull(mngt); - assertEquals(mngt.getExclusions(), Collections.singleton(EXCLUSION)); + assertEquals(Collections.singleton(EXCLUSION), mngt.getExclusions()); mngt = manager.manageDependency(new Dependency(E1, null)); // DO NOT APPLY ONTO ITSELF // assertNotNull(mngt); 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 6be49eda2..44e66498c 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 @@ -48,17 +48,17 @@ void testFilterVersions() throws Exception { @Test void testDeriveChildFilter() { ContextualSnapshotVersionFilter filter = new ContextualSnapshotVersionFilter(); - assertTrue(derive(filter, "g:a:1") instanceof SnapshotVersionFilter); - assertSame(null, derive(filter, "g:a:1-SNAPSHOT")); + assertInstanceOf(SnapshotVersionFilter.class, derive(filter, "g:a:1")); + assertNull(derive(filter, "g:a:1-SNAPSHOT")); session.setConfigProperty(ContextualSnapshotVersionFilter.CONFIG_PROP_ENABLE, "true"); - assertTrue(derive(filter, "g:a:1-SNAPSHOT") instanceof SnapshotVersionFilter); + assertInstanceOf(SnapshotVersionFilter.class, derive(filter, "g:a:1-SNAPSHOT")); } @SuppressWarnings("EqualsWithItself") @Test void testEquals() { ContextualSnapshotVersionFilter filter = new ContextualSnapshotVersionFilter(); - assertNotEquals(null, filter); + assertNotNull(filter); assertEquals(filter, filter); assertEquals(filter, new ContextualSnapshotVersionFilter()); } From c6de3c8a48ae1fcfddfec0294719bab4a7126d28 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 10 Jul 2025 06:46:27 -0400 Subject: [PATCH 2/2] retrigger checks