From d8afacc16c81a64655f43c51c08824b2d2f81e4c Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 13 Sep 2016 09:54:36 +0000 Subject: [PATCH] CCM NG: ContentSectionManagerTest dependencies fixed git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4296 8810af33-2d31-482b-a856-94f89814c4df --- .../ContentSectionManagerTest.java | 173 +++++++++--------- 1 file changed, 89 insertions(+), 84 deletions(-) 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 da6cfaabf..ad29d89b7 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java @@ -109,21 +109,21 @@ public class ContentSectionManagerTest { @Deployment public static WebArchive createDeployment() { final PomEquippedResolveStage pom = Maven - .resolver() - .loadPomFromFile("pom.xml"); + .resolver() + .loadPomFromFile("pom.xml"); final PomEquippedResolveStage dependencies = pom - .importCompileAndRuntimeDependencies(); + .importCompileAndRuntimeDependencies(); dependencies.addDependency(MavenDependencies.createDependency( - "org.libreccm:ccm-core", ScopeType.RUNTIME, false)); + "org.libreccm:ccm-core", ScopeType.RUNTIME, false)); dependencies.addDependency(MavenDependencies.createDependency( - "org.libreccm:ccm-testutils", ScopeType.RUNTIME, false)); + "org.libreccm:ccm-testutils", ScopeType.RUNTIME, false)); dependencies.addDependency(MavenDependencies.createDependency( - "net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false)); + "net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false)); dependencies.addDependency(MavenDependencies.createDependency( - "org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven", - ScopeType.RUNTIME, false)); + "org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven", + ScopeType.RUNTIME, false)); final File[] libsWithCcmCore = dependencies.resolve().withTransitivity() - .asFile(); + .asFile(); final List libsList = new ArrayList<>(libsWithCcmCore.length - 1); IntStream.range(0, libsWithCcmCore.length).forEach(i -> { @@ -140,47 +140,52 @@ public class ContentSectionManagerTest { } return ShrinkWrap - .create(WebArchive.class, - "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.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.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.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) - .addPackage(com.arsdigita.util.Lockable.class.getPackage()) - .addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) - .addPackage(org.librecms.Cms.class.getPackage()) - .addPackage(org.librecms.assets.Asset.class.getPackage()) - .addPackage(org.librecms.attachments.AttachmentList.class - .getPackage()) - .addPackage(ContentSection.class.getPackage()) - .addAsLibraries(libs) - .addAsResource("test-persistence.xml", - "META-INF/persistence.xml") - .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml") - .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); + .create(WebArchive.class, + "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.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.l10n.LocalizedString.class + .getPackage()) + .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.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.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) + .addPackage(com.arsdigita.cms.dispatcher.ItemResolver.class. + getPackage()) + .addPackage(com.arsdigita.util.Lockable.class.getPackage()) + .addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) + .addPackage(org.librecms.Cms.class.getPackage()) + .addPackage(org.librecms.assets.Asset.class.getPackage()) + .addPackage(org.librecms.attachments.AttachmentList.class + .getPackage()) + .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage()) + .addPackage(ContentSection.class.getPackage()) + .addAsLibraries(libs) + .addAsResource("test-persistence.xml", + "META-INF/persistence.xml") + .addAsWebInfResource("test-web.xml", "WEB-INF/web.xml") + .addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); } @Test @@ -203,21 +208,21 @@ public class ContentSectionManagerTest { @Test @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/data.xml") + + "ContentSectionManagerTest/data.xml") @ShouldMatchDataSet( - value = "datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/after-create.xml", - excludeColumns = {"object_id", - "root_assets_folder_id", - "root_documents_folder_id", - "permission_id", - "role_id", - "grantee_id", - "unique_id", - "uuid", - "created", - "section_id", - "creation_date"}) + value = "datasets/org/librecms/contentsection/" + + "ContentSectionManagerTest/after-create.xml", + excludeColumns = {"object_id", + "root_assets_folder_id", + "root_documents_folder_id", + "permission_id", + "role_id", + "grantee_id", + "unique_id", + "uuid", + "created", + "section_id", + "creation_date"}) @InSequence(100) public void createSection() { manager.createContentSection("test"); @@ -225,11 +230,11 @@ public class ContentSectionManagerTest { @Test @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/data.xml") + + "ContentSectionManagerTest/data.xml") @ShouldMatchDataSet( - value = "datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/after-rename.xml", - excludeColumns = {"object_id"}) + value = "datasets/org/librecms/contentsection/" + + "ContentSectionManagerTest/after-rename.xml", + excludeColumns = {"object_id"}) @InSequence(200) public void renameSection() { final ContentSection section = repository.findByLabel("info"); @@ -237,9 +242,9 @@ public class ContentSectionManagerTest { manager.renameContentSection(section, "content"); final KernelConfig kernelConfig = confManager.findConfiguration( - KernelConfig.class); + KernelConfig.class); final Locale defaultLocale = new Locale(kernelConfig - .getDefaultLanguage()); + .getDefaultLanguage()); section.getTitle().addValue(defaultLocale, "content"); repository.save(section); @@ -247,12 +252,12 @@ public class ContentSectionManagerTest { section.getRootDocumentsFolder().setName("content_root"); section.getRootDocumentsFolder().setDisplayName("content_root"); section.getRootDocumentsFolder().getTitle().addValue( - defaultLocale, "content_root"); + defaultLocale, "content_root"); section.getRootAssetsFolder().setName("content_assets"); section.getRootAssetsFolder().setDisplayName("content_assets"); section.getRootAssetsFolder().getTitle().addValue( - defaultLocale, "content_assets"); + defaultLocale, "content_assets"); categoryRepo.save(section.getRootDocumentsFolder()); categoryRepo.save(section.getRootAssetsFolder()); @@ -260,15 +265,15 @@ public class ContentSectionManagerTest { @Test @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/data.xml") + + "ContentSectionManagerTest/data.xml") @ShouldMatchDataSet( - value = "datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/after-add-role.xml", - excludeColumns = {"object_id", - "role_id", - "permission_id", - "creation_date", - "grantee_id"}) + value = "datasets/org/librecms/contentsection/" + + "ContentSectionManagerTest/after-add-role.xml", + excludeColumns = {"object_id", + "role_id", + "permission_id", + "creation_date", + "grantee_id"}) @InSequence(300) public void addRole() { final ContentSection section = repository.findByLabel("info"); @@ -282,11 +287,11 @@ public class ContentSectionManagerTest { @Test @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/data.xml") + + "ContentSectionManagerTest/data.xml") @ShouldMatchDataSet( - value = "datasets/org/librecms/contentsection/" - + "ContentSectionManagerTest/after-remove-role.xml", - excludeColumns = {"object_id"}) + value = "datasets/org/librecms/contentsection/" + + "ContentSectionManagerTest/after-remove-role.xml", + excludeColumns = {"object_id"}) @InSequence(300) public void removeRole() { final ContentSection section = repository.findByLabel("info");