LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
pull/2/head
jensp 2017-01-26 13:40:09 +00:00
parent f8ae2e1bd3
commit de2b33fcd6
15 changed files with 435 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
View File

@ -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

33
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemPermissionTest.java
View File

@ -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,6 +64,7 @@ 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 "
@ -100,8 +102,8 @@ public class ContentItemPermissionTest {
public static WebArchive createDeployment() {
return ShrinkWrap
.create(WebArchive.class,
"LibreCCM-org.librecms.contentsection.ContentItemPermissionTest.war")
.addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
"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())
@ -124,29 +126,30 @@ public class ContentItemPermissionTest {
.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)
com.arsdigita.cms.dispatcher.ContentItemDispatcher.class).
addClass(com.arsdigita.dispatcher.Dispatcher.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)
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
.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
.addPackage(org.librecms.contenttypes.Article.class.getPackage()).
addPackage(org.libreccm.tests.categories.IntegrationTest.class
.getPackage())
// .addAsLibraries(getModuleDependencies())
.addAsLibraries(getCcmCoreDependencies())

13
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
View File

@ -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

2
ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java
View File

@ -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

6
ccm-cms/src/test/resources-wildfly-remote-h2-mem/arquillian.xml
View File

@ -19,7 +19,7 @@
Disable automatic cleanup, does not work because of referential
integrity constrains.
-->
<property name="defaultCleanupPhase">NONE</property>
<!--<property name="defaultCleanupPhase">NONE</property>-->
<property name="dumpData">true</property>
<property name="dumpDirectory">target</property>
@ -32,9 +32,9 @@
<property name="qualifiedTableNames">true</property>
</extension>
<extension qualifier="persistence-script">
<!--<extension qualifier="persistence-script">
<property name="scriptsToExecuteAfterTest">scripts/h2-cleanup.sql</property>
</extension>
</extension>-->
</arquillian>

162
ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/cleanup.sql 100644
View File

@ -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;

6
ccm-cms/src/test/resources-wildfly-remote-pgsql/arquillian.xml
View File

@ -18,7 +18,7 @@
Disable automatic cleanup, does not work because of referential
integrity constrains.
-->
<property name="defaultCleanupPhase">NONE</property>
<!--<property name="defaultCleanupPhase">NONE</property>-->
<property name="dumpData">true</property>
<property name="dumpDirectory">target</property>
@ -31,9 +31,9 @@
<property name="qualifiedTableNames">true</property>
</extension>
<extension qualifier="persistence-script">
<!--<extension qualifier="persistence-script">
<property name="scriptsToExecuteAfterTest">scripts/pgsql-cleanup.sql</property>
</extension>
</extension>-->
</arquillian>

162
ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/cleanup.sql 100644
View File

@ -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;