This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 8977f57086cee39f19c76e168631ad06999bee52 Author: Andrus Adamchik <[email protected]> AuthorDate: Sat May 16 14:05:14 2026 -0400 Tests cleanup - removing no-schema generation option from tests for simplicity --- .../java/org/apache/cayenne/unit/AllTestsSchemaManager.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java index 79ca9534e..ade9e1be1 100644 --- a/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java +++ b/cayenne/src/test/java/org/apache/cayenne/unit/AllTestsSchemaManager.java @@ -60,8 +60,6 @@ public class AllTestsSchemaManager { private static final Logger LOGGER = LoggerFactory.getLogger(AllTestsSchemaManager.class); - private static final String SKIP_SCHEMA_PROPERTY = "cayenneTestSkipSchemaCreation"; - private static final String[] MAPS_FOR_SCHEMA_SETUP = {"testmap.map.xml", "compound.map.xml", "misc-types.map.xml", "things.map.xml", "numeric-types.map.xml", "binary-pk.map.xml", "no-pk.map.xml", "lob.map.xml", "date-time.map.xml", "enum.map.xml", "json.map.xml", "extended-type.map.xml", @@ -140,18 +138,11 @@ public class AllTestsSchemaManager { } /** - * Completely rebuilds the test schema. + * Rebuilds the test schema, combining all DataMaps that require schema support. Schema generation is done like that + * instead of on-demand per-DataMap to avoid conflicts when dropping and generating PK objects. */ public void rebuildSchema() { - // Generate schema combining all DataMaps that require schema support. Schema generation is done like that - // instead of per DataMap on demand to avoid conflicts when dropping and generating PK objects. - - if ("true".equalsIgnoreCase(System.getProperty(SKIP_SCHEMA_PROPERTY))) { - LOGGER.info("skipping schema generation... "); - return; - } - try { dropSchema(); dropPKSupport();
