From ad58cc9d3377a02a5134f1b07bfa8ff3dca2e0c2 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 3 Apr 2019 18:11:48 +0000 Subject: [PATCH] CCM NG: Split up SQL generation scripts for testing git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5908 8810af33-2d31-482b-a856-94f89814c4df --- .../contentsection/AssetManagerTest.java | 16 ++++++++++++---- .../AttachmentListManagerTest.java | 16 +++++++++++++--- .../ContentItemL10NManagerTest.java | 16 +++++++++++++--- .../ContentItemManagerTest.java | 16 +++++++++++++--- .../ContentItemPermissionTest.java | 16 +++++++++++++--- .../ContentItemRepositoryTest.java | 17 +++++++++++++---- .../ContentSectionManagerTest.java | 19 ++++++++++++++----- .../ContentTypeRepositoryTest.java | 16 +++++++++++++--- .../contentsection/FolderManagerTest.java | 16 +++++++++++++--- .../ItemAttachmentManagerTest.java | 16 +++++++++++++--- .../scripts/001_create_schema.sql | 10 ++++++++++ ...hema.sql => 002_create_ccm_cms_tables.sql} | 9 --------- .../scripts/003_init_hibernate_sequence.sql | 1 + .../scripts/{cleanup.sql => 999_cleanup.sql} | 0 .../scripts/001_create_schema.sql | 10 ++++++++++ ...hema.sql => 002_create_ccm_cms_tables.sql} | 0 .../scripts/003_init_hibernate_sequence.sql | 1 + .../scripts/{cleanup.sql => 999_cleanup.sql} | 0 .../scripts/001_create_schema.sql | 5 +++++ ...ema.sql => 002_create_ccm_core_tables.sql} | 6 ------ .../scripts/{cleanup.sql => 999_cleanup.sql} | 0 21 files changed, 157 insertions(+), 49 deletions(-) create mode 100644 ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql rename ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/{create_ccm_cms_schema.sql => 002_create_ccm_cms_tables.sql} (99%) create mode 100644 ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql rename ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/{cleanup.sql => 999_cleanup.sql} (100%) create mode 100644 ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql rename ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/{create_ccm_cms_schema.sql => 002_create_ccm_cms_tables.sql} (100%) create mode 100644 ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql rename ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/{cleanup.sql => 999_cleanup.sql} (100%) create mode 100644 ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql rename ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/{create_ccm_core_schema.sql => 002_create_ccm_core_tables.sql} (99%) rename ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/{cleanup.sql => 999_cleanup.sql} (100%) diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java index f0935169d..94ff23e55 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java @@ -57,8 +57,6 @@ import org.jboss.arquillian.persistence.CleanupUsingScript; import org.librecms.assets.FileAsset; -import java.util.concurrent.Callable; - import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -71,8 +69,18 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript({"cleanup.sql"}) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + { + "999_cleanup.sql" + } +) public class AssetManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java index fc3d2d06a..8ec46d284 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java @@ -62,9 +62,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class AttachmentListManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java index 8f7d0ab3f..05019c9a9 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java @@ -61,9 +61,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentItemL10NManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java index ebe5e88a0..895df8a50 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java @@ -71,9 +71,19 @@ import org.libreccm.workflow.WorkflowRepository; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentItemManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java index bd9301f68..afe6c2f45 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java @@ -67,9 +67,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentItemPermissionTest { private static final String QUERY = "SELECT DISTINCT i FROM ContentItem i " diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java index ffbe7de00..f72b77347 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java @@ -58,7 +58,6 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.apache.shiro.subject.Subject; import org.libreccm.security.Shiro; -import java.util.concurrent.Callable; /** * @@ -68,9 +67,19 @@ import java.util.concurrent.Callable; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentItemRepositoryTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java index b077eda2c..7a92b22b2 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java @@ -1,5 +1,4 @@ -/* - * Copyright (C) 2016 LibreCCM Foundation. +/* Copyright (C) 2016 LibreCCM Foundation. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -75,9 +74,19 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentSectionManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java index 8b4ce0227..98fddf340 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java @@ -64,9 +64,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ContentTypeRepositoryTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java index a1c60923f..be8199e45 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java @@ -60,9 +60,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class FolderManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java index 895c51d25..c2b5faadc 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java @@ -60,9 +60,19 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest //@Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_cms_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, - phase = TestExecutionPhase.BEFORE) +@CreateSchema( + { + "001_create_schema.sql", + "002_create_ccm_cms_tables.sql", + "003_init_hibernate_sequence.sql" + } +) +@CleanupUsingScript( + value = { + "999_cleanup.sql" + }, + phase = TestExecutionPhase.BEFORE +) public class ItemAttachmentManagerTest { @Inject diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql new file mode 100644 index 000000000..8f5613b9e --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -0,0 +1,10 @@ +drop schema if exists CCM_CMS; +drop schema if exists CCM_CORE; + +drop sequence if exists HIBERNATE_SEQUENCE; + + + create schema CCM_CMS; + + create schema CCM_CORE; + diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql similarity index 99% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql rename to ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql index 777877274..00841f73f 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_cms_tables.sql @@ -1,12 +1,3 @@ -drop schema if exists CCM_CMS; -drop schema if exists CCM_CORE; - -drop sequence if exists HIBERNATE_SEQUENCE; - - - create schema CCM_CMS; - - create schema CCM_CORE; create table CCM_CMS.ARTICLE_TEXTS ( OBJECT_ID bigint not null, diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql new file mode 100644 index 000000000..4e200abfe --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql @@ -0,0 +1 @@ +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql rename to ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql new file mode 100644 index 000000000..1c3e2089e --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql @@ -0,0 +1,10 @@ +drop schema if exists CCM_CMS cascade; +drop schema if exists CCM_CORE cascade; + +drop sequence if exists HIBERNATE_SEQUENCE; + + + create schema CCM_CMS; + + create schema CCM_CORE; + diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql rename to ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_cms_tables.sql diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql new file mode 100644 index 000000000..4e200abfe --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/003_init_hibernate_sequence.sql @@ -0,0 +1 @@ +ALTER SEQUENCE hibernate_sequence RESTART WITH 100000; diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql similarity index 100% rename from ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql rename to ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql new file mode 100644 index 000000000..ed145f3e9 --- /dev/null +++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/001_create_schema.sql @@ -0,0 +1,5 @@ +drop schema if exists CCM_CORE cascade; + +drop sequence if exists HIBERNATE_SEQUENCE; + +create schema CCM_CORE; diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql similarity index 99% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql rename to ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql index fd967ab0a..a1b40403c 100644 --- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/002_create_ccm_core_tables.sql @@ -1,9 +1,3 @@ -drop schema if exists CCM_CORE cascade; - -drop sequence if exists HIBERNATE_SEQUENCE; - -create schema CCM_CORE; - create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, PRIMARY_URL varchar(1024) not null, diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql rename to ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/999_cleanup.sql