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

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class CategoryManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class CategoryRepositoryTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class ConfigurationManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class CcmObjectRepositoryTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class GroupImportTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class GroupMembershipImportTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class UserImportTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class ConfigurationLoaderTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class AuthorizationInterceptorTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class ChallengeManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class GroupManagerTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class GroupRepositoryTest {
 

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")
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class OneTimeAuthManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class PartyRepositoryTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class PermissionCheckerTest {
     

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class PermissionManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class RoleManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class RoleRepositoryTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class SecuredCollectionTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class SecuredIteratorTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class ShiroTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class UserManagerTest {
 

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"})
+@CreateSchema({"001_create_schema.sql", 
-@CleanupUsingScript(value = {"cleanup.sql"},
+               "002_create_ccm_core_tables.sql", 
+               "003_init_hibernate_sequence.sql"})
+@CleanupUsingScript(value = {"999_cleanup.sql"},
                     phase = TestExecutionPhase.BEFORE)
 public class UserRepositoryTest {
 

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;

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,

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;