Skip to content

Commit de9a8be

Browse files
elharoelharo
authored
More semantic asserts (#1523)
* More semantic asserts
1 parent e405010 commit de9a8be

File tree

18 files changed

+148
-114
lines changed

18 files changed

+148
-114
lines changed

‎maven-resolver-api/src/test/java/org/eclipse/aether/graph/DefaultDependencyNodeTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.eclipse.aether.artifact.DefaultArtifact;
2424
import org.junit.jupiter.api.Test;
2525

26+
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
2627
import static org.junit.jupiter.api.Assertions.assertTrue;
2728
import static org.junit.jupiter.api.Assertions.fail;
2829

@@ -58,8 +59,8 @@ public boolean visitLeave(DependencyNode node) {
5859
t.start();
5960
t.join();
6061

61-
assertTrue(thrown.get() instanceof RuntimeException, String.valueOf(thrown.get()));
62-
assertTrue(thrown.get().getCause() instanceof InterruptedException, String.valueOf(thrown.get()));
62+
assertInstanceOf(RuntimeException.class, thrown.get(), String.valueOf(thrown.get()));
63+
assertInstanceOf(InterruptedException.class, thrown.get().getCause(), String.valueOf(thrown.get()));
6364
assertTrue(t.isInterrupted());
6465
}
6566
}

‎maven-resolver-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ void testWithExcessiveOffset() {
9999
calculator.update(toBuffer("World!"));
100100
Map<String, Object> digests = calculator.get();
101101
assertNotNull(digests);
102-
assertTrue(digests.get(SHA512) instanceof IOException);
103-
assertTrue(digests.get(SHA256) instanceof IOException);
104-
assertTrue(digests.get(SHA1) instanceof IOException);
105-
assertTrue(digests.get(MD5) instanceof IOException);
102+
assertInstanceOf(IOException.class, digests.get(SHA512));
103+
assertInstanceOf(IOException.class, digests.get(SHA256));
104+
assertInstanceOf(IOException.class, digests.get(SHA1));
105+
assertInstanceOf(IOException.class, digests.get(MD5));
106106
assertEquals(4, digests.size());
107107
}
108108

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ void testResolveLocalArtifactUnsuccessful() throws IOException {
171171
assertSame(request, result.getRequest());
172172

173173
assertFalse(result.getExceptions().isEmpty());
174-
assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException);
174+
assertInstanceOf(
175+
ArtifactNotFoundException.class, result.getExceptions().get(0));
175176

176177
Artifact resolved = result.getArtifact();
177178
assertNull(resolved);
@@ -233,7 +234,8 @@ public void get(
233234
assertSame(request, result.getRequest());
234235

235236
assertFalse(result.getExceptions().isEmpty());
236-
assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException);
237+
assertInstanceOf(
238+
ArtifactNotFoundException.class, result.getExceptions().get(0));
237239

238240
Artifact resolved = result.getArtifact();
239241
assertNull(resolved);
@@ -284,7 +286,8 @@ void testResolveRemoteArtifactNeverAcceptFilter() {
284286
assertSame(request, result.getRequest());
285287

286288
assertFalse(result.getExceptions().isEmpty());
287-
assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException);
289+
assertInstanceOf(
290+
ArtifactNotFoundException.class, result.getExceptions().get(0));
288291
assertEquals("never-accept", result.getExceptions().get(0).getMessage());
289292

