From e274007ef5040c16193f1eb69125b896b771fc9d Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 26 Jan 2017 13:40:09 +0000 Subject: [PATCH] CCM NG/ccm-cms: Is now using Arquillian database cleanup git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4537 8810af33-2d31-482b-a856-94f89814c4df --- .../contentsection/AssetManagerTest.java | 2 + .../contentsection/AssetRepositoryTest.java | 2 + .../AttachmentListManagerTest.java | 2 + .../ContentItemL10NManagerTest.java | 2 + .../ContentItemManagerTest.java | 2 + .../ContentItemPermissionTest.java | 159 ++++++++--------- .../ContentItemRepositoryTest.java | 13 +- .../ContentSectionManagerTest.java | 2 + .../ContentTypeRepositoryTest.java | 2 + .../contentsection/FolderManagerTest.java | 2 + .../ItemAttachmentManagerTest.java | 2 + .../arquillian.xml | 6 +- .../scripts/cleanup.sql | 162 ++++++++++++++++++ .../arquillian.xml | 6 +- .../scripts/cleanup.sql | 162 ++++++++++++++++++ 15 files changed, 435 insertions(+), 91 deletions(-) create mode 100644 ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql create mode 100644 ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql 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 01b815578..3f7154846 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java @@ -51,6 +51,7 @@ import java.util.Locale; import javax.activation.MimeType; import javax.activation.MimeTypeParseException; +import org.jboss.arquillian.persistence.CleanupUsingScript; import org.librecms.assets.File; @@ -67,6 +68,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class AssetManagerTest { @Inject diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java index e2dbacf63..23df66733 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Optional; import javax.inject.Inject; +import org.jboss.arquillian.persistence.CleanupUsingScript; import org.librecms.assets.File; import org.librecms.assets.Image; @@ -65,6 +66,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class AssetRepositoryTest { @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 f31ebf52e..d840e24d2 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java @@ -47,6 +47,7 @@ import java.util.List; import java.util.Optional; import javax.inject.Inject; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -61,6 +62,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 b6eabb3ba..8064a6379 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java @@ -46,6 +46,7 @@ import java.util.Locale; import java.util.Optional; import javax.inject.Inject; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -60,6 +61,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 fe96ff425..61ddbd60f 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java @@ -52,6 +52,7 @@ import java.util.Optional; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -68,6 +69,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 d99220e6f..8787acd17 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java @@ -50,6 +50,7 @@ import java.util.stream.Collectors; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.TypedQuery; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -63,12 +64,13 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class ContentItemPermissionTest { private static final String QUERY = "SELECT i FROM ContentItem i " - + "JOIN i.permissions p " - + "WHERE p.grantee IN :roles " - + "AND p.grantedPrivilege = 'view_draft_items' " + + "JOIN i.permissions p " + + "WHERE p.grantee IN :roles " + + "AND p.grantedPrivilege = 'view_draft_items' " + "ORDER BY i.displayName"; @Inject @@ -99,62 +101,63 @@ public class ContentItemPermissionTest { @Deployment public static WebArchive createDeployment() { return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.librecms.contentsection.ContentItemPermissionTest.war") - .addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) - .addPackage(org.libreccm.categorization.Categorization.class - .getPackage()) - .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) - .addPackage(org.libreccm.configuration.Configuration.class - .getPackage()) - .addPackage(org.libreccm.core.CcmCore.class.getPackage()) - .addPackage(org.libreccm.jpa.EntityManagerProducer.class - .getPackage()) - .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class - .getPackage()) - .addPackage(org.libreccm.l10n.LocalizedString.class - .getPackage()) - .addPackage(org.libreccm.security.Permission.class.getPackage()) - .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) - .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) - .addPackage(com.arsdigita.bebop.Component.class.getPackage()) - .addPackage(com.arsdigita.bebop.util.BebopConstants.class - .getPackage()) - .addClass(com.arsdigita.kernel.KernelConfig.class) - .addClass(com.arsdigita.runtime.CCMResourceManager.class) - .addClass(com.arsdigita.dispatcher.RequestContext.class) - .addClass(com.arsdigita.dispatcher.AccessDeniedException.class) - .addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class) - .addClass(com.arsdigita.dispatcher.Dispatcher.class) - .addClass( - com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class) - .addClass( - com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class) - .addClass( - com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class) - .addClass( - com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class) - .addClass(com.arsdigita.cms.dispatcher.ItemResolver.class) - .addClass(org.libreccm.portation.Portable.class) - .addPackage(com.arsdigita.util.Lockable.class.getPackage()) - .addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) - .addPackage(org.librecms.Cms.class.getPackage()) - .addPackage(org.librecms.contentsection.Asset.class.getPackage()) - .addPackage(org.librecms.contentsection.AttachmentList.class - .getPackage()) - .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage()) - .addPackage(org.librecms.contentsection.ContentSection.class - .getPackage()) - .addPackage(org.librecms.contenttypes.Article.class.getPackage()) - .addPackage(org.libreccm.tests.categories.IntegrationTest.class - .getPackage()) - // .addAsLibraries(getModuleDependencies()) - .addAsLibraries(getCcmCoreDependencies()) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsWebInfResource("test-web.xml", "web.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); + .create(WebArchive.class, + "LibreCCM-org.librecms.contentsection.ContentItemPermissionTest.war"). + addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) + .addPackage(org.libreccm.categorization.Categorization.class + .getPackage()) + .addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) + .addPackage(org.libreccm.configuration.Configuration.class + .getPackage()) + .addPackage(org.libreccm.core.CcmCore.class.getPackage()) + .addPackage(org.libreccm.jpa.EntityManagerProducer.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class + .getPackage()) + .addPackage(org.libreccm.l10n.LocalizedString.class + .getPackage()) + .addPackage(org.libreccm.security.Permission.class.getPackage()) + .addPackage(org.libreccm.web.CcmApplication.class.getPackage()) + .addPackage(org.libreccm.workflow.Workflow.class.getPackage()) + .addPackage(com.arsdigita.bebop.Component.class.getPackage()) + .addPackage(com.arsdigita.bebop.util.BebopConstants.class + .getPackage()) + .addClass(com.arsdigita.kernel.KernelConfig.class) + .addClass(com.arsdigita.runtime.CCMResourceManager.class) + .addClass(com.arsdigita.dispatcher.RequestContext.class) + .addClass(com.arsdigita.dispatcher.AccessDeniedException.class) + .addClass( + com.arsdigita.cms.dispatcher.ContentItemDispatcher.class). + addClass(com.arsdigita.dispatcher.Dispatcher.class) + .addClass( + com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class). + addClass( + com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class). + addClass( + com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class). + addClass( + com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class). + addClass(com.arsdigita.cms.dispatcher.ItemResolver.class) + .addClass(org.libreccm.portation.Portable.class) + .addPackage(com.arsdigita.util.Lockable.class.getPackage()) + .addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) + .addPackage(org.librecms.Cms.class.getPackage()) + .addPackage(org.librecms.contentsection.Asset.class.getPackage()). + addPackage(org.librecms.contentsection.AttachmentList.class + .getPackage()) + .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage()) + .addPackage(org.librecms.contentsection.ContentSection.class + .getPackage()) + .addPackage(org.librecms.contenttypes.Article.class.getPackage()). + addPackage(org.libreccm.tests.categories.IntegrationTest.class + .getPackage()) + // .addAsLibraries(getModuleDependencies()) + .addAsLibraries(getCcmCoreDependencies()) + .addAsResource("test-persistence.xml", + "META-INF/persistence.xml") + .addAsResource("configs/shiro.ini", "shiro.ini") + .addAsWebInfResource("test-web.xml", "web.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml"); } @Test @@ -177,19 +180,19 @@ public class ContentItemPermissionTest { @Test @InSequence(100) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemPermissionTest/data.xml") + + "ContentItemPermissionTest/data.xml") public void accessByNoUser() { final List roles; if (shiro.getUser() == null) { roles = new ArrayList<>(); } else { roles = shiro.getUser().getRoleMemberships().stream() - .map(membership -> membership.getRole()) - .collect(Collectors.toList()); + .map(membership -> membership.getRole()) + .collect(Collectors.toList()); } final TypedQuery query = entityManager.createQuery( - QUERY, ContentItem.class); + QUERY, ContentItem.class); query.setParameter("roles", roles); final List result = query.getResultList(); @@ -199,19 +202,19 @@ public class ContentItemPermissionTest { @Test @InSequence(200) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemPermissionTest/data.xml") + + "ContentItemPermissionTest/data.xml") public void accessByUser1() { final UsernamePasswordToken token = new UsernamePasswordToken( - "user1@example.org", "foo123"); + "user1@example.org", "foo123"); token.setRememberMe(true); subject.login(token); final List roles = shiro.getUser().getRoleMemberships().stream() - .map(membership -> membership.getRole()) - .collect(Collectors.toList()); + .map(membership -> membership.getRole()) + .collect(Collectors.toList()); final TypedQuery query = entityManager.createQuery( - QUERY, ContentItem.class); + QUERY, ContentItem.class); query.setParameter("roles", roles); final List result = query.getResultList(); @@ -223,19 +226,19 @@ public class ContentItemPermissionTest { @Test @InSequence(300) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemPermissionTest/data.xml") + + "ContentItemPermissionTest/data.xml") public void accessByUser2() { final UsernamePasswordToken token = new UsernamePasswordToken( - "user2@example.org", "foo123"); + "user2@example.org", "foo123"); token.setRememberMe(true); subject.login(token); final List roles = shiro.getUser().getRoleMemberships().stream() - .map(membership -> membership.getRole()) - .collect(Collectors.toList()); + .map(membership -> membership.getRole()) + .collect(Collectors.toList()); final TypedQuery query = entityManager.createQuery( - QUERY, ContentItem.class); + QUERY, ContentItem.class); query.setParameter("roles", roles); final List result = query.getResultList(); @@ -246,19 +249,19 @@ public class ContentItemPermissionTest { @Test @InSequence(400) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemPermissionTest/data.xml") + + "ContentItemPermissionTest/data.xml") public void accessByUser3() { final UsernamePasswordToken token = new UsernamePasswordToken( - "user3@example.org", "foo123"); + "user3@example.org", "foo123"); token.setRememberMe(true); subject.login(token); final List roles = shiro.getUser().getRoleMemberships().stream() - .map(membership -> membership.getRole()) - .collect(Collectors.toList()); + .map(membership -> membership.getRole()) + .collect(Collectors.toList()); final TypedQuery query = entityManager.createQuery( - QUERY, ContentItem.class); + QUERY, ContentItem.class); query.setParameter("roles", roles); final List result = query.getResultList(); 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 de4bb791b..66686aa65 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java @@ -18,9 +18,14 @@ */ package org.librecms.contentsection; +import java.util.List; +import java.util.Locale; +import java.util.Optional; +import javax.inject.Inject; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.junit.InSequence; +import org.jboss.arquillian.persistence.CleanupUsingScript; import org.jboss.arquillian.persistence.CreateSchema; import org.jboss.arquillian.persistence.PersistenceTest; import org.jboss.arquillian.persistence.ShouldMatchDataSet; @@ -42,15 +47,8 @@ import org.libreccm.tests.categories.IntegrationTest; import org.librecms.contenttypes.Article; import org.librecms.contenttypes.News; -import java.util.List; -import java.util.Locale; -import java.util.Optional; - -import javax.inject.Inject; - import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; - import static org.libreccm.testutils.DependenciesHelpers.*; /** @@ -62,6 +60,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 ff718c6c5..a41afd973 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java @@ -55,6 +55,7 @@ import static org.junit.Assert.*; import static org.libreccm.testutils.DependenciesHelpers.*; import org.jboss.arquillian.container.test.api.ShouldThrowException; +import org.jboss.arquillian.persistence.CleanupUsingScript; import org.libreccm.workflow.WorkflowTemplate; import org.libreccm.workflow.WorkflowTemplateRepository; import org.librecms.contentsection.privileges.ItemPrivileges; @@ -74,6 +75,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 7b476bff7..7e7f3ca83 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java @@ -49,6 +49,7 @@ import java.util.List; import java.util.Optional; import javax.inject.Inject; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -62,6 +63,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 d1a6d8bbc..eab7dc00c 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java @@ -43,6 +43,7 @@ import org.junit.runner.RunWith; import org.libreccm.tests.categories.IntegrationTest; import javax.inject.Inject; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -56,6 +57,7 @@ import static org.junit.Assert.*; @PersistenceTest @Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) 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 dd6ea3cb3..9c14a044d 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java @@ -45,6 +45,7 @@ import java.util.Optional; import javax.activation.MimeTypeParseException; import javax.inject.Inject; import javax.persistence.EntityManager; +import org.jboss.arquillian.persistence.CleanupUsingScript; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; @@ -59,6 +60,7 @@ import static org.junit.Assert.*; @PersistenceTest //@Transactional(TransactionMode.COMMIT) @CreateSchema({"create_ccm_cms_schema.sql"}) +@CleanupUsingScript({"cleanup.sql"}) public class ItemAttachmentManagerTest { @Inject diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml index 043eae21f..2922a02e6 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml @@ -19,7 +19,7 @@ Disable automatic cleanup, does not work because of referential integrity constrains. --> - NONE + true target @@ -32,9 +32,9 @@ true - + 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/cleanup.sql new file mode 100644 index 000000000..cc2fdf4ad --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql @@ -0,0 +1,162 @@ +DELETE FROM ccm_cms.attachments_aud; + +DELETE FROM ccm_cms.attachments; + +DELETE FROM ccm_cms.attachment_lists_aud; + +DELETE FROM ccm_cms.attachment_lists; + +DELETE FROM ccm_cms.images_aud; + +DELETE FROM ccm_cms.images; + +DELETE FROM ccm_cms.files_aud; + +DELETE FROM ccm_cms.files; + +DELETE FROM ccm_cms.binary_assets_aud; + +DELETE FROM ccm_cms.binary_assets; + +DELETE FROM ccm_cms.asset_titles_aud; + +DELETE FROM ccm_cms.asset_titles; + +DELETE FROM ccm_cms.assets_aud; + +DELETE FROM ccm_cms.assets; + +DELETE FROM ccm_cms.news_texts; + +DELETE FROM ccm_cms.news; + +DELETE FROM ccm_cms.article_texts; + +DELETE FROM ccm_cms.article_texts_aud; + +DELETE FROM ccm_cms.articles; + +DELETE FROM ccm_cms.articles_aud; + +DELETE FROM ccm_cms.content_item_descriptions; + +DELETE FROM ccm_cms.content_item_descriptions_aud; + +DELETE FROM ccm_cms.content_item_names; + +DELETE FROM ccm_cms.content_item_names_aud; + +DELETE FROM ccm_cms.content_item_titles; + +DELETE FROM ccm_cms.content_item_titles_aud; + +DELETE FROM ccm_cms.content_items; + +DELETE FROM ccm_cms.content_items_aud; + +DELETE FROM ccm_cms.content_section_lifecycle_definitions; + +DELETE FROM ccm_cms.content_type_labels; + +DELETE FROM ccm_cms.content_type_descriptions; + +DELETE FROM ccm_cms.content_types; + +DELETE FROM ccm_cms.workflow_tasks; + +DELETE FROM ccm_core.workflow_descriptions; + +DELETE FROM ccm_core.workflow_names; + +DELETE FROM ccm_core.workflow_task_dependencies; + +DELETE FROM ccm_core.workflow_task_labels; + +DELETE FROM ccm_core.workflow_task_assignments; + +DELETE FROM ccm_core.workflow_assignable_tasks; + +DELETE FROM ccm_core.workflow_tasks; + +DELETE FROM ccm_core.workflow_task_descriptions; + +DELETE FROM ccm_cms.content_section_workflow_templates; + +DELETE FROM ccm_core.workflow_templates; + +DELETE FROM ccm_core.workflows; + +DELETE FROM ccm_cms.lifecycle_phase_definition_labels; + +DELETE FROM ccm_cms.lifecycle_phase_definition_descriptions; + +DELETE FROM ccm_cms.lifecycle_definition_labels; + +DELETE FROM ccm_cms.lifecycle_definition_descriptions; + +DELETE FROM ccm_cms.lifecyle_phases; + +DELETE FROM ccm_cms.lifecycles; + +DELETE FROM ccm_cms.lifecycle_phase_definitions; + +DELETE FROM ccm_cms.lifecyle_definitions; + +DELETE FROM ccm_cms.folder_content_section_map; + +DELETE FROM ccm_cms.content_section_roles; + +DELETE FROM ccm_cms.content_sections; + +DELETE FROM ccm_cms.folders; + +DELETE FROM ccm_core.settings_string_list; + +DELETE FROM ccm_core.settings_l10n_str_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings; + +DELETE FROM ccm_core.categorizations; + +DELETE FROM ccm_core.category_domains; + +DELETE FROM ccm_core.category_titles; + +DELETE FROM ccm_core.categories; + +DELETE FROM ccm_core.permissions; + +DELETE FROM ccm_core.applications; + +DELETE FROM ccm_core.resource_titles; + +DELETE FROM ccm_core.resources; + +DELETE FROM ccm_core.ccm_objects; + +DELETE FROM ccm_core.role_memberships; + +DELETE FROM ccm_core.group_memberships; + +DELETE FROM ccm_core.groups; + +DELETE FROM ccm_core.one_time_auth_tokens; + +DELETE FROM ccm_core.users; + +DELETE FROM ccm_core.user_email_addresses; + +DELETE FROM ccm_core.parties; + +DELETE FROM ccm_core.ccm_roles; + +DELETE FROM ccm_core.ccm_objects_aud; + +DELETE FROM ccm_core.ccm_revisions; + +ALTER SEQUENCE hibernate_sequence RESTART WITH 1; + diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml b/ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml index 3ee0692f6..8e6610821 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml @@ -18,7 +18,7 @@ Disable automatic cleanup, does not work because of referential integrity constrains. --> - NONE + true target @@ -31,9 +31,9 @@ true - + diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql new file mode 100644 index 000000000..cc2fdf4ad --- /dev/null +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql @@ -0,0 +1,162 @@ +DELETE FROM ccm_cms.attachments_aud; + +DELETE FROM ccm_cms.attachments; + +DELETE FROM ccm_cms.attachment_lists_aud; + +DELETE FROM ccm_cms.attachment_lists; + +DELETE FROM ccm_cms.images_aud; + +DELETE FROM ccm_cms.images; + +DELETE FROM ccm_cms.files_aud; + +DELETE FROM ccm_cms.files; + +DELETE FROM ccm_cms.binary_assets_aud; + +DELETE FROM ccm_cms.binary_assets; + +DELETE FROM ccm_cms.asset_titles_aud; + +DELETE FROM ccm_cms.asset_titles; + +DELETE FROM ccm_cms.assets_aud; + +DELETE FROM ccm_cms.assets; + +DELETE FROM ccm_cms.news_texts; + +DELETE FROM ccm_cms.news; + +DELETE FROM ccm_cms.article_texts; + +DELETE FROM ccm_cms.article_texts_aud; + +DELETE FROM ccm_cms.articles; + +DELETE FROM ccm_cms.articles_aud; + +DELETE FROM ccm_cms.content_item_descriptions; + +DELETE FROM ccm_cms.content_item_descriptions_aud; + +DELETE FROM ccm_cms.content_item_names; + +DELETE FROM ccm_cms.content_item_names_aud; + +DELETE FROM ccm_cms.content_item_titles; + +DELETE FROM ccm_cms.content_item_titles_aud; + +DELETE FROM ccm_cms.content_items; + +DELETE FROM ccm_cms.content_items_aud; + +DELETE FROM ccm_cms.content_section_lifecycle_definitions; + +DELETE FROM ccm_cms.content_type_labels; + +DELETE FROM ccm_cms.content_type_descriptions; + +DELETE FROM ccm_cms.content_types; + +DELETE FROM ccm_cms.workflow_tasks; + +DELETE FROM ccm_core.workflow_descriptions; + +DELETE FROM ccm_core.workflow_names; + +DELETE FROM ccm_core.workflow_task_dependencies; + +DELETE FROM ccm_core.workflow_task_labels; + +DELETE FROM ccm_core.workflow_task_assignments; + +DELETE FROM ccm_core.workflow_assignable_tasks; + +DELETE FROM ccm_core.workflow_tasks; + +DELETE FROM ccm_core.workflow_task_descriptions; + +DELETE FROM ccm_cms.content_section_workflow_templates; + +DELETE FROM ccm_core.workflow_templates; + +DELETE FROM ccm_core.workflows; + +DELETE FROM ccm_cms.lifecycle_phase_definition_labels; + +DELETE FROM ccm_cms.lifecycle_phase_definition_descriptions; + +DELETE FROM ccm_cms.lifecycle_definition_labels; + +DELETE FROM ccm_cms.lifecycle_definition_descriptions; + +DELETE FROM ccm_cms.lifecyle_phases; + +DELETE FROM ccm_cms.lifecycles; + +DELETE FROM ccm_cms.lifecycle_phase_definitions; + +DELETE FROM ccm_cms.lifecyle_definitions; + +DELETE FROM ccm_cms.folder_content_section_map; + +DELETE FROM ccm_cms.content_section_roles; + +DELETE FROM ccm_cms.content_sections; + +DELETE FROM ccm_cms.folders; + +DELETE FROM ccm_core.settings_string_list; + +DELETE FROM ccm_core.settings_l10n_str_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings_enum_values; + +DELETE FROM ccm_core.settings; + +DELETE FROM ccm_core.categorizations; + +DELETE FROM ccm_core.category_domains; + +DELETE FROM ccm_core.category_titles; + +DELETE FROM ccm_core.categories; + +DELETE FROM ccm_core.permissions; + +DELETE FROM ccm_core.applications; + +DELETE FROM ccm_core.resource_titles; + +DELETE FROM ccm_core.resources; + +DELETE FROM ccm_core.ccm_objects; + +DELETE FROM ccm_core.role_memberships; + +DELETE FROM ccm_core.group_memberships; + +DELETE FROM ccm_core.groups; + +DELETE FROM ccm_core.one_time_auth_tokens; + +DELETE FROM ccm_core.users; + +DELETE FROM ccm_core.user_email_addresses; + +DELETE FROM ccm_core.parties; + +DELETE FROM ccm_core.ccm_roles; + +DELETE FROM ccm_core.ccm_objects_aud; + +DELETE FROM ccm_core.ccm_revisions; + +ALTER SEQUENCE hibernate_sequence RESTART WITH 1; +