Skip to content

Commit cd1d951

Browse files
Fix metadata tests
1 parent 41f81e5 commit cd1d951

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

common/utils/src/test/java/org/graalvm/buildtools/utils/FileUtilsTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ void testExtract(@TempDir Path tempDir) throws IOException {
9090
assertEquals("[]", String.join("\n", Files.readAllLines(tempDir.resolve("index.json"))));
9191

9292
assertTrue(Files.isDirectory(tempDir.resolve("org")));
93-
assertTrue(Files.isDirectory(tempDir.resolve("org/graalvm")));
94-
assertTrue(Files.isDirectory(tempDir.resolve("org/graalvm/internal")));
95-
assertTrue(Files.isDirectory(tempDir.resolve("org/graalvm/internal/library-with-reflection")));
96-
assertTrue(Files.exists(tempDir.resolve("org/graalvm/internal/library-with-reflection/index.json")));
97-
assertTrue(Files.isDirectory(tempDir.resolve("org/graalvm/internal/library-with-reflection/1")));
98-
99-
assertTrue(Files.exists(tempDir.resolve("org/graalvm/internal/library-with-reflection/1/reflect-config.json")));
100-
assertEquals("[ { \"name\": \"org.graalvm.internal.reflect.Message\", \"allDeclaredFields\": true, \"allDeclaredMethods\": true }]", String.join("", Files.readAllLines(tempDir.resolve("org/graalvm/internal/library-with-reflection/1/reflect-config.json"))));
93+
assertTrue(Files.isDirectory(tempDir.resolve("org.graalvm")));
94+
assertTrue(Files.isDirectory(tempDir.resolve("org.graalvm.internal")));
95+
assertTrue(Files.isDirectory(tempDir.resolve("org.graalvm.internal/library-with-reflection")));
96+
assertTrue(Files.exists(tempDir.resolve("org.graalvm.internal/library-with-reflection/index.json")));
97+
assertTrue(Files.isDirectory(tempDir.resolve("org.graalvm.internal/library-with-reflection/1")));
98+
99+
assertTrue(Files.exists(tempDir.resolve("org.graalvm.internal/library-with-reflection/1/reflect-config.json")));
100+
assertEquals("[ { \"name\": \"org.graalvm.internal.reflect.Message\", \"allDeclaredFields\": true, \"allDeclaredMethods\": true }]", String.join("", Files.readAllLines(tempDir.resolve("org.graalvm.internal/library-with-reflection/1/reflect-config.json"))));
101101
}
102102
@Test
103103
@DisplayName("It is protected against ZIP slip attacks")

native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/NativeConfigRepoFunctionalTest.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class NativeConfigRepoFunctionalTest extends AbstractFunctionalTest {
7878
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
7979

8080
and: "but finds one thanks to the latest configuration field"
81-
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
81+
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
8282

8383
where:
8484
format | label

native-maven-plugin/src/functionalTest/groovy/org/graalvm/buildtools/maven/MetadataRepositoryFunctionalTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
8383
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
8484

8585
and: "but it finds one thanks to the latest configuration field"
86-
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
86+
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
8787
}
8888

8989
void "if excludeConfig is set it is added to the command line invocation"() {
@@ -151,7 +151,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
151151
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
152152

153153
and: "but it finds one thanks to the latest configuration field"
154-
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
154+
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
155155
}
156156

157157
void "it can download a remote repository"() {
@@ -171,7 +171,7 @@ class MetadataRepositoryFunctionalTest extends AbstractGraalVMMavenFunctionalTes
171171
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory not found. Trying latest version."
172172

173173
and: "but it finds one thanks to the latest configuration field"
174-
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org/graalvm/internal/library-with-reflection/1"
174+
outputContains "[graalvm reachability metadata repository for org.graalvm.internal:library-with-reflection:1.5]: Configuration directory is org.graalvm.internal/library-with-reflection/1"
175175
}
176176

177177
void "when pointing to a missing URL, reflection fails"() {

0 commit comments

Comments
 (0)