Skip to content

Commit 132aa7b

Browse files
slawekjaranowskislawekjaranowski
authored
Merge pull request #190 from codehaus-plexus/rename-test-resources
Rename resources of test data
2 parents 61e68b6 + 216e33d commit 132aa7b

File tree

49 files changed

+78
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+78
-78
lines changed

‎plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/AbstractFilenameModuleNameExtractorTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ public abstract class AbstractFilenameModuleNameExtractorTest {
3131

3232
@Test
3333
void testJarWithoutManifest() throws Exception {
34-
String name = getExtractor().extract(Paths.get("src/test/resources/jar.empty/plexus-java-1.0.0-SNAPSHOT.jar"));
34+
String name = getExtractor().extract(Paths.get("src/test/test-data/jar.empty/plexus-java-1.0.0-SNAPSHOT.jar"));
3535
assertEquals("plexus.java", name);
3636
}
3737

3838
@Test
3939
void testJarWithManifest() throws Exception {
4040
String name = getExtractor()
41-
.extract(Paths.get("src/test/resources/jar.manifest.with/plexus-java-1.0.0-SNAPSHOT.jar"));
41+
.extract(Paths.get("src/test/test-data/jar.manifest.with/plexus-java-1.0.0-SNAPSHOT.jar"));
4242
assertEquals("org.codehaus.plexus.languages.java", name);
4343
}
4444

4545
@Test
4646
void testJarUnsupported() throws Exception {
47-
String name = getExtractor().extract(Paths.get("src/test/resources/jar.unsupported/jdom-1.0.jar"));
47+
String name = getExtractor().extract(Paths.get("src/test/test-data/jar.unsupported/jdom-1.0.jar"));
4848
assertNull(name);
4949
}
5050

5151
@Test
5252
void testJarWithSpacesInPath() throws Exception {
5353
String name = getExtractor()
54-
.extract(Paths.get("src/test/resources/jar with spaces in path/plexus-java-1.0.0-SNAPSHOT.jar"));
54+
.extract(Paths.get("src/test/test-data/jar with spaces in path/plexus-java-1.0.0-SNAPSHOT.jar"));
5555
assertEquals("org.codehaus.plexus.languages.java", name);
5656
}
5757
}

