Merged HEAD-MNT-2904 to HEAD (5.0.0)

89997: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Update base types. Appropriate unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@90092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-11-07 10:47:34 +00:00
parent e65d326820
commit 46ceced321

View File

@@ -2720,25 +2720,35 @@ public class CMISTest
{ {
for (int i = 0; i < types.length; i++) for (int i = 0; i < types.length; i++)
{ {
List<TypeDefinitionWrapper> baseTypes = cmisDictionaryService.getBaseTypes();
assertNotNull(baseTypes);
checkDefs(baseTypes);
List<TypeDefinitionWrapper> children = cmisDictionaryService.getChildren(types[i]); List<TypeDefinitionWrapper> children = cmisDictionaryService.getChildren(types[i]);
assertNotNull(children); assertNotNull(children);
// Check that children were updated // Check that children were updated
for (TypeDefinitionWrapper child : children) checkDefs(children);
}
return "";
};
private void checkDefs(List<TypeDefinitionWrapper> defs)
{ {
assertNotNull("Type definition was not updated. Please refer to ACE-3322", child.getTypeDefinition(false).getDisplayName()); for (TypeDefinitionWrapper def : defs)
assertNotNull("Type definition was not updated. Please refer to ACE-3322", child.getTypeDefinition(false).getDescription()); {
assertNotNull("Type definition was not updated. Please refer to ACE-3322", def.getTypeDefinition(false).getDisplayName());
assertNotNull("Type definition was not updated. Please refer to ACE-3322", def.getTypeDefinition(false).getDescription());
// Check that property's display name and description were updated // Check that property's display name and description were updated
for (PropertyDefinitionWrapper property : child.getProperties()) for (PropertyDefinitionWrapper property : def.getProperties())
{ {
assertNotNull("Display name is null", property.getPropertyDefinition().getDisplayName()); assertNotNull("Display name is null", property.getPropertyDefinition().getDisplayName());
assertNotNull("Description is null", property.getPropertyDefinition().getDescription()); assertNotNull("Description is null", property.getPropertyDefinition().getDescription());
} }
} }
} }
return "";
};
}; };
withCmisService(callback, CmisVersion.CMIS_1_1); withCmisService(callback, CmisVersion.CMIS_1_1);