From bc6f1350746a84a42e8e04e6e4504344a86fe96b Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Sat, 28 Jan 2017 13:49:31 +0000
Subject: [PATCH] CCM NG/ccm-cms: All tests pass again

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4540 8810af33-2d31-482b-a856-94f89814c4df
---
 .../contentsection/ContentSection.java        |  3 +-
 .../contentsection/ContentSectionManager.java |  4 +-
 .../ContentSectionManagerTest.java            |  2 +-
 .../ContentItemPermissionTest/data.xml        | 18 ++++--
 .../after-create.xml                          | 58 +++++++++----------
 5 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
index 75c4085d4..d48423b96 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSection.java
@@ -64,7 +64,8 @@ import static org.librecms.CmsConstants.*;
         name = "ContentSection.findPermissions",
         query = "SELECT p FROM Permission p "
                     + "WHERE (p.object = :section "
-                    + "       OR p.object = :rootDocumentsFolder) "
+                    + "       OR p.object = :rootDocumentsFolder"
+        + "                   OR p.object = :rootAssetsFolder) "
                     + "AND p.grantee = :role")
 })
 //@ApplicationType(
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java
index 22bf587ba..c16d77315 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentSectionManager.java
@@ -343,13 +343,15 @@ public class ContentSectionManager {
 
         contentSection.removeRole(role);
         sectionRepo.save(contentSection);
-
+        
         final TypedQuery<Permission> query = entityManager
                 .createNamedQuery("ContentSection.findPermissions",
                                   Permission.class);
         query.setParameter("section", contentSection);
         query.setParameter("rootDocumentsFolder",
                            contentSection.getRootDocumentsFolder());
+        query.setParameter("rootAssetsFolder",
+                           contentSection.getRootAssetsFolder());
         query.setParameter("role", role);
 
         final List<Permission> permissions = query.getResultList();
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 3ec7955f3..5c56ed6fe 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentSectionManagerTest.java
@@ -75,7 +75,7 @@ import org.librecms.lifecycle.LifecycleDefinitionRepository;
 @PersistenceTest
 @Transactional(TransactionMode.COMMIT)
 @CreateSchema({"create_ccm_cms_schema.sql"})
-@CleanupUsingScript({"no-cleanup.sql"})
+@CleanupUsingScript({"cleanup.sql"})
 public class ContentSectionManagerTest {
 
     @Inject
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemPermissionTest/data.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemPermissionTest/data.xml
index ebbf18959..b39258cf3 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemPermissionTest/data.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemPermissionTest/data.xml
@@ -349,32 +349,38 @@
                           granted_privilege="view_draft_items" 
                           object_id="-10100" 
                           grantee_id="-3100" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4200" 
                           granted_privilege="view_draft_items" 
                           object_id="-10400" 
                           grantee_id="-3100" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4300" 
                           granted_privilege="view_draft_items" 
                           object_id="-10200" 
                           grantee_id="-3200" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4400" 
                           granted_privilege="view_draft_items" 
                           object_id="-10100" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4500" 
                           granted_privilege="view_draft_items" 
                           object_id="-10200" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     <ccm_core.permissions permission_id="-4600" 
                           granted_privilege="view_draft_items" 
                           object_id="-10300" 
                           grantee_id="-3300" 
-                          creation_date="2016-07-15"/>
+                          creation_date="2016-07-15"
+                          inherited="false" />
     
 </dataset>
 
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 c4c8f2f1e..8f42c75a2 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
@@ -1295,202 +1295,202 @@
                           object_id="-2300" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5120000" 
                           granted_privilege="create_new_items" 
                           object_id="-2300" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15" 
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5130000" 
                           granted_privilege="edit_items" 
                           object_id="-2300" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15" 
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5140000" 
                           granted_privilege="view_published_items" 
                           object_id="-2300" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15" 
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5150000" 
                           granted_privilege="preview_items" 
                           object_id="-2300" 
                           grantee_id="-32000" 
                           creation_date="2016-07-15" 
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5210000" 
                           granted_privilege="categorize_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5220000" 
                           granted_privilege="create_new_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5230000" 
                           granted_privilege="edit_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5240000" 
                           granted_privilege="approve_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false"
+                          inherited="true"
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5250000" 
                           granted_privilege="delete_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5260000" 
                           granted_privilege="view_published_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5270000" 
                           granted_privilege="preview_items" 
                           object_id="-2300" 
                           grantee_id="-33000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5360000" 
                           granted_privilege="categorize_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5370000" 
                           granted_privilege="create_new_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5380000" 
                           granted_privilege="edit_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5390000" 
                           granted_privilege="approve_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5400000" 
                           granted_privilege="publish_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5410000" 
                           granted_privilege="delete_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5420000" 
                           granted_privilege="view_published_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5430000" 
                           granted_privilege="preview_items" 
                           object_id="-2300" 
                           grantee_id="-34000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5510000" 
                           granted_privilege="categorize_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5520000" 
                           granted_privilege="create_new_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5530000" 
                           granted_privilege="edit_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5540000" 
                           granted_privilege="approve_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5550000" 
                           granted_privilege="publish_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5560000" 
                           granted_privilege="delete_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5570000" 
                           granted_privilege="view_published_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" inherited_from_id="-1200" />
+                          inherited="true" inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5580000" 
                           granted_privilege="preview_items" 
                           object_id="-2300" 
                           grantee_id="-35000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5610000" 
                           granted_privilege="view_published_items" 
                           object_id="-2300" 
                           grantee_id="-36000" 
                           creation_date="2016-07-15"
-                          inherited="false" 
+                          inherited="true" 
                           inherited_from_id="-1200" />
     <ccm_core.permissions permission_id="-5160000"
                           granted_privilege="use_asset"