‎plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/BinaryModuleInfoParserTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class BinaryModuleInfoParserTest {
4949
@Test
5050
void testJarDescriptor() throws Exception {
5151
JavaModuleDescriptor descriptor =
52-
parser.getModuleDescriptor(Paths.get("src/test/resources/jar.descriptor/asm-6.0_BETA.jar"));
52+
parser.getModuleDescriptor(Paths.get("src/test/test-data/jar.descriptor/asm-6.0_BETA.jar"));
5353

5454
assertNotNull(descriptor);
5555
assertThat(descriptor.name()).isEqualTo("org.objectweb.asm");
@@ -69,7 +69,7 @@ void testJarDescriptor() throws Exception {
6969
@Test
7070
void testMultiReleaseJarDescriptor() throws Exception {
7171
JavaModuleDescriptor descriptor = parser.getModuleDescriptor(
72-
Paths.get("src/test/resources/jar.mr.descriptor/jloadr-1.0-SNAPSHOT.jar"), JavaVersion.parse("17"));
72+
Paths.get("src/test/test-data/jar.mr.descriptor/jloadr-1.0-SNAPSHOT.jar"), JavaVersion.parse("17"));
7373

7474
assertNotNull(descriptor);
7575
assertEquals("de.adito.jloadr", descriptor.name());
@@ -80,23 +80,23 @@ void testMultiReleaseJarDescriptor() throws Exception {
8080
void testIncompleteMultiReleaseJarDescriptor() throws Exception {
8181
// this jar is missing the Multi-Release: true entry in the Manifest
8282
JavaModuleDescriptor descriptor = parser.getModuleDescriptor(
83-
Paths.get("src/test/resources/jar.mr.incomplete.descriptor/jloadr-1.0-SNAPSHOT.jar"));
83+
Paths.get("src/test/test-data/jar.mr.incomplete.descriptor/jloadr-1.0-SNAPSHOT.jar"));
8484

8585
assertNull(descriptor);
8686
}
8787

8888
@Test
8989
void testClassicJar() throws Exception {
9090
JavaModuleDescriptor descriptor =
91-
parser.getModuleDescriptor(Paths.get("src/test/resources/jar.empty/plexus-java-1.0.0-SNAPSHOT.jar"));
91+
parser.getModuleDescriptor(Paths.get("src/test/test-data/jar.empty/plexus-java-1.0.0-SNAPSHOT.jar"));
9292

9393
assertNull(descriptor);
9494
}
9595

9696
@Test
9797
void testOutputDirectoryDescriptor() throws Exception {
9898
JavaModuleDescriptor descriptor =
99-
parser.getModuleDescriptor(Paths.get("src/test/resources/dir.descriptor/out"));
99+
parser.getModuleDescriptor(Paths.get("src/test/test-data/dir.descriptor/out"));
100100

101101
assertNotNull(descriptor);
102102
assertEquals("org.codehaus.plexus.languages.java.demo", descriptor.name());
@@ -118,13 +118,13 @@ void testOutputDirectoryDescriptor() throws Exception {
118118
void testClassicOutputDirectory() {
119119
assertThrows(
120120
NoSuchFileException.class,
121-
() -> parser.getModuleDescriptor(Paths.get("src/test/resources/dir.empty/out")));
121+
() -> parser.getModuleDescriptor(Paths.get("src/test/test-data/dir.empty/out")));
122122
}
123123

124124
@Test
125125
void testJModDescriptor() throws Exception {
126126
JavaModuleDescriptor descriptor = parser.getModuleDescriptor(
127-
Paths.get("src/test/resources/jmod.descriptor/first-jmod-1.0-SNAPSHOT.jmod"));
127+
Paths.get("src/test/test-data/jmod.descriptor/first-jmod-1.0-SNAPSHOT.jmod"));
128128

129129
assertNotNull(descriptor);
130130
assertEquals("com.corporate.project", descriptor.name());
@@ -141,13 +141,13 @@ void testJModDescriptor() throws Exception {
141141
@Test
142142
void testInvalidFile() {
143143
assertThrows(
144-
IOException.class, () -> parser.getModuleDescriptor(Paths.get("src/test/resources/nonjar/pom.xml")));
144+
IOException.class, () -> parser.getModuleDescriptor(Paths.get("src/test/test-data/nonjar/pom.xml")));
145145
}
146146

147147
@Test
148148
void testUses() throws Exception {
149149
try (InputStream is =
150-
Files.newInputStream(Paths.get("src/test/resources/dir.descriptor.uses/out/module-info.class"))) {
150+
Files.newInputStream(Paths.get("src/test/test-data/dir.descriptor.uses/out/module-info.class"))) {
151151
JavaModuleDescriptor descriptor = parser.parse(is);
152152

153153
assertNotNull(descriptor);
@@ -163,7 +163,7 @@ void testUses() throws Exception {
163163
@Test
164164
void testProvides() throws Exception {
165165
JavaModuleDescriptor descriptor =
166-
parser.getModuleDescriptor(Paths.get("src/test/resources/jar.service/threeten-extra-1.4.jar"));
166+
parser.getModuleDescriptor(Paths.get("src/test/test-data/jar.service/threeten-extra-1.4.jar"));
167167

168168
assertNotNull(descriptor);
169169
assertEquals(1, descriptor.provides().size());
@@ -188,7 +188,7 @@ void testProvides() throws Exception {
188188
@Test
189189
void testRequires() throws Exception {
190190
try (InputStream is =
191-
Files.newInputStream(Paths.get("src/test/resources/dir.descriptor.requires/out/module-info.class"))) {
191+
Files.newInputStream(Paths.get("src/test/test-data/dir.descriptor.requires/out/module-info.class"))) {
192192
JavaModuleDescriptor descriptor = parser.parse(is);
193193

194194
assertNotNull(descriptor);

‎plexus-java/src/test/java/org/codehaus/plexus/languages/java/jpms/LocationManagerIT.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class LocationManagerIT {
5454

5555
private LocationManager locationManager;
5656

57-
final Path mockModuleInfoJava = Paths.get("src/test/resources/mock/module-info.java");
57+
final Path mockModuleInfoJava = Paths.get("src/test/test-data/mock/module-info.java");
5858

5959
@BeforeEach
6060
void onSetup() {
@@ -68,7 +68,7 @@ ModuleInfoParser getBinaryModuleInfoParser(Path jdkHome) {
6868

6969
@Test
7070
void testManifestWithoutReflectRequires() throws Exception {
71-
Path abc = Paths.get("src/test/resources/manifest.without/out");
71+
Path abc = Paths.get("src/test/test-data/manifest.without/out");
7272
JavaModuleDescriptor descriptor =
7373
JavaModuleDescriptor.newModule("base").requires("any").build();
7474
when(qdoxParser.fromSourcePath(any(Path.class))).thenReturn(descriptor);
@@ -86,7 +86,7 @@ void testManifestWithoutReflectRequires() throws Exception {
8686

8787
@Test
8888
void testEmptyWithReflectRequires() throws Exception {
89-
Path abc = Paths.get("src/test/resources/empty/out");
89+
Path abc = Paths.get("src/test/test-data/empty/out");
9090
JavaModuleDescriptor descriptor =
9191
JavaModuleDescriptor.newModule("base").requires("a.b.c").build();
9292
when(qdoxParser.fromSourcePath(any(Path.class))).thenReturn(descriptor);
@@ -105,7 +105,7 @@ void testEmptyWithReflectRequires() throws Exception {
105105
@Test
106106
void testResolvePathWithException() {
107107
assertThrows(RuntimeException.class, () -> {
108-
Path p = Paths.get("src/test/resources/jar.empty.invalid.name/101-1.0.0-SNAPSHOT.jar");
108+
Path p = Paths.get("src/test/test-data/jar.empty.invalid.name/101-1.0.0-SNAPSHOT.jar");
109109
ResolvePathRequest<Path> request = ResolvePathRequest.ofPath(p);
110110

111111
locationManager.resolvePath(request);
@@ -114,7 +114,7 @@ void testResolvePathWithException() {
114114

115115
@Test
116116
void testClassicJarNameStartsWithNumber() throws Exception {
117-
Path p = Paths.get("src/test/resources/jar.empty.invalid.name/101-1.0.0-SNAPSHOT.jar");
117+
Path p = Paths.get("src/test/test-data/jar.empty.invalid.name/101-1.0.0-SNAPSHOT.jar");
118118
ResolvePathsRequest<Path> request =
119119
ResolvePathsRequest.ofPaths(Arrays.asList(p)).setMainModuleDescriptor(mockModuleInfoJava);
120120

0 commit comments

Comments
 (0)