Merged HEAD-MNT-2904 to HEAD (5.0.0)

89844:ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
         - Update of typeDefInclProperties property definitions is required. Updated unit test to check functionality.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@89864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-11-04 14:38:28 +00:00
parent 4e57f75adf
commit 4e858163a8

View File

@@ -99,6 +99,7 @@ import org.apache.chemistry.opencmis.commons.data.ObjectList;
import org.apache.chemistry.opencmis.commons.data.Properties; import org.apache.chemistry.opencmis.commons.data.Properties;
import org.apache.chemistry.opencmis.commons.data.PropertyData; import org.apache.chemistry.opencmis.commons.data.PropertyData;
import org.apache.chemistry.opencmis.commons.data.RepositoryInfo; import org.apache.chemistry.opencmis.commons.data.RepositoryInfo;
import org.apache.chemistry.opencmis.commons.definitions.PropertyDefinition;
import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition; import org.apache.chemistry.opencmis.commons.definitions.TypeDefinition;
import org.apache.chemistry.opencmis.commons.enums.AclPropagation; import org.apache.chemistry.opencmis.commons.enums.AclPropagation;
import org.apache.chemistry.opencmis.commons.enums.Action; import org.apache.chemistry.opencmis.commons.enums.Action;
@@ -2687,6 +2688,12 @@ public class CMISTest
assertNotNull("The display name is incorrect. Please, refer to ACE-2904.", def.getDisplayName()); assertNotNull("The display name is incorrect. Please, refer to ACE-2904.", def.getDisplayName());
assertEquals("The display name is incorrect. Please, refer to ACE-2904.", def.getDisplayName(), displayNames[i]); assertEquals("The display name is incorrect. Please, refer to ACE-2904.", def.getDisplayName(), displayNames[i]);
assertEquals("The description is incorrect. Please, refer to ACE-2904.", def.getDescription(), descriptions[i]); assertEquals("The description is incorrect. Please, refer to ACE-2904.", def.getDescription(), descriptions[i]);
for (PropertyDefinition<?> property : def.getPropertyDefinitions().values())
{
assertNotNull("Property definition dispaly name is incorrect. Please, refer to ACE-2904.", property.getDisplayName());
assertNotNull("Property definition description is incorrect. Please, refer to ACE-2904.", property.getDescription());
}
} }
return ""; return "";