From 80aab65e530c43fbc625b459cf69ccffe75c5ac3 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 7 Oct 2014 13:54:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) 87390: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) << SteveG requested these commist be merged to HEAD >> 87255: ACE-2928 : Secondary Type id "P:sys:localized" is invalid Re-instated the sys:localized aspect, deleted in r80397. 87367: ACE-2928 : Secondary Type id "P:sys:localized" is invalid Removed unnecessary check in the test. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@87391 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/test-java/org/alfresco/rest/api/tests/TestCMIS.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java index 44ae686c65..a78589bd70 100644 --- a/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java +++ b/source/test-java/org/alfresco/rest/api/tests/TestCMIS.java @@ -1845,8 +1845,7 @@ public class TestCMIS extends EnterpriseTestApi { System.out.println(mandatoryAspect); } - assertEquals(1, mandatoryAspects.size()); - assertEquals("P:cm:generalclassifiable", mandatoryAspects.get(0)); + assertTrue("The aspects should have P:cm:generalclassifiable", mandatoryAspects.contains("P:cm:generalclassifiable")); } @Test