290293
Artifact resolved = result.getArtifact();
@@ -334,7 +337,8 @@ void testResolveRemoteArtifactNeverAcceptFilterFromRepo() {
334337
assertSame(request, result.getRequest());
335338

336339
assertFalse(result.getExceptions().isEmpty());
337-
assertTrue(result.getExceptions().get(0) instanceof ArtifactNotFoundException);
340+
assertInstanceOf(
341+
ArtifactNotFoundException.class, result.getExceptions().get(0));
338342
assertEquals("never-accept-id", result.getExceptions().get(0).getMessage());
339343

340344
Artifact resolved = result.getArtifact();
@@ -399,9 +403,9 @@ public void get(
399403
} catch (ArtifactResolutionException e) {
400404
connector.assertSeenExpected();
401405
for (ArtifactResult result : e.getResults()) {
402-
Throwable t = result.getExceptions().get(0);
403-
assertTrue(t instanceof ArtifactNotFoundException, t.toString());
404-
assertTrue(t.getMessage().contains("cached"), t.toString());
406+
Exception ex = result.getExceptions().get(0);
407+
assertInstanceOf(ArtifactNotFoundException.class, ex, ex.toString());
408+
assertTrue(ex.getMessage().contains("cached"), ex.toString());
405409
}
406410
}
407411
}
@@ -651,7 +655,8 @@ public VersionResult resolveVersion(RepositorySystemSession session, VersionRequ
651655
assertSame(request, result.getRequest());
652656

653657
assertFalse(result.getExceptions().isEmpty());
654-
assertTrue(result.getExceptions().get(0) instanceof VersionResolutionException);
658+
assertInstanceOf(
659+
VersionResolutionException.class, result.getExceptions().get(0));
655660

656661
Artifact resolved = result.getArtifact();
657662
assertNull(resolved);

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ void testSuccessfulInstall() throws InstallationException, IOException {
127127

128128
assertEquals(result.getRequest(), request);
129129

130-
assertEquals(result.getArtifacts().size(), 1);
130+
assertEquals(1, result.getArtifacts().size());
131131
assertTrue(result.getArtifacts().contains(artifact));
132132

133-
assertEquals(result.getMetadata().size(), 1);
133+
assertEquals(1, result.getMetadata().size());
134134
assertTrue(result.getMetadata().contains(metadata));
135135

136136
assertEquals(1, lrm.getMetadataRegistration().size());

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void testResolveNeverAcceptFilter() throws IOException {
336336
MetadataResult result = results.get(0);
337337
assertSame(request, result.getRequest());
338338
assertNotNull(result.getException());
339-
assertTrue(result.getException() instanceof MetadataNotFoundException);
339+
assertInstanceOf(MetadataNotFoundException.class, result.getException());
340340
assertEquals("never-accept", result.getException().getMessage());
341341
assertNull(result.getMetadata());
342342

@@ -396,7 +396,7 @@ void testResolveNeverAcceptFromRepoFilter() throws IOException {
396396
MetadataResult result = results.get(0);
397397
assertSame(request, result.getRequest());
398398
assertNotNull(result.getException());
399-
assertTrue(result.getException() instanceof MetadataNotFoundException);
399+
assertInstanceOf(MetadataNotFoundException.class, result.getException());
400400
assertEquals("never-accept-" + repository.getId(), result.getException().getMessage());
401401
assertNull(result.getMetadata());
402402

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ void testCheckMetadataNotFoundInRepoCachingEnabled() {
230230
check = newMetadataCheck().setArtifactPolicy(RepositoryPolicy.UPDATE_POLICY_DAILY);
231231
manager.checkMetadata(session, check);
232232
assertFalse(check.isRequired());
233-
assertTrue(check.getException() instanceof MetadataNotFoundException);
233+
assertInstanceOf(MetadataNotFoundException.class, check.getException());
234234
assertTrue(check.getException().isFromCache());
235235
}
236236

@@ -268,7 +268,7 @@ void testCheckMetadataErrorFromRepoCachingEnabled() {
268268
session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(false, true));
269269
manager.checkMetadata(session, check);
270270
assertFalse(check.isRequired());
271-
assertTrue(check.getException() instanceof MetadataTransferException);
271+
assertInstanceOf(MetadataTransferException.class, check.getException());
272272
assertTrue(check.getException().getMessage().contains("some error"), String.valueOf(check.getException()));
273273
assertTrue(check.getException().isFromCache());
274274
}
@@ -555,7 +555,7 @@ void testCheckArtifactNotFoundInRepoCachingEnabled() {
555555
check = newArtifactCheck().setArtifactPolicy(RepositoryPolicy.UPDATE_POLICY_DAILY);
556556
manager.checkArtifact(session, check);
557557
assertFalse(check.isRequired());
558-
assertTrue(check.getException() instanceof ArtifactNotFoundException);
558+
assertInstanceOf(ArtifactNotFoundException.class, check.getException());
559559
assertTrue(check.getException().isFromCache());
560560
}
561561

@@ -591,7 +591,7 @@ void testCheckArtifactErrorFromRepoCachingEnabled() {
591591
session.setResolutionErrorPolicy(new SimpleResolutionErrorPolicy(false, true));
592592
manager.checkArtifact(session, check);
593593
assertFalse(check.isRequired());
594-
assertTrue(check.getException() instanceof ArtifactTransferException);
594+
assertInstanceOf(ArtifactTransferException.class, check.getException());
595595
assertTrue(check.getException().isFromCache());
596596
}
597597

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/FileTrustedChecksumsSourceTestSupport.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,6 @@ void haveProvidedArtifactChecksum() {
114114
assertNotNull(providedChecksums);
115115
assertFalse(providedChecksums.isEmpty());
116116
assertEquals(1, providedChecksums.size());
117-
assertEquals(providedChecksums.get(checksumAlgorithmFactory.getName()), ARTIFACT_TRUSTED_CHECKSUM);
117+
assertEquals(ARTIFACT_TRUSTED_CHECKSUM, providedChecksums.get(checksumAlgorithmFactory.getName()));
118118
}
119119
}

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/checksum/TrustedToProvidedChecksumsSourceAdapterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void testSimplePositive() {
7272
transfer.setArtifact(artifactWithChecksum);
7373
Map<String, String> chk = adapter.getProvidedArtifactChecksums(session, transfer, repository, checksums);
7474
assertNotNull(chk);
75-
assertEquals(chk.get(Sha1ChecksumAlgorithmFactory.NAME), "foo");
75+
assertEquals("foo", chk.get(Sha1ChecksumAlgorithmFactory.NAME));
7676
}
7777

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

9797
@Test

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/DependencyCollectorDelegateTestSupport.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ void testInterruption() throws Exception {
167167
});
168168
t.start();
169169
t.join();
170-
assertTrue(cause.get() instanceof InterruptedException, String.valueOf(cause.get()));
170+
assertInstanceOf(InterruptedException.class, cause.get(), String.valueOf(cause.get()));
171171
}
172172

