Skip to content

More semantic asserts #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 13, 2025
Merged

More semantic asserts #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef76d92
More semantic asserts
elharo Jul 9, 2025
c6de3c8
retrigger checks
elharo Jul 10, 2025
9dc929e
Merge branch 'master' into assert
elharo Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
}
}
8 changes: 4 additions & 4 deletions ...nector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ void testWithExcessiveOffset() {
calculator.update(toBuffer("World!"));
Map<String, Object> 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());
}

Expand Down
21 changes: 13 additions & 8 deletions ...lver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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());
}
}
}
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 2 additions & 2 deletions ...lver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down
8 changes: 4 additions & 4 deletions ...er-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down Expand Up @@ -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());
}
Expand Down Expand Up @@ -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());
}

Expand Down Expand Up @@ -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());
}

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}
4 changes: 2 additions & 2 deletions ...rg/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void testSimplePositive() {
transfer.setArtifact(artifactWithChecksum);
Map<String, String> chk = adapter.getProvidedArtifactChecksums(session, transfer, repository, checksums);
assertNotNull(chk);
assertEquals(chk.get(Sha1ChecksumAlgorithmFactory.NAME), "foo");
assertEquals("foo", chk.get(Sha1ChecksumAlgorithmFactory.NAME));
}

@Test
Expand All @@ -91,7 +91,7 @@ void testMrmPositive() {
transfer.setRepositories(Collections.singletonList(repository));
Map<String, String> chk = adapter.getProvidedArtifactChecksums(session, transfer, mrm, checksums);
assertNotNull(chk);
assertEquals(chk.get(Sha1ChecksumAlgorithmFactory.NAME), "foo");
assertEquals("foo", chk.get(Sha1ChecksumAlgorithmFactory.NAME));
}

@Test
Expand Down
8 changes: 5 additions & 3 deletions ...java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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());
}
Expand Down Expand Up @@ -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());
}
Expand Down
12 changes: 6 additions & 6 deletions ...est/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ void testSkipVersionConflict() {
skipper.cache(gNode, mutableList(aNode, eNode, fNode));

Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
assertEquals(results.size(), 7);
assertEquals(7, results.size());

List<DependencyResolutionSkipper.DependencyResolutionResult> 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);
}
}
Expand Down Expand Up @@ -137,13 +137,13 @@ void testSkipDeeperDuplicateNode() {
skipper.cache(c1Node, mutableList(aNode, dNode));

Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
assertEquals(results.size(), 6);
assertEquals(6, results.size());

List<DependencyResolutionSkipper.DefaultDependencyResolutionSkipper.DependencyResolutionResult> 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);
}
Expand Down Expand Up @@ -190,13 +190,13 @@ void testForceResolution() {
skipper.cache(d2Node, mutableList(aNode, bNode, c1Node));

Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
assertEquals(results.size(), 7);
assertEquals(7, results.size());

List<DependencyResolutionSkipper.DefaultDependencyResolutionSkipper.DependencyResolutionResult>
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);
Expand Down
10 changes: 5 additions & 5 deletions ...c/test/java/org/eclipse/aether/internal/impl/synccontext/named/BasedirNameMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void defaultLocksDir() {
configProperties.put("aether.syncContext.named.basedir.locksDir", null);
DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> 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");
Expand All @@ -73,7 +73,7 @@ void relativeLocksDir() {
configProperties.put("aether.syncContext.named.basedir.locksDir", "my/locks");
DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> 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");
Expand All @@ -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<NamedLockKey> names = mapper.nameLocks(session, singletonList(artifact), null);
assertEquals(names.size(), 1);
assertEquals(1, names.size());
assertEquals(names.iterator().next().name(), customBaseDir + PS + "46e98183d232f1e16f863025080c7f2b9797fd10");
}

Expand All @@ -99,7 +99,7 @@ void singleArtifact() {

DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> 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");
Expand All @@ -112,7 +112,7 @@ void singleMetadata() {
DefaultMetadata metadata =
new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
Collection<NamedLockKey> 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");
Expand Down
14 changes: 7 additions & 7 deletions ...l/src/test/java/org/eclipse/aether/internal/impl/synccontext/named/GAVNameMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,17 @@ void nullsAndEmptyInputs() {
void singleArtifact() {
DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> 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
void singleMetadata() {
DefaultMetadata metadata =
new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
Collection<NamedLockKey> 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
Expand All @@ -76,11 +76,11 @@ void oneAndOne() {
new DefaultMetadata("bgroup", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
Collection<NamedLockKey> names = mapper.nameLocks(session, singletonList(artifact), singletonList(metadata));

assertEquals(names.size(), 2);
assertEquals(2, names.size());
Iterator<NamedLockKey> 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());
}
}
8 changes: 4 additions & 4 deletions ...c/test/java/org/eclipse/aether/internal/impl/synccontext/named/HashingNameMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void singleArtifact_depth0() {
configProperties.put("aether.syncContext.named.hashing.depth", "0");
DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> names = mapper.nameLocks(session, singletonList(artifact), null);
assertEquals(names.size(), 1);
assertEquals(1, names.size());
assertEquals(names.iterator().next().name(), "46e98183d232f1e16f863025080c7f2b9797fd10");
}

Expand All @@ -66,7 +66,7 @@ void singleMetadata_depth0() {
DefaultMetadata metadata =
new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
Collection<NamedLockKey> names = mapper.nameLocks(session, null, singletonList(metadata));
assertEquals(names.size(), 1);
assertEquals(1, names.size());
assertEquals(names.iterator().next().name(), "293b3990971f4b4b02b220620d2538eaac5f221b");
}

Expand All @@ -92,7 +92,7 @@ void singleArtifact_depth2() {
DefaultArtifact artifact = new DefaultArtifact("group:artifact:1.0");
Collection<NamedLockKey> names = mapper.nameLocks(session, singletonList(artifact), null);

assertEquals(names.size(), 1);
assertEquals(1, names.size());
assertEquals(names.iterator().next().name(), "46/e9/46e98183d232f1e16f863025080c7f2b9797fd10");
}

Expand All @@ -103,7 +103,7 @@ void singleMetadata_depth2() {
new DefaultMetadata("group", "artifact", "maven-metadata.xml", Metadata.Nature.RELEASE_OR_SNAPSHOT);
Collection<NamedLockKey> names = mapper.nameLocks(session, null, singletonList(metadata));

assertEquals(names.size(), 1);
assertEquals(1, names.size());
assertEquals(names.iterator().next().name(), "29/3b/293b3990971f4b4b02b220620d2538eaac5f221b");
}

Expand Down
Loading