From 9c0fd8c9501acaca5f6a694f9465e8887ecbc647 Mon Sep 17 00:00:00 2001 From: Fabio Niephaus Date: Wed, 18 Oct 2023 15:52:00 +0200 Subject: [PATCH] Fix h2-related tests. --- .../buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy | 2 +- .../buildtools/gradle/ReachabilityMetadataFunctionalTest.groovy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy index 57e3ad831..1f3cc3c39 100644 --- a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy +++ b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/OfficialMetadataRepoFunctionalTest.groovy @@ -60,7 +60,7 @@ class OfficialMetadataRepoFunctionalTest extends AbstractFunctionalTest { } and: "finds metadata in the remote repository" - outputContains "[graalvm reachability metadata repository for com.h2database:h2:2.1.210]: Configuration directory is com.h2database" + File.separator + "h2" + File.separator + "2.1.210" + outputContains "[graalvm reachability metadata repository for com.h2database:h2:2.2.220]: Configuration directory is com.h2database" + File.separator + "h2" + File.separator + "2.2.220" outputDoesNotContain "Falling back to the default repository at" } diff --git a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/ReachabilityMetadataFunctionalTest.groovy b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/ReachabilityMetadataFunctionalTest.groovy index 33b733513..4e32d4cba 100644 --- a/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/ReachabilityMetadataFunctionalTest.groovy +++ b/native-gradle-plugin/src/functionalTest/groovy/org/graalvm/buildtools/gradle/ReachabilityMetadataFunctionalTest.groovy @@ -59,7 +59,7 @@ class ReachabilityMetadataFunctionalTest extends AbstractFunctionalTest { } and: "has copied metadata file" - matches(file("build/native-reachability-metadata/META-INF/native-image/com.h2database/h2/2.1.210/resource-config.json").text.trim(), '''{ + matches(file("build/native-reachability-metadata/META-INF/native-image/com.h2database/h2/2.2.220/resource-config.json").text.trim(), '''{ "bundles": [], "resources": { "includes": [