173173
@Test
@@ -202,7 +202,8 @@ void testMissingDependencyDescription() {
202202
assertNotNull(result.getExceptions());
203203
assertEquals(1, result.getExceptions().size());
204204

205-
assertTrue(result.getExceptions().get(0) instanceof ArtifactDescriptorException);
205+
assertInstanceOf(
206+
ArtifactDescriptorException.class, result.getExceptions().get(0));
206207

207208
assertEquals(request.getRoot(), result.getRoot().getDependency());
208209
}
@@ -324,7 +325,8 @@ void testPartialResultOnError() throws IOException {
324325
assertNotNull(result.getExceptions());
325326
assertEquals(1, result.getExceptions().size());
326327

327-
assertTrue(result.getExceptions().get(0) instanceof ArtifactDescriptorException);
328+
assertInstanceOf(
329+
ArtifactDescriptorException.class, result.getExceptions().get(0));
328330

329331
assertEqualSubtree(root, result.getRoot());
330332
}

‎maven-resolver-impl/src/test/java/org/eclipse/aether/internal/impl/collect/bf/DependencyResolutionSkipperTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ void testSkipVersionConflict() {
9191
skipper.cache(gNode, mutableList(aNode, eNode, fNode));
9292

9393
Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
94-
assertEquals(results.size(), 7);
94+
assertEquals(7, results.size());
9595

9696
List<DependencyResolutionSkipper.DependencyResolutionResult> skipped = results.values().stream()
9797
.filter(dependencyResolutionResult -> dependencyResolutionResult.skippedAsVersionConflict)
9898
.collect(Collectors.toList());
99-
assertEquals(skipped.size(), 1);
99+
assertEquals(1, skipped.size());
100100
assertSame(skipped.get(0).current, c3Node);
101101
}
102102
}
@@ -137,13 +137,13 @@ void testSkipDeeperDuplicateNode() {
137137
skipper.cache(c1Node, mutableList(aNode, dNode));
138138

139139
Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
140-
assertEquals(results.size(), 6);
140+
assertEquals(6, results.size());
141141

142142
List<DependencyResolutionSkipper.DefaultDependencyResolutionSkipper.DependencyResolutionResult> skipped =
143143
results.values().stream()
144144
.filter(dependencyResolutionResult -> dependencyResolutionResult.skippedAsDuplicate)
145145
.collect(Collectors.toList());
146-
assertEquals(skipped.size(), 2);
146+
assertEquals(2, skipped.size());
147147
assertSame(skipped.get(0).current, b1Node);
148148
assertSame(skipped.get(1).current, c1Node);
149149
}
@@ -190,13 +190,13 @@ void testForceResolution() {
190190
skipper.cache(d2Node, mutableList(aNode, bNode, c1Node));
191191

192192
Map<DependencyNode, DependencyResolutionSkipper.DependencyResolutionResult> results = skipper.getResults();
193-
assertEquals(results.size(), 7);
193+
assertEquals(7, results.size());
194194

195195
List<DependencyResolutionSkipper.DefaultDependencyResolutionSkipper.DependencyResolutionResult>
196196
forceResolved = results.values().stream()
197197
.filter(dependencyResolutionResult -> dependencyResolutionResult.forceResolution)
198198
.collect(Collectors.toList());
199-
assertEquals(forceResolved.size(), 3);
199+
assertEquals(3, forceResolved.size());
200200
assertSame(forceResolved.get(0).current, c1Node);
201201
assertSame(forceResolved.get(1).current, d1Node);
202202
assertSame(forceResolved.get(2).current, d2Node);

0 commit comments

Comments
 (0)