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-94f89814c4dfccm-docs
parent
085c3c5233
commit
e274007ef5
|
|
@ -51,6 +51,7 @@ import java.util.Locale;
|
||||||
|
|
||||||
import javax.activation.MimeType;
|
import javax.activation.MimeType;
|
||||||
import javax.activation.MimeTypeParseException;
|
import javax.activation.MimeTypeParseException;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import org.librecms.assets.File;
|
import org.librecms.assets.File;
|
||||||
|
|
||||||
|
|
@ -67,6 +68,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class AssetManagerTest {
|
public class AssetManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@ import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import org.librecms.assets.File;
|
import org.librecms.assets.File;
|
||||||
import org.librecms.assets.Image;
|
import org.librecms.assets.Image;
|
||||||
|
|
@ -65,6 +66,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class AssetRepositoryTest {
|
public class AssetRepositoryTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -47,6 +47,7 @@ import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -61,6 +62,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class AttachmentListManagerTest {
|
public class AttachmentListManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,7 @@ import java.util.Locale;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -60,6 +61,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentItemL10NManagerTest {
|
public class ContentItemL10NManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,7 @@ import java.util.Optional;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
import javax.persistence.TypedQuery;
|
import javax.persistence.TypedQuery;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -68,6 +69,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentItemManagerTest {
|
public class ContentItemManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@ import java.util.stream.Collectors;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
import javax.persistence.TypedQuery;
|
import javax.persistence.TypedQuery;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -63,12 +64,13 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentItemPermissionTest {
|
public class ContentItemPermissionTest {
|
||||||
|
|
||||||
private static final String QUERY = "SELECT i FROM ContentItem i "
|
private static final String QUERY = "SELECT i FROM ContentItem i "
|
||||||
+ "JOIN i.permissions p "
|
+ "JOIN i.permissions p "
|
||||||
+ "WHERE p.grantee IN :roles "
|
+ "WHERE p.grantee IN :roles "
|
||||||
+ "AND p.grantedPrivilege = 'view_draft_items' "
|
+ "AND p.grantedPrivilege = 'view_draft_items' "
|
||||||
+ "ORDER BY i.displayName";
|
+ "ORDER BY i.displayName";
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
@ -99,62 +101,63 @@ public class ContentItemPermissionTest {
|
||||||
@Deployment
|
@Deployment
|
||||||
public static WebArchive createDeployment() {
|
public static WebArchive createDeployment() {
|
||||||
return ShrinkWrap
|
return ShrinkWrap
|
||||||
.create(WebArchive.class,
|
.create(WebArchive.class,
|
||||||
"LibreCCM-org.librecms.contentsection.ContentItemPermissionTest.war")
|
"LibreCCM-org.librecms.contentsection.ContentItemPermissionTest.war").
|
||||||
.addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
|
addPackage(org.libreccm.auditing.CcmRevision.class.getPackage())
|
||||||
.addPackage(org.libreccm.categorization.Categorization.class
|
.addPackage(org.libreccm.categorization.Categorization.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
|
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage())
|
||||||
.addPackage(org.libreccm.configuration.Configuration.class
|
.addPackage(org.libreccm.configuration.Configuration.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.core.CcmCore.class.getPackage())
|
.addPackage(org.libreccm.core.CcmCore.class.getPackage())
|
||||||
.addPackage(org.libreccm.jpa.EntityManagerProducer.class
|
.addPackage(org.libreccm.jpa.EntityManagerProducer.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
|
.addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.l10n.LocalizedString.class
|
.addPackage(org.libreccm.l10n.LocalizedString.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.security.Permission.class.getPackage())
|
.addPackage(org.libreccm.security.Permission.class.getPackage())
|
||||||
.addPackage(org.libreccm.web.CcmApplication.class.getPackage())
|
.addPackage(org.libreccm.web.CcmApplication.class.getPackage())
|
||||||
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
|
.addPackage(org.libreccm.workflow.Workflow.class.getPackage())
|
||||||
.addPackage(com.arsdigita.bebop.Component.class.getPackage())
|
.addPackage(com.arsdigita.bebop.Component.class.getPackage())
|
||||||
.addPackage(com.arsdigita.bebop.util.BebopConstants.class
|
.addPackage(com.arsdigita.bebop.util.BebopConstants.class
|
||||||
.getPackage())
|
.getPackage())
|
||||||
.addClass(com.arsdigita.kernel.KernelConfig.class)
|
.addClass(com.arsdigita.kernel.KernelConfig.class)
|
||||||
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
|
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
|
||||||
.addClass(com.arsdigita.dispatcher.RequestContext.class)
|
.addClass(com.arsdigita.dispatcher.RequestContext.class)
|
||||||
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
|
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
|
||||||
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
|
.addClass(
|
||||||
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
|
com.arsdigita.cms.dispatcher.ContentItemDispatcher.class).
|
||||||
.addClass(
|
addClass(com.arsdigita.dispatcher.Dispatcher.class)
|
||||||
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
|
.addClass(
|
||||||
.addClass(
|
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class).
|
||||||
com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class)
|
addClass(
|
||||||
.addClass(
|
com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class).
|
||||||
com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
|
addClass(
|
||||||
.addClass(
|
com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class).
|
||||||
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
|
addClass(
|
||||||
.addClass(com.arsdigita.cms.dispatcher.ItemResolver.class)
|
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class).
|
||||||
.addClass(org.libreccm.portation.Portable.class)
|
addClass(com.arsdigita.cms.dispatcher.ItemResolver.class)
|
||||||
.addPackage(com.arsdigita.util.Lockable.class.getPackage())
|
.addClass(org.libreccm.portation.Portable.class)
|
||||||
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
|
.addPackage(com.arsdigita.util.Lockable.class.getPackage())
|
||||||
.addPackage(org.librecms.Cms.class.getPackage())
|
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
|
||||||
.addPackage(org.librecms.contentsection.Asset.class.getPackage())
|
.addPackage(org.librecms.Cms.class.getPackage())
|
||||||
.addPackage(org.librecms.contentsection.AttachmentList.class
|
.addPackage(org.librecms.contentsection.Asset.class.getPackage()).
|
||||||
.getPackage())
|
addPackage(org.librecms.contentsection.AttachmentList.class
|
||||||
.addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.librecms.contentsection.ContentSection.class
|
.addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
|
||||||
.getPackage())
|
.addPackage(org.librecms.contentsection.ContentSection.class
|
||||||
.addPackage(org.librecms.contenttypes.Article.class.getPackage())
|
.getPackage())
|
||||||
.addPackage(org.libreccm.tests.categories.IntegrationTest.class
|
.addPackage(org.librecms.contenttypes.Article.class.getPackage()).
|
||||||
.getPackage())
|
addPackage(org.libreccm.tests.categories.IntegrationTest.class
|
||||||
// .addAsLibraries(getModuleDependencies())
|
.getPackage())
|
||||||
.addAsLibraries(getCcmCoreDependencies())
|
// .addAsLibraries(getModuleDependencies())
|
||||||
.addAsResource("test-persistence.xml",
|
.addAsLibraries(getCcmCoreDependencies())
|
||||||
"META-INF/persistence.xml")
|
.addAsResource("test-persistence.xml",
|
||||||
.addAsResource("configs/shiro.ini", "shiro.ini")
|
"META-INF/persistence.xml")
|
||||||
.addAsWebInfResource("test-web.xml", "web.xml")
|
.addAsResource("configs/shiro.ini", "shiro.ini")
|
||||||
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
|
.addAsWebInfResource("test-web.xml", "web.xml")
|
||||||
|
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
@ -177,19 +180,19 @@ public class ContentItemPermissionTest {
|
||||||
@Test
|
@Test
|
||||||
@InSequence(100)
|
@InSequence(100)
|
||||||
@UsingDataSet("datasets/org/librecms/contentsection/"
|
@UsingDataSet("datasets/org/librecms/contentsection/"
|
||||||
+ "ContentItemPermissionTest/data.xml")
|
+ "ContentItemPermissionTest/data.xml")
|
||||||
public void accessByNoUser() {
|
public void accessByNoUser() {
|
||||||
final List<Role> roles;
|
final List<Role> roles;
|
||||||
if (shiro.getUser() == null) {
|
if (shiro.getUser() == null) {
|
||||||
roles = new ArrayList<>();
|
roles = new ArrayList<>();
|
||||||
} else {
|
} else {
|
||||||
roles = shiro.getUser().getRoleMemberships().stream()
|
roles = shiro.getUser().getRoleMemberships().stream()
|
||||||
.map(membership -> membership.getRole())
|
.map(membership -> membership.getRole())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
||||||
QUERY, ContentItem.class);
|
QUERY, ContentItem.class);
|
||||||
query.setParameter("roles", roles);
|
query.setParameter("roles", roles);
|
||||||
final List<ContentItem> result = query.getResultList();
|
final List<ContentItem> result = query.getResultList();
|
||||||
|
|
||||||
|
|
@ -199,19 +202,19 @@ public class ContentItemPermissionTest {
|
||||||
@Test
|
@Test
|
||||||
@InSequence(200)
|
@InSequence(200)
|
||||||
@UsingDataSet("datasets/org/librecms/contentsection/"
|
@UsingDataSet("datasets/org/librecms/contentsection/"
|
||||||
+ "ContentItemPermissionTest/data.xml")
|
+ "ContentItemPermissionTest/data.xml")
|
||||||
public void accessByUser1() {
|
public void accessByUser1() {
|
||||||
final UsernamePasswordToken token = new UsernamePasswordToken(
|
final UsernamePasswordToken token = new UsernamePasswordToken(
|
||||||
"user1@example.org", "foo123");
|
"user1@example.org", "foo123");
|
||||||
token.setRememberMe(true);
|
token.setRememberMe(true);
|
||||||
subject.login(token);
|
subject.login(token);
|
||||||
|
|
||||||
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
||||||
.map(membership -> membership.getRole())
|
.map(membership -> membership.getRole())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
||||||
QUERY, ContentItem.class);
|
QUERY, ContentItem.class);
|
||||||
query.setParameter("roles", roles);
|
query.setParameter("roles", roles);
|
||||||
final List<ContentItem> result = query.getResultList();
|
final List<ContentItem> result = query.getResultList();
|
||||||
|
|
||||||
|
|
@ -223,19 +226,19 @@ public class ContentItemPermissionTest {
|
||||||
@Test
|
@Test
|
||||||
@InSequence(300)
|
@InSequence(300)
|
||||||
@UsingDataSet("datasets/org/librecms/contentsection/"
|
@UsingDataSet("datasets/org/librecms/contentsection/"
|
||||||
+ "ContentItemPermissionTest/data.xml")
|
+ "ContentItemPermissionTest/data.xml")
|
||||||
public void accessByUser2() {
|
public void accessByUser2() {
|
||||||
final UsernamePasswordToken token = new UsernamePasswordToken(
|
final UsernamePasswordToken token = new UsernamePasswordToken(
|
||||||
"user2@example.org", "foo123");
|
"user2@example.org", "foo123");
|
||||||
token.setRememberMe(true);
|
token.setRememberMe(true);
|
||||||
subject.login(token);
|
subject.login(token);
|
||||||
|
|
||||||
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
||||||
.map(membership -> membership.getRole())
|
.map(membership -> membership.getRole())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
||||||
QUERY, ContentItem.class);
|
QUERY, ContentItem.class);
|
||||||
query.setParameter("roles", roles);
|
query.setParameter("roles", roles);
|
||||||
final List<ContentItem> result = query.getResultList();
|
final List<ContentItem> result = query.getResultList();
|
||||||
|
|
||||||
|
|
@ -246,19 +249,19 @@ public class ContentItemPermissionTest {
|
||||||
@Test
|
@Test
|
||||||
@InSequence(400)
|
@InSequence(400)
|
||||||
@UsingDataSet("datasets/org/librecms/contentsection/"
|
@UsingDataSet("datasets/org/librecms/contentsection/"
|
||||||
+ "ContentItemPermissionTest/data.xml")
|
+ "ContentItemPermissionTest/data.xml")
|
||||||
public void accessByUser3() {
|
public void accessByUser3() {
|
||||||
final UsernamePasswordToken token = new UsernamePasswordToken(
|
final UsernamePasswordToken token = new UsernamePasswordToken(
|
||||||
"user3@example.org", "foo123");
|
"user3@example.org", "foo123");
|
||||||
token.setRememberMe(true);
|
token.setRememberMe(true);
|
||||||
subject.login(token);
|
subject.login(token);
|
||||||
|
|
||||||
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
final List<Role> roles = shiro.getUser().getRoleMemberships().stream()
|
||||||
.map(membership -> membership.getRole())
|
.map(membership -> membership.getRole())
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
final TypedQuery<ContentItem> query = entityManager.createQuery(
|
||||||
QUERY, ContentItem.class);
|
QUERY, ContentItem.class);
|
||||||
query.setParameter("roles", roles);
|
query.setParameter("roles", roles);
|
||||||
final List<ContentItem> result = query.getResultList();
|
final List<ContentItem> result = query.getResultList();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,14 @@
|
||||||
*/
|
*/
|
||||||
package org.librecms.contentsection;
|
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.container.test.api.Deployment;
|
||||||
import org.jboss.arquillian.junit.Arquillian;
|
import org.jboss.arquillian.junit.Arquillian;
|
||||||
import org.jboss.arquillian.junit.InSequence;
|
import org.jboss.arquillian.junit.InSequence;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
import org.jboss.arquillian.persistence.CreateSchema;
|
import org.jboss.arquillian.persistence.CreateSchema;
|
||||||
import org.jboss.arquillian.persistence.PersistenceTest;
|
import org.jboss.arquillian.persistence.PersistenceTest;
|
||||||
import org.jboss.arquillian.persistence.ShouldMatchDataSet;
|
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.Article;
|
||||||
import org.librecms.contenttypes.News;
|
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.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
import static org.libreccm.testutils.DependenciesHelpers.*;
|
import static org.libreccm.testutils.DependenciesHelpers.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -62,6 +60,7 @@ import static org.libreccm.testutils.DependenciesHelpers.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentItemRepositoryTest {
|
public class ContentItemRepositoryTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@ import static org.junit.Assert.*;
|
||||||
import static org.libreccm.testutils.DependenciesHelpers.*;
|
import static org.libreccm.testutils.DependenciesHelpers.*;
|
||||||
|
|
||||||
import org.jboss.arquillian.container.test.api.ShouldThrowException;
|
import org.jboss.arquillian.container.test.api.ShouldThrowException;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
import org.libreccm.workflow.WorkflowTemplate;
|
import org.libreccm.workflow.WorkflowTemplate;
|
||||||
import org.libreccm.workflow.WorkflowTemplateRepository;
|
import org.libreccm.workflow.WorkflowTemplateRepository;
|
||||||
import org.librecms.contentsection.privileges.ItemPrivileges;
|
import org.librecms.contentsection.privileges.ItemPrivileges;
|
||||||
|
|
@ -74,6 +75,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentSectionManagerTest {
|
public class ContentSectionManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,7 @@ import java.util.List;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -62,6 +63,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ContentTypeRepositoryTest {
|
public class ContentTypeRepositoryTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -43,6 +43,7 @@ import org.junit.runner.RunWith;
|
||||||
import org.libreccm.tests.categories.IntegrationTest;
|
import org.libreccm.tests.categories.IntegrationTest;
|
||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -56,6 +57,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
@Transactional(TransactionMode.COMMIT)
|
@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class FolderManagerTest {
|
public class FolderManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ import java.util.Optional;
|
||||||
import javax.activation.MimeTypeParseException;
|
import javax.activation.MimeTypeParseException;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.persistence.EntityManager;
|
import javax.persistence.EntityManager;
|
||||||
|
import org.jboss.arquillian.persistence.CleanupUsingScript;
|
||||||
|
|
||||||
import static org.hamcrest.CoreMatchers.*;
|
import static org.hamcrest.CoreMatchers.*;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
|
|
@ -59,6 +60,7 @@ import static org.junit.Assert.*;
|
||||||
@PersistenceTest
|
@PersistenceTest
|
||||||
//@Transactional(TransactionMode.COMMIT)
|
//@Transactional(TransactionMode.COMMIT)
|
||||||
@CreateSchema({"create_ccm_cms_schema.sql"})
|
@CreateSchema({"create_ccm_cms_schema.sql"})
|
||||||
|
@CleanupUsingScript({"cleanup.sql"})
|
||||||
public class ItemAttachmentManagerTest {
|
public class ItemAttachmentManagerTest {
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@
|
||||||
Disable automatic cleanup, does not work because of referential
|
Disable automatic cleanup, does not work because of referential
|
||||||
integrity constrains.
|
integrity constrains.
|
||||||
-->
|
-->
|
||||||
<property name="defaultCleanupPhase">NONE</property>
|
<!--<property name="defaultCleanupPhase">NONE</property>-->
|
||||||
|
|
||||||
<property name="dumpData">true</property>
|
<property name="dumpData">true</property>
|
||||||
<property name="dumpDirectory">target</property>
|
<property name="dumpDirectory">target</property>
|
||||||
|
|
@ -32,9 +32,9 @@
|
||||||
<property name="qualifiedTableNames">true</property>
|
<property name="qualifiedTableNames">true</property>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<extension qualifier="persistence-script">
|
<!--<extension qualifier="persistence-script">
|
||||||
<property name="scriptsToExecuteAfterTest">scripts/h2-cleanup.sql</property>
|
<property name="scriptsToExecuteAfterTest">scripts/h2-cleanup.sql</property>
|
||||||
</extension>
|
</extension>-->
|
||||||
|
|
||||||
|
|
||||||
</arquillian>
|
</arquillian>
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
Disable automatic cleanup, does not work because of referential
|
Disable automatic cleanup, does not work because of referential
|
||||||
integrity constrains.
|
integrity constrains.
|
||||||
-->
|
-->
|
||||||
<property name="defaultCleanupPhase">NONE</property>
|
<!--<property name="defaultCleanupPhase">NONE</property>-->
|
||||||
|
|
||||||
<property name="dumpData">true</property>
|
<property name="dumpData">true</property>
|
||||||
<property name="dumpDirectory">target</property>
|
<property name="dumpDirectory">target</property>
|
||||||
|
|
@ -31,9 +31,9 @@
|
||||||
<property name="qualifiedTableNames">true</property>
|
<property name="qualifiedTableNames">true</property>
|
||||||
</extension>
|
</extension>
|
||||||
|
|
||||||
<extension qualifier="persistence-script">
|
<!--<extension qualifier="persistence-script">
|
||||||
<property name="scriptsToExecuteAfterTest">scripts/pgsql-cleanup.sql</property>
|
<property name="scriptsToExecuteAfterTest">scripts/pgsql-cleanup.sql</property>
|
||||||
</extension>
|
</extension>-->
|
||||||
|
|
||||||
|
|
||||||
</arquillian>
|
</arquillian>
|
||||||
|
|
|
||||||
|
|
@ -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;
|
||||||
|
|
||||||
Loading…
Reference in New Issue