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 253e1a326..798b49cc4 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
@@ -677,7 +677,9 @@ public class ContentItemManagerTest {
+ "ContentItemManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
public void publishItemNull() {
- itemManager.publish(null);
+ final ContentItem item = null;
+
+ itemManager.publish(item);
}
@Test(expected = IllegalArgumentException.class)
@@ -740,7 +742,8 @@ public class ContentItemManagerTest {
+ "ContentItemManagerTest/data.xml")
@ShouldThrowException(IllegalArgumentException.class)
public void unpublishItemNull() {
- itemManager.unpublish(null);
+ final ContentItem item = null;
+ itemManager.unpublish(item);
}
@Test
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
index f577216a0..5ee4fcf00 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -227,6 +282,9 @@
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
index cc96c26a0..ef2eff62b 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -207,11 +257,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -221,6 +279,10 @@
content_section_id="-1100" />
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 05ee7763c..3adb86207 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
@@ -4,6 +4,7 @@
+
+
+
-
+ workflow_id="-140" />
-
@@ -57,12 +62,13 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -230,11 +279,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -244,6 +301,10 @@
content_section_id="-1100" />
+
+
+
+
+
+ workflow_id="-140" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
index a408686f3..126a4e8bc 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
@@ -4,6 +4,7 @@
+
+
+
-
-
+
+ workflow_id="-140" />
-
-
@@ -64,15 +69,16 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -243,11 +292,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -257,6 +314,10 @@
content_section_id="-1100" />
+
+
+
+
+
+ workflow_id="-140" />
+ object_id="-10100"
+ localized_value="Article 1"
+ locale="en"
+ revtype="0" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
index 082ab7eae..c4a430eaf 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
+
@@ -197,11 +247,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -211,6 +269,10 @@
content_section_id="-1100" />
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
index 1bd38b4cb..3f7ed8723 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
@@ -3,6 +3,7 @@
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -197,6 +241,9 @@
+
@@ -206,11 +253,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -220,6 +275,10 @@
content_section_id="-1100" />
+
+
+
+
+
+ object_id="-99100"
+ localized_value="article1"
+ locale="en"
+ revtype="0" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
index e633d0449..a4c6d8e3e 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
@@ -209,12 +260,20 @@
type="DOCUMENTS_FOLDER" />
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
index 310c6af63..bbd48daa0 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ type="DOCUMENTS_FOLDER" />
+
+
+
@@ -213,6 +271,10 @@
content_section_id="-1100" />
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
index d270cf467..a152c2fe4 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
@@ -3,6 +3,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -197,11 +247,19 @@
type="DOCUMENTS_FOLDER" />
+
+
+
@@ -211,6 +269,10 @@
content_section_id="-1100" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-