mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Merged 5.2.N (5.2.2) to HEAD (5.2)
133852 jvonka: REPO-1666: V1 REST API - minor update to "testDeleteVersion" only - follow-on to exercise the fix via API-level sanity test - note: do not backport since new API is for 5.2+ - MNT-13097 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137326 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -259,6 +259,8 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
|
||||
/**
|
||||
* Test delete version
|
||||
*
|
||||
* Note: see also VersionServiceImplTest.testDeleteLastVersion
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
@Test
|
||||
@@ -290,6 +292,7 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
|
||||
List<Node> nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(cnt, nodes.size());
|
||||
|
||||
// -ve tests:
|
||||
{
|
||||
setRequestContext(null);
|
||||
|
||||
@@ -321,33 +324,44 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
|
||||
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(cnt - 1, nodes.size());
|
||||
|
||||
// check live node (version label does not change)
|
||||
// check live node (does not change)
|
||||
response = getSingle(URL_NODES, docId, 200);
|
||||
Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
assertEquals("1.3", nodeResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
response = getSingle(getNodeContentUrl(docId), null, 200);
|
||||
assertEquals(textContentSuffix+"4", response.getResponse());
|
||||
|
||||
// delete current (most recent) version
|
||||
delete(getNodeVersionsUrl(docId), "1.3", null, 204);
|
||||
|
||||
response = getAll(getNodeVersionsUrl(docId), null, null, 200);
|
||||
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(cnt - 2, nodes.size());
|
||||
|
||||
// check live node (version label changes)
|
||||
// check live node (changes)
|
||||
response = getSingle(URL_NODES, docId, 200);
|
||||
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
response = getSingle(getNodeContentUrl(docId), null, 200);
|
||||
assertEquals(textContentSuffix+"3", response.getResponse());
|
||||
|
||||
// delete another version
|
||||
delete(getNodeVersionsUrl(docId), "1.1", null, 204);
|
||||
|
||||
response = getAll(getNodeVersionsUrl(docId), null, null, 200);
|
||||
nodes = RestApiUtil.parseRestApiEntries(response.getJsonResponse(), Node.class);
|
||||
assertEquals(cnt - 3, nodes.size());
|
||||
|
||||
// check live node (version label does not change)
|
||||
// check live node (does not change)
|
||||
response = getSingle(URL_NODES, docId, 200);
|
||||
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
|
||||
assertEquals("1.2", nodeResp.getProperties().get("cm:versionLabel"));
|
||||
|
||||
response = getSingle(getNodeContentUrl(docId), null, 200);
|
||||
assertEquals(textContentSuffix+"3", response.getResponse());
|
||||
|
||||
// -ve test - cannot delete last version (via delete version api call) (see REPO-835 & REPO-834)
|
||||
delete(getNodeVersionsUrl(docId), "1.2", null, 422);
|
||||
|
||||
@@ -432,7 +446,7 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
|
||||
assertEquals("1.0", props.get("cm:versionLabel"));
|
||||
assertEquals("MAJOR", props.get("cm:versionType"));
|
||||
|
||||
// double-check content
|
||||
// check content
|
||||
response = getSingle(getNodeVersionsUrl(docId), "1.0/content", null, 200);
|
||||
assertEquals(textContent, response.getResponse());
|
||||
|
||||
@@ -449,7 +463,7 @@ public class NodeVersionsApiTest extends AbstractSingleNetworkSiteTest
|
||||
assertEquals("1.1", props.get("cm:versionLabel"));
|
||||
assertEquals("MINOR", props.get("cm:versionType"));
|
||||
|
||||
// double-check content
|
||||
// check content
|
||||
response = getSingle(getNodeVersionsUrl(docId), "1.1/content", null, 200);
|
||||
assertEquals(textContent, response.getResponse());
|
||||
}
|
||||
|
Reference in New Issue
Block a user