From e9dbbc1cd072fe1ed4e1b0e071b74e94009c4942 Mon Sep 17 00:00:00 2001 From: Ancuta Morarasu Date: Wed, 11 May 2016 12:13:04 +0000 Subject: [PATCH] Merged HEAD (5.2) to 5.2.N (5.2.1) 126587 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 124793 jkaabimofrad: Fixed API tests failures, after synced HEAD to FILE-FOLDER-API. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126932 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/rest/api/tests/NodeApiTest.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java index 04f6b021f9..4860fe707e 100644 --- a/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java @@ -678,9 +678,10 @@ public class NodeApiTest extends AbstractBaseApiTest d1.setCreatedByUser(expectedUser); d1.setModifiedByUser(expectedUser); - Map props = new HashMap<>(); - props.put("cm:title",title); - props.put("cm:versionLabel","1.0"); + Map props = new HashMap<>(); + props.put("cm:title", title); + props.put("cm:versionLabel", "1.0"); + props.put("cm:versionType", "MAJOR"); d1.setProperties(props); d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable","cm:author")); @@ -2265,7 +2266,8 @@ public class NodeApiTest extends AbstractBaseApiTest response = getSingle(URL_NODES, user1, dId, 200); documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); - d1.getProperties().put("cm:versionLabel","1.0"); + d1.getProperties().put("cm:versionLabel", "1.0"); + d1.getProperties().put("cm:versionType", "MAJOR"); d1.expected(documentResp); // update file - remove titled aspect (and it's related aspect properties) @@ -2404,8 +2406,9 @@ public class NodeApiTest extends AbstractBaseApiTest Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); // note: owner is implied - assertEquals(1, documentResp.getProperties().size()); + assertEquals(2, documentResp.getProperties().size()); assertEquals("1.0", documentResp.getProperties().get("cm:versionLabel")); + assertEquals("MAJOR", documentResp.getProperties().get("cm:versionType")); props = new HashMap<>(); props.put(PROP_OWNER, user1);