Avoid using .overrideConfigKey() with archive-provided application.pr…

…operties It does not always work as expected, as I just realized. (cherry picked from commit f34d59b)
quarkusio · Aug 3, 2021 · c10ee6c · c10ee6c
1 parent a3ce572
commit c10ee6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/...m/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java b/...m/deployment/src/test/java/io/quarkus/hibernate/orm/config/NoHibernatePropertiesTest.java
@@ -29,8 +29,8 @@ public class NoHibernatePropertiesTest {
             })
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
                     .addClass(MyEntity.class)
-                    .addAsResource(new StringAsset(""), "hibernate.properties")
-                    .addAsResource("application.properties"))
+                    .addAsResource(new StringAsset(""), "hibernate.properties"))
+            .withConfigurationResource("application.properties")
             .overrideConfigKey("quarkus.datasource.devservices", "false");
 
     @Test

diff --git a/.../java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java b/.../java/io/quarkus/hibernate/orm/config/namedpu/EntitiesInNamedPUWithoutDatasourceTest.java
@@ -20,11 +20,10 @@ public class EntitiesInNamedPUWithoutDatasourceTest {
                         .isInstanceOf(ConfigurationException.class)
                         .hasMessageContainingAll("Datasource must be defined for persistence unit 'pu-1'.");
             })
+            .withConfigurationResource("application-named-pu-no-datasource.properties")
             .overrideConfigKey("quarkus.datasource.devservices", "false")
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
-                    .addPackage(MyEntity.class.getPackage().getName())
-                    .addAsResource("application-named-pu-no-datasource.properties",
-                            "application.properties"));
+                    .addPackage(MyEntity.class.getPackage().getName()));
 
     @Test
     public void testInvalidConfiguration() {