diff --git a/extension/persistence/eclipselink/build.gradle.kts b/extension/persistence/eclipselink/build.gradle.kts index 96675b33be..20802ba657 100644 --- a/extension/persistence/eclipselink/build.gradle.kts +++ b/extension/persistence/eclipselink/build.gradle.kts @@ -59,3 +59,13 @@ dependencies { testImplementation(libs.mockito.core) testRuntimeOnly("org.junit.platform:junit-platform-launcher") } + +tasks.register("createTestConfJar") { + archiveFileName = "test-conf.jar" + destinationDirectory = layout.buildDirectory.dir("conf/eclipselink") + from("src/main/resources/META-INF/") { include("persistence.xml") } +} + +sourceSets { test { resources.srcDir(layout.buildDirectory.dir("conf")) } } + +tasks.named("processTestResources") { dependsOn("createTestConfJar") } diff --git a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java index 9fbf216702..5b04ecc18d 100644 --- a/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java +++ b/extension/persistence/eclipselink/src/test/java/org/apache/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreManagerTest.java @@ -215,11 +215,7 @@ public Stream provideArguments(ExtensionContext extensionCo Objects.requireNonNull(getClass().getResource("/META-INF/persistence.xml")).toURI()); Path confJar = Paths.get( - Objects.requireNonNull( - getClass() - .getResource( - "/org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar")) - .toURI()); + Objects.requireNonNull(getClass().getResource("/eclipselink/test-conf.jar")).toURI()); return Stream.of( // conf file not provided Arguments.of(null, true), @@ -227,12 +223,8 @@ public Stream provideArguments(ExtensionContext extensionCo Arguments.of("META-INF/persistence.xml", true), Arguments.of("META-INF/dummy.xml", false), // classpath resource, embedded - Arguments.of( - "org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar!/persistence.xml", - true), - Arguments.of( - "org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar!/dummy.xml", - false), + Arguments.of("eclipselink/test-conf.jar!/persistence.xml", true), + Arguments.of("eclipselink/test-conf.jar!/dummy.xml", false), Arguments.of("dummy/test-conf.jar!/persistence.xml", false), // filesystem path Arguments.of(persistenceXml.toString(), true), diff --git a/extension/persistence/eclipselink/src/test/resources/org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar b/extension/persistence/eclipselink/src/test/resources/org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar deleted file mode 100644 index 2e42cc1191..0000000000 Binary files a/extension/persistence/eclipselink/src/test/resources/org/apache/polaris/extension/persistence/impl/eclipselink/test-conf.jar and /dev/null differ