From cb7309c5fa53a5c1b991faf5680ed52bf9d3f3d4 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 14 Sep 2016 14:38:42 +0000 Subject: [PATCH] CCM NG: Consolidated the datasets for the ContentItemManagerTest git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4303 8810af33-2d31-482b-a856-94f89814c4df --- .../ContentItemManagerTest.java | 28 +- .../librecms/contentsection/DatasetsTest.java | 7 +- ...ter.xml => after-copy-to-other-folder.xml} | 0 ...fter.xml => after-copy-to-same-folder.xml} | 0 ...after-create-contentitem-with-workflow.xml | 34 +- .../after-create-contentitem.xml | 24 +- .../{move-after.xml => after-move.xml} | 0 .../ContentItemManagerTest/data.xml | 24 +- .../ContentItemManagerTest/move-before.xml | 505 ------------------ 9 files changed, 91 insertions(+), 531 deletions(-) rename ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/{copy-to-other-folder-after.xml => after-copy-to-other-folder.xml} (100%) rename ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/{copy-to-same-folder-after.xml => after-copy-to-same-folder.xml} (100%) rename ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/{move-after.xml => after-move.xml} (100%) delete mode 100644 ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java index f6777a91b..5fc4ddc8a 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java @@ -458,10 +458,10 @@ public class ContentItemManagerTest { @Test @InSequence(3100) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet( value = "datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-after.xml", + + "ContentItemManagerTest/after-move.xml", excludeColumns = {"categorization_id", "lifecycle_id", "object_id", @@ -484,9 +484,9 @@ public class ContentItemManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(3200) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldThrowException(IllegalArgumentException.class) public void moveItemNull() { final Category targetFolder = categoryRepo.findById(-2120L); @@ -498,9 +498,9 @@ public class ContentItemManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(3200) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldThrowException(IllegalArgumentException.class) public void moveItemFolderNull() { final Optional item = itemRepo.findById(-10100L); @@ -512,10 +512,10 @@ public class ContentItemManagerTest { @Test @InSequence(4100) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet( value = "datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/copy-to-other-folder-after.xml", + + "ContentItemManagerTest/after-copy-to-other-folder.xml", excludeColumns = {"categorization_id", "lifecycle_id", "object_id", @@ -538,10 +538,10 @@ public class ContentItemManagerTest { @Test @InSequence(4200) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet( value = "datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/copy-to-same-folder-after.xml", + + "ContentItemManagerTest/after-copy-to-same-folder.xml", excludeColumns = {"categorization_id", "lifecycle_id", "object_id", @@ -564,10 +564,10 @@ public class ContentItemManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(4100) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet( value = "datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldThrowException(IllegalArgumentException.class) public void copyItemNull() { final Category targetFolder = categoryRepo.findById(-2120L); @@ -579,10 +579,10 @@ public class ContentItemManagerTest { @Test(expected = IllegalArgumentException.class) @InSequence(4100) @UsingDataSet("datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldMatchDataSet( value = "datasets/org/librecms/contentsection/" - + "ContentItemManagerTest/move-before.xml") + + "ContentItemManagerTest/data.xml") @ShouldThrowException(IllegalArgumentException.class) public void copyItemToFolderNull() { final Optional item = itemRepo.findById(-10100L); diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java index 24c4714a3..52f2b3eb3 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/DatasetsTest.java @@ -54,10 +54,9 @@ public class DatasetsTest extends DatasetsVerifier { "/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml", "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml", "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml", - "/datasets/org/librecms/contentsection/ContentItemManagerTest/move-before.xml", - "/datasets/org/librecms/contentsection/ContentItemManagerTest/move-after.xml", - "/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml", - "/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml"}); + "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml", + "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml", + "/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml"}); } public DatasetsTest(final String datasetPath) { diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml similarity index 100% rename from ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-other-folder-after.xml rename to ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml similarity index 100% rename from ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/copy-to-same-folder-after.xml rename to ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml index d19e69256..b99c95878 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml @@ -99,9 +99,9 @@ finished="false" definition_id="-210" /> - --> +--> + + @@ -141,6 +147,22 @@ visible="true" abstract_category="false" category_order="1" /> + + + locale="en" + localized_value="new-article" />--> + + @@ -154,6 +160,22 @@ visible="true" abstract_category="false" category_order="1" /> + + + + @@ -115,6 +121,22 @@ visible="true" abstract_category="false" category_order="1" /> + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -