Skip to content

Commit d620809

Browse files
slachiewiczslachiewicz
committed
Remove Hamcrest dependency and replace with JUnit assertions
Removed Hamcrest dependency from 6 POM files: - pom.xml (parent POM dependencyManagement) - plexus-compiler-api/pom.xml - plexus-compiler-test/pom.xml - plexus-compilers/plexus-compiler-eclipse/pom.xml - plexus-compilers/plexus-compiler-javac/pom.xml - plexus-compilers/plexus-compiler-csharp/pom.xml Converted all test files from Hamcrest to JUnit assertions: - plexus-compiler-api: 4 test files - plexus-compiler-test: 2 test files - plexus-compiler-eclipse: 3 test files - plexus-compiler-javac: 2 test files - plexus-compiler-csharp: 2 test files All tests pass successfully.
1 parent 760bbdf commit d620809

File tree

20 files changed

+318
-1015
lines changed

20 files changed

+318
-1015
lines changed

‎plexus-compiler-api/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,5 @@
3333
<artifactId>junit-jupiter-api</artifactId>
3434
<scope>test</scope>
3535
</dependency>
36-
<dependency>
37-
<groupId>org.hamcrest</groupId>
38-
<artifactId>hamcrest</artifactId>
39-
<scope>test</scope>
40-
</dependency>
4136
</dependencies>
4237
</project>

‎plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/CompilerConfigurationTest.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import org.junit.jupiter.api.BeforeEach;
77
import org.junit.jupiter.api.Test;
88

9-
import static org.hamcrest.MatcherAssert.assertThat;
10-
import static org.hamcrest.Matchers.is;
9+
import static org.junit.jupiter.api.Assertions.assertEquals;
1110

1211
public class CompilerConfigurationTest {
1312
private CompilerConfiguration configuration;
@@ -22,21 +21,21 @@ public void testCustomArguments() {
2221
configuration.addCompilerCustomArgument("--add-exports", "FROM-MOD/package1=OTHER-MOD");
2322
configuration.addCompilerCustomArgument("--add-exports", "FROM-MOD/package2=OTHER-MOD");
2423

25-
assertThat(configuration.getCustomCompilerArgumentsAsMap().size(), is(1));
26-
assertThat(
27-
configuration.getCustomCompilerArgumentsAsMap().get("--add-exports"),
28-
is("FROM-MOD/package2=OTHER-MOD"));
24+
assertEquals(1, configuration.getCustomCompilerArgumentsAsMap().size());
25+
assertEquals(
26+
"FROM-MOD/package2=OTHER-MOD",
27+
configuration.getCustomCompilerArgumentsAsMap().get("--add-exports"));
2928

30-
assertThat(configuration.getCustomCompilerArgumentsEntries().size(), is(2));
29+
assertEquals(2, configuration.getCustomCompilerArgumentsEntries().size());
3130
Iterator<Map.Entry<String, String>> entries =
3231
configuration.getCustomCompilerArgumentsEntries().iterator();
3332
Map.Entry<String, String> entry;
3433

3534
entry = entries.next();
36-
assertThat(entry.getKey(), is("--add-exports"));
37-
assertThat(entry.getValue(), is("FROM-MOD/package1=OTHER-MOD"));
35+
assertEquals("--add-exports", entry.getKey());
36+
assertEquals("FROM-MOD/package1=OTHER-MOD", entry.getValue());
3837
entry = entries.next();
39-
assertThat(entry.getKey(), is("--add-exports"));
40-
assertThat(entry.getValue(), is("FROM-MOD/package2=OTHER-MOD"));
38+
assertEquals("--add-exports", entry.getKey());
39+
assertEquals("FROM-MOD/package2=OTHER-MOD", entry.getValue());
4140
}
4241
}

‎plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/AbstractSourceInclusionScannerTest.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
2727
import org.junit.jupiter.api.Test;
2828

29-
import static org.hamcrest.MatcherAssert.assertThat;
30-
import static org.hamcrest.Matchers.empty;
31-
import static org.hamcrest.Matchers.not;
32-
import static org.hamcrest.io.FileMatchers.anExistingFile;
29+
import static org.junit.jupiter.api.Assertions.assertFalse;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
3331

