inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
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
This commit is contained in:
Ancuta Morarasu
2016-05-11 12:13:04 +00:00
parent 5ab0af68ad
commit e9dbbc1cd0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -681,6 +681,7 @@ public class NodeApiTest extends AbstractBaseApiTest
Map<String, Object> props = new HashMap<>(); Map<String, Object> props = new HashMap<>();
props.put("cm:title", title); props.put("cm:title", title);
props.put("cm:versionLabel", "1.0"); props.put("cm:versionLabel", "1.0");
props.put("cm:versionType", "MAJOR");
d1.setProperties(props); d1.setProperties(props);
d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable","cm:author")); d1.setAspectNames(Arrays.asList("cm:auditable","cm:titled","cm:versionable","cm:author"));
@@ -2266,6 +2267,7 @@ public class NodeApiTest extends AbstractBaseApiTest
documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); 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); d1.expected(documentResp);
// update file - remove titled aspect (and it's related aspect properties) // 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); Document documentResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
// note: owner is implied // note: owner is implied
assertEquals(1, documentResp.getProperties().size()); assertEquals(2, documentResp.getProperties().size());
assertEquals("1.0", documentResp.getProperties().get("cm:versionLabel")); assertEquals("1.0", documentResp.getProperties().get("cm:versionLabel"));
assertEquals("MAJOR", documentResp.getProperties().get("cm:versionType"));
props = new HashMap<>(); props = new HashMap<>();
props.put(PROP_OWNER, user1); props.put(PROP_OWNER, user1);