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

CCM NG/ccm-cms: Fixes more test failures 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4713 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: bd1ff6d18a
pull/2/head
jensp 2017-05-08 18:04:21 +00:00
parent d302d5f976
commit 1cd656cc7c
2 changed files with 62 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ccm-cms/src/main/java/org/librecms/contentsection/ContentTypeRepository.java
View File

@ -21,14 +21,12 @@ package org.librecms.contentsection;
import org.libreccm.core.AbstractEntityRepository; import org.libreccm.core.AbstractEntityRepository;
import org.libreccm.security.AuthorizationRequired; import org.libreccm.security.AuthorizationRequired;
import org.libreccm.security.RequiresPrivilege; import org.libreccm.security.RequiresPrivilege;
import org.librecms.CmsConstants;
import org.librecms.contentsection.privileges.AdminPrivileges; import org.librecms.contentsection.privileges.AdminPrivileges;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.persistence.TypedQuery; import javax.persistence.TypedQuery;
import javax.transaction.Transactional; import javax.transaction.Transactional;
@ -40,9 +38,6 @@ import javax.transaction.Transactional;
public class ContentTypeRepository public class ContentTypeRepository
extends AbstractEntityRepository<Long, ContentType> { extends AbstractEntityRepository<Long, ContentType> {
@Inject
private ContentItemRepository itemRepo;
@Override @Override
public Class<ContentType> getEntityClass() { public Class<ContentType> getEntityClass() {
return ContentType.class; return ContentType.class;

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

@ -49,8 +49,10 @@ 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.jboss.arquillian.persistence.CleanupUsingScript;
import org.jboss.arquillian.persistence.TestExecutionPhase; import org.jboss.arquillian.persistence.TestExecutionPhase;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -101,61 +103,72 @@ public class ContentTypeRepositoryTest {
return ShrinkWrap return ShrinkWrap
.create(WebArchive.class, .create(WebArchive.class,
"LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war") "LibreCCM-org.librecms.contentsection.ContentTypeRepositoryTest.war")
.addPackage(org.libreccm.auditing.CcmRevision.class.getPackage()) .addClass(org.libreccm.categorization.Categorization.class)
.addPackage(org.libreccm.categorization.Categorization.class .addClass(org.libreccm.categorization.Category.class)
.getPackage()) .addClass(org.libreccm.categorization.Domain.class)
.addPackage(org.libreccm.cdi.utils.CdiUtil.class.getPackage()) .addClass(org.libreccm.categorization.DomainOwnership.class)
.addPackage(org.libreccm.configuration.Configuration.class .addClass(org.libreccm.core.AbstractEntityRepository.class)
.getPackage()) .addClass(org.libreccm.core.CcmObject.class)
.addPackage(org.libreccm.core.CcmCore.class.getPackage()) .addClass(org.libreccm.core.EmailAddress.class)
.addPackage(org.libreccm.jpa.EntityManagerProducer.class .addClass(org.libreccm.core.Identifiable.class)
.getPackage()) .addClass(org.libreccm.core.Resource.class)
.addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class .addClass(org.libreccm.core.ResourceType.class)
.getPackage()) .addClass(org.libreccm.jpa.EntityManagerProducer.class)
.addPackage(org.libreccm.l10n.LocalizedString.class .addClass(org.libreccm.l10n.LocalizedString.class)
.getPackage())
.addClass(org.libreccm.portation.Portable.class) .addClass(org.libreccm.portation.Portable.class)
.addPackage(org.libreccm.security.Permission.class.getPackage()) .addClass(org.libreccm.security.AuthorizationRequired.class)
.addPackage(org.libreccm.web.CcmApplication.class.getPackage()) .addClass(org.libreccm.security.CcmShiroRealm.class)
.addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addClass(org.libreccm.security.Group.class)
.addPackage(com.arsdigita.bebop.Component.class.getPackage()) .addClass(org.libreccm.security.GroupMembership.class)
.addPackage(com.arsdigita.bebop.util.BebopConstants.class .addClass(org.libreccm.security.Party.class)
.getPackage()) .addClass(org.libreccm.security.Permission.class)
.addClass(com.arsdigita.kernel.KernelConfig.class) .addClass(org.libreccm.security.RecursivePermissions.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class) .addClass(org.libreccm.security.Relation.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class) .addClass(org.libreccm.security.RequiresPrivilege.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class) .addClass(org.libreccm.security.Role.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class) .addClass(org.libreccm.security.RoleMembership.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class) .addClass(org.libreccm.security.Shiro.class)
.addClass( .addClass(org.libreccm.security.User.class)
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class) .addClass(org.libreccm.security.UserRepository.class)
.addClass( .addClass(org.libreccm.tests.categories.IntegrationTest.class)
com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class) .addClass(org.libreccm.web.CcmApplication.class)
.addClass( .addClass(org.libreccm.workflow.AssignableTask.class)
com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class) .addClass(org.libreccm.workflow.Task.class)
.addClass( .addClass(org.libreccm.workflow.TaskAssignment.class)
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class) .addClass(org.libreccm.workflow.TaskComment.class)
.addClass(org.librecms.dispatcher.ItemResolver.class) .addClass(org.libreccm.workflow.TaskState.class)
.addPackage(com.arsdigita.util.Lockable.class.getPackage()) .addClass(org.libreccm.workflow.Workflow.class)
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) .addClass(org.libreccm.workflow.WorkflowState.class)
.addPackage(org.librecms.Cms.class.getPackage()) .addClass(org.libreccm.workflow.WorkflowTemplate.class)
.addPackage(org.librecms.contentsection.Asset.class.getPackage()) .addClass(org.librecms.CmsConstants.class)
.addPackage(org.librecms.contentsection.AttachmentList.class .addClass(org.librecms.contentsection.Asset.class)
.getPackage()) .addClass(org.librecms.contentsection.AttachmentList.class)
.addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage()) .addClass(org.librecms.contentsection.ContentItem.class)
.addPackage(org.librecms.contentsection.ContentSection.class .addClass(org.librecms.contentsection.ContentItemVersion.class)
.getPackage()) .addClass(org.librecms.contentsection.ContentSection.class)
.addPackage(org.librecms.contenttypes.Article.class.getPackage()) .addClass(org.librecms.contentsection.ContentSectionRepository.class)
.addPackage(org.libreccm.tests.categories.IntegrationTest.class .addClass(org.librecms.contentsection.ContentType.class)
.getPackage()) .addClass(org.librecms.contentsection.ContentTypeMode.class)
// .addAsLibraries(getModuleDependencies()) .addClass(org.librecms.contentsection.ContentTypeRepository.class)
.addClass(org.librecms.contentsection.Folder.class)
.addClass(org.librecms.contentsection.FolderType.class)
.addClass(org.librecms.contentsection.ItemAttachment.class)
.addClass(org.librecms.contenttypes.Article.class)
.addClass(org.librecms.contenttypes.AuthoringKit.class)
.addClass(org.librecms.contenttypes.AuthoringStep.class)
.addClass(org.librecms.contenttypes.ContentTypeDescription.class)
.addClass(org.librecms.contenttypes.Event.class)
.addClass(org.librecms.contenttypes.News.class)
.addClass(org.librecms.lifecycle.Lifecycle.class)
.addClass(org.librecms.lifecycle.LifecycleDefinition.class)
.addClass(org.librecms.lifecycle.Phase.class)
.addClass(org.librecms.lifecycle.PhaseDefinition.class)
.addAsLibraries(getCcmCoreDependencies()) .addAsLibraries(getCcmCoreDependencies())
.addAsResource("test-persistence.xml", .addAsResource("test-persistence.xml",
"META-INF/persistence.xml") "META-INF/persistence.xml")
.addAsWebInfResource("test-web.xml", "web.xml") .addAsWebInfResource("test-web.xml", "web.xml")
.addAsResource("configs/shiro.ini", "shiro.ini") .addAsResource("configs/shiro.ini", "shiro.ini")
.addAsResource("META-INF/beans.xml", "META-INF/beans.xml"); .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
//.addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml");
} }
/** /**