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

CCM NG: Some changes to tests and datasets necessary due to the changes to workflow 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4446 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2016-11-18 20:45:38 +00:00
parent 45e2463de6
commit c12830e315
37 changed files with 253 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java
View File

@ -127,6 +127,10 @@ public class AssetManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

4
ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java
View File

@ -121,6 +121,10 @@ public class AssetRepositoryTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

6
ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java
View File

@ -18,7 +18,6 @@
*/
package org.librecms.contentsection;
import static org.libreccm.testutils.DependenciesHelpers.*;
import org.apache.shiro.subject.Subject;
@ -118,6 +117,10 @@ public class AttachmentListManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(
@ -741,5 +744,4 @@ public class AttachmentListManagerTest {
listManager.moveDown(list);
}
}

6
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java
View File

@ -115,6 +115,10 @@ public class ContentItemL10NManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(
@ -375,7 +379,7 @@ public class ContentItemL10NManagerTest {
/**
* Tries to normalise the languages of a content item by using null null
* null null null null null null null null null null {@link ContentItemL10NManager#normalizedLanguages(org.librecms.contentsection.ContentItem)
* null null null null null null null null null null null {@link ContentItemL10NManager#normalizedLanguages(org.librecms.contentsection.ContentItem)
*/
@Test
@InSequence(120)

6
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java
View File

@ -139,6 +139,10 @@ public class ContentItemManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(
@ -546,7 +550,7 @@ public class ContentItemManagerTest {
}
/**
* Verifies that {@link ContentItemManager#move(org.librecms.contentsection.ContentItem, org.librecms.contentsection.Folder)
* Verifies that null {@link ContentItemManager#move(org.librecms.contentsection.ContentItem, org.librecms.contentsection.Folder)
* throws an {@link IllegalArgumentException} if the type of the item to
* copy has not been registered in content section to which the target
* folder belongs.

4
ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java
View File

@ -115,6 +115,10 @@ public class ContentItemRepositoryTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

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

@ -51,7 +51,6 @@ import javax.inject.Inject;
import static org.hamcrest.CoreMatchers.*;
import static org.junit.Assert.*;
import static org.librecms.CmsConstants.*;
import static org.libreccm.testutils.DependenciesHelpers.*;
@ -146,6 +145,10 @@ public class ContentSectionManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

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

@ -118,6 +118,10 @@ public class ContentTypeRepositoryTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

4
ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java
View File

@ -109,6 +109,10 @@ public class FolderManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

8
ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java
View File

@ -28,8 +28,6 @@ import org.jboss.arquillian.persistence.CreateSchema;
import org.jboss.arquillian.persistence.PersistenceTest;
import org.jboss.arquillian.persistence.ShouldMatchDataSet;
import org.jboss.arquillian.persistence.UsingDataSet;
import org.jboss.arquillian.transaction.api.annotation.TransactionMode;
import org.jboss.arquillian.transaction.api.annotation.Transactional;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@ -41,11 +39,9 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.libreccm.security.Shiro;
import org.libreccm.tests.categories.IntegrationTest;
import org.librecms.assets.File;
import java.util.Optional;
import javax.activation.MimeType;
import javax.activation.MimeTypeParseException;
import javax.inject.Inject;
import javax.persistence.EntityManager;
@ -128,6 +124,10 @@ public class ItemAttachmentManagerTest {
.getPackage())
.addClass(com.arsdigita.kernel.KernelConfig.class)
.addClass(com.arsdigita.runtime.CCMResourceManager.class)
.addClass(com.arsdigita.dispatcher.RequestContext.class)
.addClass(com.arsdigita.dispatcher.AccessDeniedException.class)
.addClass(com.arsdigita.cms.dispatcher.ContentItemDispatcher.class)
.addClass(com.arsdigita.dispatcher.Dispatcher.class)
.addClass(
com.arsdigita.ui.admin.applications.AbstractAppInstanceForm.class)
.addClass(

7
ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql
View File

@ -1,3 +1,10 @@
drop schema if exists CCM_CMS;
drop schema if exists CCM_CORE;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CMS;
create schema CCM_CORE;
create table CCM_CMS.ARTICLE_TEXTS (
OBJECT_ID bigint not null,

7
ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql
View File

@ -1,3 +1,10 @@
drop schema if exists CCM_CMS cascade;
drop schema if exists CCM_CORE cascade;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CMS;
create schema CCM_CORE;
create table CCM_CMS.ARTICLE_TEXTS (
OBJECT_ID int8 not null,

7
ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql
View File

@ -1,3 +1,10 @@
drop schema if exists CCM_CMS;
drop schema if exists CCM_CORE;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CMS;
create schema CCM_CORE;
create table CCM_CMS.ARTICLE_TEXTS (
OBJECT_ID bigint not null,

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

19
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem-with-workflow.xml
View File

@ -2,13 +2,17 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflows workflow_id="-140"
uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e" />
uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -30,22 +34,21 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_tasks task_id="-140100"
uuid="438a742b-dc1f-42f4-8fb8-061fbed5b26b"
active="false"
task_state="waiting"
workflow_id="-140" />
<ccm_core.workflow_task_labels task_id="-100100"

20
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-create-contentitem.xml
View File

@ -2,13 +2,17 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflows workflow_id="-140"
uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e" />
uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -30,27 +34,25 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_tasks task_id="-140100"
uuid="75b64386-1df2-494a-bab8-2bab81f0ed45"
active="false"
task_state="waiting"
workflow_id="-140" />
<ccm_core.workflow_tasks task_id="-140200"
uuid="0a68c843-71e3-4e97-9a77-9427f6220cb1"
active="false"
task_state="waiting"
workflow_id="-140" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-publish.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-republish.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-unpublish.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

15
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/data.xml
View File

@ -2,11 +2,14 @@
<dataset>
<ccm_core.workflows workflow_id="-100"
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" />
uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc"
active="false" />
<ccm_core.workflows workflow_id="-110"
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" />
uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42"
active="false" />
<ccm_core.workflows workflow_id="-120"
uuid="017c6c19-db78-46f2-b771-dad2814319d3" />
uuid="017c6c19-db78-46f2-b771-dad2814319d3"
active="false" />
<ccm_core.workflow_names workflow_id="-100"
locale="en"
@ -25,17 +28,17 @@
<ccm_core.workflow_tasks task_id="-100100"
uuid="43db829c-7749-4ca9-8aba-241a9c2d00b3"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-100200"
uuid="9d6112af-abde-42d6-9c9b-06bb0b245158"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-100" />
<ccm_core.workflow_tasks task_id="-110100"
uuid="de4b5303-a445-457b-a52b-7ee2759ee3f7"
active="false"
task_state="waiting"
task_state="ENABLED"
workflow_id="-110" />
<ccm_core.workflow_task_labels task_id="-100100"

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-contenttype.xml
View File

@ -104,11 +104,14 @@
primary_url="info" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml
View File

@ -66,11 +66,14 @@
primary_url="info" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml
View File

@ -106,11 +106,14 @@
primary_url="test" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml
View File

@ -98,11 +98,14 @@
primary_url="info" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml
View File

@ -101,11 +101,14 @@
primary_url="info" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml
View File

@ -67,11 +67,14 @@
primary_url="content" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

9
ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml
View File

@ -101,11 +101,14 @@
primary_url="info" />
<ccm_core.workflows workflow_id="-14001"
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" />
uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52"
active="false" />
<ccm_core.workflows workflow_id="-14002"
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" />
uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7"
active="false" />
<ccm_core.workflows workflow_id="-14003"
uuid="3953c9be-f8ee-4015-9911-a560c762b052" />
uuid="3953c9be-f8ee-4015-9911-a560c762b052"
active="false" />
<ccm_core.workflow_templates workflow_id="-14001" />
<ccm_core.workflow_templates workflow_id="-14002" />

8
ccm-cms/src/test/resources/scripts/h2-cleanup.sql
View File

@ -62,8 +62,6 @@ DELETE FROM ccm_cms.content_type_descriptions;
DELETE FROM ccm_cms.content_types;
DELETE FROM ccm_cms.workflow_task_types;
DELETE FROM ccm_cms.workflow_tasks;
DELETE FROM ccm_core.workflow_descriptions;
@ -74,13 +72,13 @@ DELETE FROM ccm_core.workflow_task_dependencies;
DELETE FROM ccm_core.workflow_task_labels;
DELETE FROM ccm_core.task_assignments;
DELETE FROM ccm_core.workflow_task_assignments;
DELETE FROM ccm_core.workflow_user_tasks;
DELETE FROM ccm_core.workflow_assignable_tasks;
DELETE FROM ccm_core.workflow_tasks;
DELETE FROM ccm_core.workflow_tasks_descriptions;
DELETE FROM ccm_core.workflow_task_descriptions;
DELETE FROM ccm_cms.content_section_workflow_templates;

8
ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql
View File

@ -62,8 +62,6 @@ DELETE FROM ccm_cms.content_type_descriptions;
DELETE FROM ccm_cms.content_types;
DELETE FROM ccm_cms.workflow_task_types;
DELETE FROM ccm_cms.workflow_tasks;
DELETE FROM ccm_core.workflow_descriptions;
@ -74,13 +72,13 @@ DELETE FROM ccm_core.workflow_task_dependencies;
DELETE FROM ccm_core.workflow_task_labels;
DELETE FROM ccm_core.task_assignments;
DELETE FROM ccm_core.workflow_task_assignments;
DELETE FROM ccm_core.workflow_user_tasks;
DELETE FROM ccm_core.workflow_assignable_tasks;
DELETE FROM ccm_core.workflow_tasks;
DELETE FROM ccm_core.workflow_tasks_descriptions;
DELETE FROM ccm_core.workflow_task_descriptions;
DELETE FROM ccm_cms.content_section_workflow_templates;

9
ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java
View File

@ -42,8 +42,8 @@ import javax.persistence.TemporalType;
/**
* A task which can be assigned to a user. Also a {@code AssignableTask} can be
* locked by a user to indicate that the user is currently working on the
* object to which the workflow to which the task belongs is assigned.
* locked by a user to indicate that the user is currently working on the object
* to which the workflow to which the task belongs is assigned.
*
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/
@ -64,8 +64,9 @@ import javax.persistence.TemporalType;
@NamedQuery(
name = "AssignableTask.findAssignedTasks",
query = "SELECT t FROM AssignableTask t "
+ "WHERE t.assignments.role IN :roles "
+ "AND t.assignments.workflow = :workflow "
+ "JOIN t.assignments a "
+ "WHERE a.role IN :roles "
+ "AND t.workflow = :workflow "
+ "AND t.active = true")
,
@NamedQuery(

52
ccm-core/src/main/java/org/libreccm/workflow/Workflow.java
View File

@ -62,9 +62,9 @@ import org.libreccm.core.Identifiable;
@Inheritance(strategy = InheritanceType.JOINED)
@NamedQueries({
@NamedQuery(
name = "Workflow.findForObject",
query = "SELECT w FROM Workflow w "
+ "WHERE W.object = :object")
name = "Workflow.findForObject",
query = "SELECT w FROM Workflow w "
+ "WHERE W.object = :object")
})
public class Workflow implements Identifiable, Serializable {
@ -97,11 +97,11 @@ public class Workflow implements Identifiable, Serializable {
*/
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "WORKFLOW_NAMES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "WORKFLOW_ID")}))
name = "values",
joinTable = @JoinTable(name = "WORKFLOW_NAMES",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "WORKFLOW_ID")}))
private LocalizedString name;
/**
@ -109,12 +109,12 @@ public class Workflow implements Identifiable, Serializable {
*/
@Embedded
@AssociationOverride(
name = "values",
joinTable = @JoinTable(name = "WORKFLOW_DESCRIPTIONS",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "WORKFLOW_ID")
}))
name = "values",
joinTable = @JoinTable(name = "WORKFLOW_DESCRIPTIONS",
schema = DB_SCHEMA,
joinColumns = {
@JoinColumn(name = "WORKFLOW_ID")
}))
private LocalizedString description;
/**
@ -263,7 +263,6 @@ public class Workflow implements Identifiable, Serializable {
hash = 79 * hash + Objects.hashCode(state);
hash = 79 * hash + (active ? 1 : 0);
hash = 79 * hash + Objects.hashCode(tasksState);
hash = 79 * hash + Objects.hashCode(object);
return hash;
}
@ -304,12 +303,7 @@ public class Workflow implements Identifiable, Serializable {
return false;
}
if (!Objects.equals(tasksState, other.getTasksState())) {
return false;
}
return Objects.equals(object, other.getObject());
return Objects.equals(tasksState, other.getTasksState());
}
public boolean canEqual(final Object obj) {
@ -323,14 +317,13 @@ public class Workflow implements Identifiable, Serializable {
public String toString(final String data) {
return String.format("%s{ "
+ "workflowId = %d, "
+ "uuid = \"%s\", "
+ "name = \"%s\", "
+ "description = \"%s\", "
+ "state = \"%s\", "
+ "active = %b"
+ "object = \"%s\"%s"
+ " }",
+ "workflowId = %d, "
+ "uuid = \"%s\", "
+ "name = \"%s\", "
+ "description = \"%s\", "
+ "state = \"%s\", "
+ "active = %b%s"
+ " }",
super.toString(),
workflowId,
uuid,
@ -338,7 +331,6 @@ public class Workflow implements Identifiable, Serializable {
Objects.toString(description),
Objects.toString(state),
active,
Objects.toString(object),
data);
}

5
ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql
View File

@ -1,3 +1,8 @@
drop schema if exists CCM_CORE;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CORE;
create table CCM_CORE.APPLICATIONS (
APPLICATION_TYPE varchar(1024) not null,

5
ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql
View File

@ -1,3 +1,8 @@
drop schema if exists CCM_CORE cascade;
drop sequence if exists HIBERNATE_SEQUENCE;
create schema CCM_CORE;
create table CCM_CORE.APPLICATIONS (
APPLICATION_TYPE varchar(1024) not null,