From c12830e315bd11510623f9fc7560d220ed125dc1 Mon Sep 17 00:00:00 2001 From: jensp Date: Fri, 18 Nov 2016 20:45:38 +0000 Subject: [PATCH] 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 --- .../contentsection/AssetManagerTest.java | 4 ++ .../contentsection/AssetRepositoryTest.java | 4 ++ .../AttachmentListManagerTest.java | 6 ++- .../ContentItemL10NManagerTest.java | 6 ++- .../ContentItemManagerTest.java | 6 ++- .../ContentItemRepositoryTest.java | 4 ++ .../ContentSectionManagerTest.java | 5 +- .../ContentTypeRepositoryTest.java | 4 ++ .../contentsection/FolderManagerTest.java | 4 ++ .../ItemAttachmentManagerTest.java | 8 +-- .../scripts/create_ccm_cms_schema.sql | 7 +++ .../scripts/create_ccm_cms_schema.sql | 7 +++ .../datasets/create_ccm_cms_schema.sql | 7 +++ .../after-copy-to-folder-in-other-section.xml | 15 +++--- .../after-copy-to-other-folder.xml | 15 +++--- .../after-copy-to-same-folder.xml | 15 +++--- ...after-create-contentitem-with-workflow.xml | 19 ++++--- .../after-create-contentitem.xml | 20 +++---- .../after-move-to-other-section.xml | 15 +++--- .../ContentItemManagerTest/after-move.xml | 15 +++--- .../ContentItemManagerTest/after-publish.xml | 15 +++--- .../after-republish.xml | 15 +++--- .../after-unpublish.xml | 15 +++--- .../ContentItemManagerTest/data.xml | 15 +++--- .../after-add-contenttype.xml | 9 ++-- .../after-add-role.xml | 9 ++-- .../after-create.xml | 9 ++-- .../after-remove-contenttype.xml | 9 ++-- .../after-remove-role.xml | 9 ++-- .../after-rename.xml | 9 ++-- .../ContentSectionManagerTest/data.xml | 9 ++-- .../src/test/resources/scripts/h2-cleanup.sql | 8 ++- .../test/resources/scripts/pgsql-cleanup.sql | 8 ++- .../org/libreccm/workflow/AssignableTask.java | 13 ++--- .../java/org/libreccm/workflow/Workflow.java | 52 ++++++++----------- .../scripts/create_ccm_core_schema.sql | 5 ++ .../scripts/create_ccm_core_schema.sql | 5 ++ 37 files changed, 253 insertions(+), 147 deletions(-) diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java index f6f5f3bf9..56f5d05e2 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java @@ -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( diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java index 15e6d1036..86f277bc8 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetRepositoryTest.java @@ -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( diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java index 88ce30ffc..2ea571727 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentListManagerTest.java @@ -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); } - } diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java index 0f78f61e5..9a7e8d259 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemL10NManagerTest.java @@ -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) 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 e591a1829..e92f0b689 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemManagerTest.java @@ -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. diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java index 192de924b..441598789 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentItemRepositoryTest.java @@ -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( 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 f383434de..32598390e 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java @@ -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( diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java index 8a63587b2..f7b771d99 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java @@ -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( diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java index fc09ba826..7a698c29e 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/FolderManagerTest.java @@ -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( diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java index 26a41927c..e3a6bbad8 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ItemAttachmentManagerTest.java @@ -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( diff --git a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql index a34bfaa07..e4cf643d3 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_cms_schema.sql @@ -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, diff --git a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql index 075b01aa7..3d9a91467 100644 --- a/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql +++ b/ccm-cms/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_cms_schema.sql @@ -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, diff --git a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql index a34bfaa07..e4cf643d3 100644 --- a/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql +++ b/ccm-cms/src/test/resources/datasets/create_ccm_cms_schema.sql @@ -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, diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml index b0622eac8..9bbff0b53 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml @@ -2,11 +2,14 @@ + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="c6e317a1-88d5-48ab-8896-304d4c8d1f3e" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="1d86f6ab-2d6c-4b59-83c1-c6b4bdd1d3dc" + active="false" /> + uuid="feaf9c06-62f9-4e83-acc5-d18fd5e69d42" + active="false" /> + uuid="017c6c19-db78-46f2-b771-dad2814319d3" + active="false" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml index 831b5f190..384204165 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-add-role.xml @@ -66,11 +66,14 @@ primary_url="info" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml index b71af127d..e6f79bef9 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-create.xml @@ -106,11 +106,14 @@ primary_url="test" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml index db22f5b61..31433fb83 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-contenttype.xml @@ -98,11 +98,14 @@ primary_url="info" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml index abda6c17b..1f40820f9 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-remove-role.xml @@ -101,11 +101,14 @@ primary_url="info" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml index 5b6d36de2..45312feac 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/after-rename.xml @@ -67,11 +67,14 @@ primary_url="content" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml index ee8f76e1e..0dadfde16 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentSectionManagerTest/data.xml @@ -101,11 +101,14 @@ primary_url="info" /> + uuid="27c81e9d-cfbd-4196-9db9-55e7a5fe4c52" + active="false" /> + uuid="46041c25-ddf4-4e98-9067-21a8a8a0dcd7" + active="false" /> + uuid="3953c9be-f8ee-4015-9911-a560c762b052" + active="false" /> diff --git a/ccm-cms/src/test/resources/scripts/h2-cleanup.sql b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql index 13713f8fc..cc2fdf4ad 100644 --- a/ccm-cms/src/test/resources/scripts/h2-cleanup.sql +++ b/ccm-cms/src/test/resources/scripts/h2-cleanup.sql @@ -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; diff --git a/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql b/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql index 13713f8fc..cc2fdf4ad 100644 --- a/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql +++ b/ccm-cms/src/test/resources/scripts/pgsql-cleanup.sql @@ -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; diff --git a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java index 6d180ac42..2c4f601cc 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/AssignableTask.java @@ -41,10 +41,10 @@ import javax.persistence.Temporal; 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. - * + * 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. + * * @author Jens Pelzetter */ @Entity @@ -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( diff --git a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java index 4eb9c7326..3c802eb7b 100644 --- a/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java +++ b/ccm-core/src/main/java/org/libreccm/workflow/Workflow.java @@ -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); } diff --git a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql index bec469212..e65f64d92 100644 --- a/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-h2-mem/scripts/create_ccm_core_schema.sql @@ -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, diff --git a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql index 1cb060b4d..a75baa7b6 100644 --- a/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql +++ b/ccm-core/src/test/resources-wildfly-remote-pgsql/scripts/create_ccm_core_schema.sql @@ -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,