Merged DEV to HEAD (5.0.0)

88615: ACE-2904: Localised labels for type, aspect and property definitions are no longer returned
      - Fix for side effect of ACE-1996, when initial title/description resolving was removed. Now, it will be resolved, when we are going to get type definition for the first time. Appropriate unit test was added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Pavel Yurke
2014-10-17 16:45:37 +00:00
parent 4a9249a534
commit 338aa7904d

View File

@@ -24,7 +24,6 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.io.File;
@@ -2670,4 +2669,42 @@ public class CMISTest
AuthenticationUtil.popAuthentication();
}
}
/**
* ACE-2904
*/
@Test
public void testACE2904()
{ // Basic CMIS Types // Additional types from Content Model
final String[] types = { "cmis:document", "cmis:relationship", "cmis:folder", "cmis:policy", "cmis:item", "R:cm:replaces", "P:cm:author", "I:cm:cmobject" };
final String[] displayNames = { "Document", "Relationship", "Folder", "Policy", "Item Type", "Replaces", "Author", "Object" };
final String[] descriptions = { "Document Type", "Relationship Type", "Folder Type", "Policy Type", "CMIS Item", "Replaces", "Author", "I:cm:cmobject" };
CmisServiceCallback<String> callback = new CmisServiceCallback<String>()
{
@Override
public String execute(CmisService cmisService)
{
List<RepositoryInfo> repositories = cmisService.getRepositoryInfos(null);
assertTrue(repositories.size() > 0);
RepositoryInfo repo = repositories.get(0);
String repositoryId = repo.getId();
for (int i = 0; i < types.length; i++)
{
TypeDefinition def = cmisService.getTypeDefinition(repositoryId, types[i], null);
assertNotNull("The " + types[i] + " type is not defined", def);
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 description is incorrect. Please, refer to ACE-2904.", def.getDescription(), descriptions[i]);
}
return "";
};
};
// Lets test types for cmis 1.1 and cmis 1.0
withCmisService(callback, CmisVersion.CMIS_1_1);
withCmisService(callback, CmisVersion.CMIS_1_0);
}
}