From b1a5a77013f45e1d5f28f88b2eddff7bde1f4fa1 Mon Sep 17 00:00:00 2001 From: jensp Date: Sun, 31 Mar 2019 10:01:05 +0000 Subject: [PATCH] CCM NG: Reorganization of SQL scripts for integration tests git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5896 8810af33-2d31-482b-a856-94f89814c4df --- .../org/libreccm/categorization/CategoryManagerTest.java | 6 ++++-- .../libreccm/categorization/CategoryRepositoryTest.java | 6 ++++-- .../libreccm/configuration/ConfigurationManagerTest.java | 6 ++++-- .../java/org/libreccm/core/CcmObjectRepositoryTest.java | 6 ++++-- .../test/java/org/libreccm/imexport/GroupImportTest.java | 6 ++++-- .../org/libreccm/imexport/GroupMembershipImportTest.java | 6 ++++-- .../test/java/org/libreccm/imexport/UserImportTest.java | 6 ++++-- .../java/org/libreccm/modules/ConfigurationLoaderTest.java | 6 ++++-- .../libreccm/security/AuthorizationInterceptorTest.java | 6 ++++-- .../java/org/libreccm/security/ChallengeManagerTest.java | 7 ++++--- .../test/java/org/libreccm/security/GroupManagerTest.java | 6 ++++-- .../java/org/libreccm/security/GroupRepositoryTest.java | 6 ++++-- .../java/org/libreccm/security/OneTimeAuthManagerTest.java | 6 ++++-- .../java/org/libreccm/security/PartyRepositoryTest.java | 6 ++++-- .../java/org/libreccm/security/PermissionCheckerTest.java | 6 ++++-- .../java/org/libreccm/security/PermissionManagerTest.java | 6 ++++-- .../test/java/org/libreccm/security/RoleManagerTest.java | 6 ++++-- .../java/org/libreccm/security/RoleRepositoryTest.java | 6 ++++-- .../java/org/libreccm/security/SecuredCollectionTest.java | 6 ++++-- .../java/org/libreccm/security/SecuredIteratorTest.java | 6 ++++-- .../src/test/java/org/libreccm/security/ShiroTest.java | 6 ++++-- .../test/java/org/libreccm/security/UserManagerTest.java | 6 ++++-- .../java/org/libreccm/security/UserRepositoryTest.java | 6 ++++-- .../scripts/001_create_schema.sql | 5 +++++ ..._ccm_core_schema.sql => 002_create_ccm_core_tables.sql} | 6 +++--- .../scripts/003_init_hibernate_sequence.sql | 1 + .../scripts/{cleanup.sql => 999_cleanup.sql} | 0 27 files changed, 101 insertions(+), 50 deletions(-) create mode 100644 ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql rename ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/{create_ccm_core_schema.sql => 002_create_ccm_core_tables.sql} (99%) create mode 100644 ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql rename ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/{cleanup.sql => 999_cleanup.sql} (100%) diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java index 8e9f557f9..a2521c6d5 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryManagerTest.java @@ -70,8 +70,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class CategoryManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java index 68b7e5756..88e0d38c7 100644 --- a/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/categorization/CategoryRepositoryTest.java @@ -65,8 +65,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class CategoryRepositoryTest { diff --git a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java index 9a1143d0a..ce623b11a 100644 --- a/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/configuration/ConfigurationManagerTest.java @@ -62,8 +62,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class ConfigurationManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java index 51578fdbc..4a91e29f7 100644 --- a/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/core/CcmObjectRepositoryTest.java @@ -67,8 +67,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class CcmObjectRepositoryTest { diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java index dd7b020f5..bfdaaa20c 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupImportTest.java @@ -72,8 +72,10 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class GroupImportTest { diff --git a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java index f9cb4c461..50da38183 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/GroupMembershipImportTest.java @@ -72,8 +72,10 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class GroupMembershipImportTest { diff --git a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java index 463a16c4a..0d6f828a8 100644 --- a/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java +++ b/ccm-core/src/test/java/org/libreccm/imexport/UserImportTest.java @@ -72,8 +72,10 @@ import static org.junit.Assert.*; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class UserImportTest { diff --git a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java index a0106ab0f..488a5d3a0 100644 --- a/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java +++ b/ccm-core/src/test/java/org/libreccm/modules/ConfigurationLoaderTest.java @@ -55,8 +55,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class ConfigurationLoaderTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java index 790ff31b9..184343c09 100644 --- a/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/AuthorizationInterceptorTest.java @@ -62,8 +62,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class AuthorizationInterceptorTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java index 2b3ee0bf7..54f4afb62 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ChallengeManagerTest.java @@ -50,7 +50,6 @@ import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.persistence.CleanupUsingScript; -import java.util.Optional; import org.jboss.arquillian.persistence.TestExecutionPhase; /** @@ -61,8 +60,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class ChallengeManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java index 632ead654..62380c7d2 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupManagerTest.java @@ -59,8 +59,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class GroupManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java index 212fc7b26..ccf562388 100644 --- a/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/GroupRepositoryTest.java @@ -65,8 +65,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class GroupRepositoryTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java index e65915bd2..cf26e9a4c 100644 --- a/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/OneTimeAuthManagerTest.java @@ -66,8 +66,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema("create_ccm_core_schema.sql") -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class OneTimeAuthManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java index 722609114..02792fdeb 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PartyRepositoryTest.java @@ -63,8 +63,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class PartyRepositoryTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java index 939082bbb..053162b8e 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionCheckerTest.java @@ -69,8 +69,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class PermissionCheckerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java index 6d4d7d088..15bdede20 100644 --- a/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java @@ -67,8 +67,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class PermissionManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java index 6dce9c5b0..9b9cbf6d3 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleManagerTest.java @@ -58,8 +58,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class RoleManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java index dbccdcdfd..a57a5c65d 100644 --- a/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/RoleRepositoryTest.java @@ -69,8 +69,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class RoleRepositoryTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java index 1d58fb38b..a481c118a 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredCollectionTest.java @@ -65,8 +65,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class SecuredCollectionTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java index 4817c9b27..2a4a024d9 100644 --- a/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/SecuredIteratorTest.java @@ -66,8 +66,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class SecuredIteratorTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java index 6f40858f5..a63da1a64 100644 --- a/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/ShiroTest.java @@ -64,8 +64,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class ShiroTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java index c6eb05023..13e452557 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserManagerTest.java @@ -63,8 +63,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class UserManagerTest { diff --git a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java index f73593fea..018e37e3f 100644 --- a/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java +++ b/ccm-core/src/test/java/org/libreccm/security/UserRepositoryTest.java @@ -65,8 +65,10 @@ import org.jboss.arquillian.persistence.TestExecutionPhase; @RunWith(Arquillian.class) @PersistenceTest @Transactional(TransactionMode.COMMIT) -@CreateSchema({"create_ccm_core_schema.sql"}) -@CleanupUsingScript(value = {"cleanup.sql"}, +@CreateSchema({"001_create_schema.sql", + "002_create_ccm_core_tables.sql", + "003_init_hibernate_sequence.sql"}) +@CleanupUsingScript(value = {"999_cleanup.sql"}, phase = TestExecutionPhase.BEFORE) public class UserRepositoryTest { diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql new file mode 100644 index 000000000..643d210ad --- /dev/null +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/001_create_schema.sql @@ -0,0 +1,5 @@ +drop schema if exists CCM_CORE; + +drop sequence if exists HIBERNATE_SEQUENCE; + +create schema CCM_CORE; diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_core_tables.sql similarity index 99% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql rename to ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_core_tables.sql index bf8206760..ddba5e676 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/002_create_ccm_core_tables.sql @@ -1,8 +1,8 @@ -drop schema if exists CCM_CORE; +-- drop schema if exists CCM_CORE; -drop sequence if exists HIBERNATE_SEQUENCE; +-- drop sequence if exists HIBERNATE_SEQUENCE; - create schema CCM_CORE; + -- create schema CCM_CORE; create table CCM_CORE.APPLICATIONS ( APPLICATION_TYPE varchar(1024) not null, diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/003_init_hibernate_sequence.sql new file mode 100644 index 000000000..4e200abfe --- /dev/null +++ b/ccm-core/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-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql similarity index 100% rename from ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql rename to ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/999_cleanup.sql