Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

78437: Merged EOL (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      76188: ACE-2149: EOL AVM / WCM
       - Force a type exclusion (act:actionbase) in order to test CMIS type exclusions
       - Originally, all wcm prefixes were ignored and that had been used by the CMIS exclusion test


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/tests/TestCMIS.java

@@ -27,6 +27,8 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.opencmis.CMISDispatcherRegistry.Binding;
 import org.alfresco.opencmis.dictionary.CMISStrictDictionaryService;
 import org.alfresco.opencmis.dictionary.QNameFilter;
+import org.alfresco.opencmis.dictionary.QNameFilterImpl;
+import org.alfresco.repo.action.ActionModel;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.content.filestore.FileContentWriter;
 import org.alfresco.repo.dictionary.DictionaryBootstrap;
@@ -1217,10 +1219,19 @@ public class TestCMIS extends EnterpriseTestApi
         }
     }
 
-    // ALF-18968
+    /**
+     * ALF-18968
+     * 
+     * @see QNameFilterImpl#listOfHardCodedExcludedTypes()
+     */
     @Test
     public void testTypeFiltering() throws Exception
     {
+        // Force an exclusion in order to test the exclusion inheritance
+        cmisTypeExclusions.setExcluded(ActionModel.TYPE_ACTION_BASE, true);
+        // Quick check
+        assertTrue(cmisTypeExclusions.isExcluded(ActionModel.TYPE_ACTION_BASE));
+
         // Test that a type defined with this excluded parent type does not break the CMIS dictionary
         DictionaryBootstrap bootstrap = new DictionaryBootstrap();
         List<String> bootstrapModels = new ArrayList<String>();
@@ -1238,7 +1249,7 @@ public class TestCMIS extends EnterpriseTestApi
         TestPerson person1 = network1.createUser(personInfo);
         String person1Id = person1.getId();
 
-        // test that this type is excluded
+        // test that this type is excluded; the 'action' model (act prefix) is in the list of hardcoded exclusions
         QName type = QName.createQName("{http://www.alfresco.org/test/testCMIS}type1");
         assertTrue(cmisTypeExclusions.isExcluded(type));
 

source/test-resources/publicapi/test-model.xml

@@ -7,7 +7,7 @@
     <version>0.1</version>
     
     <imports>
-        <import uri="http://www.alfresco.org/model/content/1.0" prefix="cm"/>
+      	<import uri="http://www.alfresco.org/model/action/1.0" prefix="act"/>
     </imports>
     
     <namespaces>
@@ -17,7 +17,7 @@
     <types>
         <type name="testCMIS:type1">
             <title>Type 1</title>
-            <parent>cm:savedquery</parent>
+            <parent>act:actionbase</parent>
             <properties>
             </properties>
         </type>