3432
/**
3533
* Tests for all the implementations of <code>SourceInclusionScanner</code>
@@ -59,10 +57,10 @@ public void testGetIncludedSources() throws Exception {
5957

6058
Set<File> includedSources = scanner.getIncludedSources(base, base);
6159

62-
assertThat("no sources were included", includedSources, not(empty()));
60+
assertFalse(includedSources.isEmpty(), "no sources were included");
6361

6462
for (File file : includedSources) {
65-
assertThat("file included does not exist", file, anExistingFile());
63+
assertTrue(file.exists(), "file included does not exist");
6664
}
6765
}
6866

‎plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/StaleSourceScannerTest.java‎

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,11 @@
2323
import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping;
2424
import org.codehaus.plexus.compiler.util.scan.mapping.SourceMapping;
2525
import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping;
26-
import org.hamcrest.Matchers;
2726
import org.junit.jupiter.api.BeforeEach;
2827
import org.junit.jupiter.api.Test;
2928

30-
import static org.hamcrest.MatcherAssert.assertThat;
31-
import static org.hamcrest.Matchers.contains;
32-
import static org.hamcrest.Matchers.containsInAnyOrder;
33-
import static org.hamcrest.Matchers.empty;
34-
import static org.hamcrest.Matchers.is;
29+
import static org.junit.jupiter.api.Assertions.assertEquals;
30+
import static org.junit.jupiter.api.Assertions.assertTrue;
3531

3632
/**
3733
* @author jdcasey
@@ -68,9 +64,9 @@ public void testWithDefaultConstructorShouldFindOneStaleSource() throws Exceptio
6864

6965
Set<File> result = scanner.getIncludedSources(base, base);
7066

71-
assertThat("wrong number of stale sources returned.", result.size(), is(1));
67+
assertEquals(1, result.size(), "wrong number of stale sources returned.");
7268

73-
assertThat("expected stale source file not found in result", result, Matchers.contains(sourceFile));
69+
assertTrue(result.contains(sourceFile), "expected stale source file not found in result");
7470
}
7571

7672
@Test
@@ -97,9 +93,9 @@ public void testWithDefaultConstructorShouldNotFindStaleSources() throws Excepti
9793

9894
Set<File> result = scanner.getIncludedSources(base, base);
9995

100-
assertThat("wrong number of stale sources returned.", result.size(), is(0));
96+
assertEquals(0, result.size(), "wrong number of stale sources returned.");
10197

102-
assertThat("expected stale source file not found in result", result, empty());
98+
assertTrue(result.isEmpty(), "expected stale source file not found in result");
10399
}
104100

105101
@Test
@@ -116,9 +112,9 @@ public void testWithDefaultConstructorShouldFindStaleSourcesBecauseOfMissingTarg
116112

117113
Set<File> result = scanner.getIncludedSources(base, base);
118114

119-
assertThat("wrong number of stale sources returned.", result.size(), is(1));
115+
assertEquals(1, result.size(), "wrong number of stale sources returned.");
120116

121-
assertThat("expected stale source file not found in result", result, contains(sourceFile));
117+
assertTrue(result.contains(sourceFile), "expected stale source file not found in result");
122118
}
123119

124120
@Test
@@ -150,10 +146,12 @@ public void testWithDefaultConstructorShouldFindStaleSourcesOneBecauseOfMissingT
150146

151147
Set<File> result = scanner.getIncludedSources(base, base);
152148

153-
assertThat("wrong number of stale sources returned.", result.size(), is(2));
149+
assertEquals(2, result.size(), "wrong number of stale sources returned.");
154150

155-
assertThat(
156-
"expected stale source file not found in result", result, containsInAnyOrder(sourceFile, sourceFile2));
151+
assertEquals(2, result.size());
152+
assertTrue(
153+
result.contains(sourceFile) && result.contains(sourceFile2),
154+
"expected stale source file not found in result");
157155
}
158156

159157
@Test
@@ -203,9 +201,9 @@ public void testWithDefaultConstructorShouldFindOneStaleSourcesWithStaleTargetAn
203201

204202
Set<File> result = scanner.getIncludedSources(base, base);
205203

206-
assertThat("wrong number of stale sources returned.", result.size(), is(1));
204+
assertEquals(1, result.size(), "wrong number of stale sources returned.");
207205

208-
assertThat("expected stale source file not found in result", result, contains(sourceFile));
206+
assertTrue(result.contains(sourceFile), "expected stale source file not found in result");
209207
}
210208

211209
@Test
@@ -249,9 +247,9 @@ public void testConstructedWithMsecsShouldReturnOneSourceFileOfTwoDueToLastMod()
249247

250248
Set<File> result = scanner.getIncludedSources(base, base);
251249

252-
assertThat("wrong number of stale sources returned.", result.size(), is(1));
250+
assertEquals(1, result.size(), "wrong number of stale sources returned.");
253251

254-
assertThat("expected stale source file not found in result", result, contains(sourceFile2));
252+
assertTrue(result.contains(sourceFile2), "expected stale source file not found in result");
255253
}
256254

257255
@Test
@@ -309,9 +307,9 @@ public void testConstructedWithMsecsIncludesAndExcludesShouldReturnOneSourceFile
309307

310308
Set<File> result = scanner.getIncludedSources(base, base);
311309

312-
assertThat("wrong number of stale sources returned.", result.size(), is(1));
310+
assertEquals(1, result.size(), "wrong number of stale sources returned.");
313311

314-
assertThat("expected stale source file not found in result", result, contains(sourceFile3));
312+
assertTrue(result.contains(sourceFile3), "expected stale source file not found in result");
315313
}
316314

317315
@Test
@@ -369,10 +367,12 @@ public void testConstructedWithMsecsIncludesAndExcludesShouldReturnTwoSourceFile
369367

370368
Set<File> result = scanner.getIncludedSources(base, base);
371369

372-
assertThat("wrong number of stale sources returned.", result.size(), is(2));
370+
assertEquals(2, result.size(), "wrong number of stale sources returned.");
373371

374-
assertThat(
375-
"expected stale source file not found in result", result, containsInAnyOrder(sourceFile2, sourceFile3));
372+
assertEquals(2, result.size());
373+
assertTrue(
374+
result.contains(sourceFile2) && result.contains(sourceFile3),
375+
"expected stale source file not found in result");
376376
}
377377

378378
@Test
@@ -401,9 +401,9 @@ public void testSingleFileSourceMapping() throws Exception {
401401

402402
Set<File> result = scanner.getIncludedSources(src, target);
403403

404-
assertThat(result.size(), is(1));
404+
assertEquals(1, result.size());
405405

406-
assertThat(result, contains(fooCs));
406+
assertTrue(result.contains(fooCs));
407407

408408
// ----------------------------------------------------------------------
409409
// Add another source file
@@ -417,9 +417,10 @@ public void testSingleFileSourceMapping() throws Exception {
417417

418418
result = scanner.getIncludedSources(src, target);
419419

420-
assertThat(result.size(), is(2));
420+
assertEquals(2, result.size());
421421

422-
assertThat(result, containsInAnyOrder(fooCs, barCs));
422+
assertEquals(2, result.size());
423+
assertTrue(result.contains(fooCs) && result.contains(barCs));
423424

424425
// ----------------------------------------------------------------------
425426
// Now add the result file
@@ -433,7 +434,7 @@ public void testSingleFileSourceMapping() throws Exception {
433434

434435
result = scanner.getIncludedSources(src, target);
435436

436-
assertThat(result, empty());
437+
assertTrue(result.isEmpty());
437438

438439
// ----------------------------------------------------------------------
439440
// Make Application.exe older than the Foo.cs
@@ -443,8 +444,8 @@ public void testSingleFileSourceMapping() throws Exception {
443444

444445
result = scanner.getIncludedSources(src, target);
445446

446-
assertThat(result.size(), is(1));
447+
assertEquals(1, result.size());
447448

448-
assertThat(result, contains(fooCs));
449+
assertTrue(result.contains(fooCs));
449450
}
450451
}

‎plexus-compiler-api/src/test/java/org/codehaus/plexus/compiler/util/scan/mapping/SuffixMappingTest.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,8 @@
2222

2323
import org.junit.jupiter.api.Test;
2424

25-
import static org.hamcrest.MatcherAssert.assertThat;
26-
import static org.hamcrest.Matchers.containsInAnyOrder;
27-
import static org.hamcrest.Matchers.empty;
28-
import static org.hamcrest.Matchers.is;
25+
import static org.junit.jupiter.api.Assertions.assertEquals;
26+
import static org.junit.jupiter.api.Assertions.assertTrue;
2927

3028
/**
3129
* @author jdcasey
@@ -42,9 +40,9 @@ public void testShouldReturnSingleClassFileForSingleJavaFile() {
4240

4341
Set<File> results = mapping.getTargetFiles(basedir, base + ".java");
4442

45-
assertThat("Returned wrong number of target files.", results.size(), is(1));
43+
assertEquals(1, results.size(), "Returned wrong number of target files.");
4644

47-
assertThat("Target file is wrong.", results.iterator().next(), is(new File(basedir, base + ".class")));
45+
assertEquals(new File(basedir, base + ".class"), results.iterator().next(), "Target file is wrong.");
4846
}
4947

5048
@Test
@@ -57,7 +55,7 @@ public void testShouldNotReturnClassFileWhenSourceFileHasWrongSuffix() {
5755

5856
Set<File> results = mapping.getTargetFiles(basedir, base + ".xml");
5957

60-
assertThat("Returned wrong number of target files.", results, empty());
58+
assertTrue(results.isEmpty(), "Returned wrong number of target files.");
6159
}
6260

6361
@Test
@@ -74,12 +72,11 @@ public void testShouldReturnOneClassFileAndOneXmlFileForSingleJavaFile() {
7472

7573
Set<File> results = mapping.getTargetFiles(basedir, base + ".java");
7674

77-
assertThat("Returned wrong number of target files.", results.size(), is(2));
75+
assertEquals(2, results.size(), "Returned wrong number of target files.");
7876

79-
assertThat(
80-
"Targets do not contain class target.",
81-
results,
82-
containsInAnyOrder(new File(basedir, base + ".class"), new File(basedir, base + ".xml")));
77+
assertEquals(2, results.size());
78+
assertTrue(results.contains(new File(basedir, base + ".class")), "Targets do not contain class target.");
79+
assertTrue(results.contains(new File(basedir, base + ".xml")), "Targets do not contain xml target.");
8380
}
8481

8582
@Test
@@ -96,7 +93,7 @@ public void testShouldReturnNoTargetFilesWhenSourceFileHasWrongSuffix() {
9693

9794
Set<File> results = mapping.getTargetFiles(basedir, base + ".apt");
9895

99-
assertThat("Returned wrong number of target files.", results, empty());
96+
assertTrue(results.isEmpty(), "Returned wrong number of target files.");
10097
}
10198

10299
@Test
@@ -109,10 +106,10 @@ public void testSingleTargetMapper() throws Exception {
109106

110107
Set<File> results = mapping.getTargetFiles(basedir, base + ".apt");
111108

112-
assertThat(results, empty());
109+
assertTrue(results.isEmpty());
113110

114111
results = mapping.getTargetFiles(basedir, base + ".cs");
115112

116-
assertThat(results.size(), is(1));
113+
assertEquals(1, results.size());
117114
}
118115
}

‎plexus-compiler-manager/src/test/java/org/codehaus/plexus/compiler/manager/CompilerManagerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
import javax.inject.Inject;
2727

2828
import org.codehaus.plexus.testing.PlexusTest;
29-
import org.junit.jupiter.api.Assertions;
3029
import org.junit.jupiter.api.Test;
3130

31+
import static org.junit.jupiter.api.Assertions.assertThrows;
32+
3233
/**
3334
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
3435
*/
@@ -39,6 +40,6 @@ public class CompilerManagerTest {
3940

4041
@Test
4142
public void testBasic() throws Exception {
42-
Assertions.assertThrows(NoSuchCompilerException.class, () -> compilerManager.getCompiler("foo"));
43+
assertThrows(NoSuchCompilerException.class, () -> compilerManager.getCompiler("foo"));
4344
}
4445
}

‎plexus-compiler-test/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,6 @@
3232
<artifactId>plexus-testing</artifactId>
3333
<scope>compile</scope>
3434
</dependency>
35-
<dependency>
36-
<groupId>org.hamcrest</groupId>
37-
<artifactId>hamcrest</artifactId>
38-
<scope>compile</scope>
39-
</dependency>
4035
<dependency>
4136
<groupId>org.apache.maven</groupId>
4237
<artifactId>maven-artifact</artifactId>

0 commit comments

Comments
 (0)