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

CCM NG: ContentSectionManagerTest dependencies fixed 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4296 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-09-13 09:54:36 +00:00
parent df09ad3f5c
commit d8afacc16c
1 changed files with 89 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,21 +109,21 @@ public class ContentSectionManagerTest {
@Deployment @Deployment
public static WebArchive createDeployment() { public static WebArchive createDeployment() {
final PomEquippedResolveStage pom = Maven final PomEquippedResolveStage pom = Maven
.resolver() .resolver()
.loadPomFromFile("pom.xml"); .loadPomFromFile("pom.xml");
final PomEquippedResolveStage dependencies = pom final PomEquippedResolveStage dependencies = pom
.importCompileAndRuntimeDependencies(); .importCompileAndRuntimeDependencies();
dependencies.addDependency(MavenDependencies.createDependency( dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-core", ScopeType.RUNTIME, false)); "org.libreccm:ccm-core", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency( dependencies.addDependency(MavenDependencies.createDependency(
"org.libreccm:ccm-testutils", ScopeType.RUNTIME, false)); "org.libreccm:ccm-testutils", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency( dependencies.addDependency(MavenDependencies.createDependency(
"net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false)); "net.sf.saxon:Saxon-HE", ScopeType.RUNTIME, false));
dependencies.addDependency(MavenDependencies.createDependency( dependencies.addDependency(MavenDependencies.createDependency(
"org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven", "org.jboss.shrinkwrap.resolver:shrinkwrap-resolver-impl-maven",
ScopeType.RUNTIME, false)); ScopeType.RUNTIME, false));
final File[] libsWithCcmCore = dependencies.resolve().withTransitivity() final File[] libsWithCcmCore = dependencies.resolve().withTransitivity()
.asFile(); .asFile();
final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1); final List<File> libsList = new ArrayList<>(libsWithCcmCore.length - 1);
IntStream.range(0, libsWithCcmCore.length).forEach(i -> { IntStream.range(0, libsWithCcmCore.length).forEach(i -> {
@ -140,47 +140,52 @@ public class ContentSectionManagerTest {
} }
return ShrinkWrap return ShrinkWrap
.create(WebArchive.class, .create(WebArchive.class,
"LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.war") "LibreCCM-org.libreccm.cms.contentsection.ContentSectionManagerTest.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.l10n.LocalizedString.class .addPackage(org.libreccm.l10n.LocalizedString.class
.getPackage()) .getPackage())
.addPackage(org.libreccm.security.Permission.class.getPackage()) .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class.
.addPackage(org.libreccm.web.CcmApplication.class.getPackage()) getPackage())
.addPackage(org.libreccm.workflow.Workflow.class.getPackage()) .addPackage(org.libreccm.security.Permission.class.getPackage())
.addPackage(com.arsdigita.bebop.Component.class.getPackage()) .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
.addPackage(com.arsdigita.bebop.util.BebopConstants.class .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
.getPackage()) .addPackage(com.arsdigita.bebop.Component.class.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class) .addPackage(com.arsdigita.bebop.util.BebopConstants.class
.addClass(com.arsdigita.runtime.CCMResourceManager.class) .getPackage())
.addClass( .addClass(com.arsdigita.kernel.KernelConfig.class)
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class) .addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass( .addClass(
com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class) com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass( .addClass(
com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class) com.arsdigita.ui.admin.applications.AbstractAppSettingsPane.class)
.addClass( .addClass(
com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class) com.arsdigita.ui.admin.applications.DefaultApplicationInstanceForm.class)
.addPackage(com.arsdigita.util.Lockable.class.getPackage()) .addClass(
.addPackage(com.arsdigita.web.BaseServlet.class.getPackage()) com.arsdigita.ui.admin.applications.DefaultApplicationSettingsPane.class)
.addPackage(org.librecms.Cms.class.getPackage()) .addPackage(com.arsdigita.cms.dispatcher.ItemResolver.class.
.addPackage(org.librecms.assets.Asset.class.getPackage()) getPackage())
.addPackage(org.librecms.attachments.AttachmentList.class .addPackage(com.arsdigita.util.Lockable.class.getPackage())
.getPackage()) .addPackage(com.arsdigita.web.BaseServlet.class.getPackage())
.addPackage(ContentSection.class.getPackage()) .addPackage(org.librecms.Cms.class.getPackage())
.addAsLibraries(libs) .addPackage(org.librecms.assets.Asset.class.getPackage())
.addAsResource("test-persistence.xml", .addPackage(org.librecms.attachments.AttachmentList.class
"META-INF/persistence.xml") .getPackage())
.addAsWebInfResource("test-web.xml", "WEB-INF/web.xml") .addPackage(org.librecms.lifecycle.Lifecycle.class.getPackage())
.addAsWebInfResource(EmptyAsset.INSTANCE, "WEB-INF/beans.xml"); .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 @Test
@ -203,21 +208,21 @@ public class ContentSectionManagerTest {
@Test @Test
@UsingDataSet("datasets/org/librecms/contentsection/" @UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/data.xml") + "ContentSectionManagerTest/data.xml")
@ShouldMatchDataSet( @ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/" value = "datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/after-create.xml", + "ContentSectionManagerTest/after-create.xml",
excludeColumns = {"object_id", excludeColumns = {"object_id",
"root_assets_folder_id", "root_assets_folder_id",
"root_documents_folder_id", "root_documents_folder_id",
"permission_id", "permission_id",
"role_id", "role_id",
"grantee_id", "grantee_id",
"unique_id", "unique_id",
"uuid", "uuid",
"created", "created",
"section_id", "section_id",
"creation_date"}) "creation_date"})
@InSequence(100) @InSequence(100)
public void createSection() { public void createSection() {
manager.createContentSection("test"); manager.createContentSection("test");
@ -225,11 +230,11 @@ public class ContentSectionManagerTest {
@Test @Test
@UsingDataSet("datasets/org/librecms/contentsection/" @UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/data.xml") + "ContentSectionManagerTest/data.xml")
@ShouldMatchDataSet( @ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/" value = "datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/after-rename.xml", + "ContentSectionManagerTest/after-rename.xml",
excludeColumns = {"object_id"}) excludeColumns = {"object_id"})
@InSequence(200) @InSequence(200)
public void renameSection() { public void renameSection() {
final ContentSection section = repository.findByLabel("info"); final ContentSection section = repository.findByLabel("info");
@ -237,9 +242,9 @@ public class ContentSectionManagerTest {
manager.renameContentSection(section, "content"); manager.renameContentSection(section, "content");
final KernelConfig kernelConfig = confManager.findConfiguration( final KernelConfig kernelConfig = confManager.findConfiguration(
KernelConfig.class); KernelConfig.class);
final Locale defaultLocale = new Locale(kernelConfig final Locale defaultLocale = new Locale(kernelConfig
.getDefaultLanguage()); .getDefaultLanguage());
section.getTitle().addValue(defaultLocale, "content"); section.getTitle().addValue(defaultLocale, "content");
repository.save(section); repository.save(section);
@ -247,12 +252,12 @@ public class ContentSectionManagerTest {
section.getRootDocumentsFolder().setName("content_root"); section.getRootDocumentsFolder().setName("content_root");
section.getRootDocumentsFolder().setDisplayName("content_root"); section.getRootDocumentsFolder().setDisplayName("content_root");
section.getRootDocumentsFolder().getTitle().addValue( section.getRootDocumentsFolder().getTitle().addValue(
defaultLocale, "content_root"); defaultLocale, "content_root");
section.getRootAssetsFolder().setName("content_assets"); section.getRootAssetsFolder().setName("content_assets");
section.getRootAssetsFolder().setDisplayName("content_assets"); section.getRootAssetsFolder().setDisplayName("content_assets");
section.getRootAssetsFolder().getTitle().addValue( section.getRootAssetsFolder().getTitle().addValue(
defaultLocale, "content_assets"); defaultLocale, "content_assets");
categoryRepo.save(section.getRootDocumentsFolder()); categoryRepo.save(section.getRootDocumentsFolder());
categoryRepo.save(section.getRootAssetsFolder()); categoryRepo.save(section.getRootAssetsFolder());
@ -260,15 +265,15 @@ public class ContentSectionManagerTest {
@Test @Test
@UsingDataSet("datasets/org/librecms/contentsection/" @UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/data.xml") + "ContentSectionManagerTest/data.xml")
@ShouldMatchDataSet( @ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/" value = "datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/after-add-role.xml", + "ContentSectionManagerTest/after-add-role.xml",
excludeColumns = {"object_id", excludeColumns = {"object_id",
"role_id", "role_id",
"permission_id", "permission_id",
"creation_date", "creation_date",
"grantee_id"}) "grantee_id"})
@InSequence(300) @InSequence(300)
public void addRole() { public void addRole() {
final ContentSection section = repository.findByLabel("info"); final ContentSection section = repository.findByLabel("info");
@ -282,11 +287,11 @@ public class ContentSectionManagerTest {
@Test @Test
@UsingDataSet("datasets/org/librecms/contentsection/" @UsingDataSet("datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/data.xml") + "ContentSectionManagerTest/data.xml")
@ShouldMatchDataSet( @ShouldMatchDataSet(
value = "datasets/org/librecms/contentsection/" value = "datasets/org/librecms/contentsection/"
+ "ContentSectionManagerTest/after-remove-role.xml", + "ContentSectionManagerTest/after-remove-role.xml",
excludeColumns = {"object_id"}) excludeColumns = {"object_id"})
@InSequence(300) @InSequence(300)
public void removeRole() { public void removeRole() {
final ContentSection section = repository.findByLabel("info"); final ContentSection section = repository.findByLabel("info");