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 RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

Browse Source 
128594 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 2
   REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 13:47:16 +00:00
parent 1b474b8199
commit a95eb5613e
10 changed files with 177 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/test-java/org/alfresco/rest/api/tests/NodeVersionsApiTest.java
View File

@@ -189,8 +189,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
finally
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
@@ -250,8 +250,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
finally
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
@@ -449,8 +449,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
if (f1Id != null)
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
}
@@ -734,7 +734,7 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
checkVersionHistoryAndContent(d1Id, nodes, verCnt, textContentSuffix, null, majorVersion, minorVersion, false);
// delete to trashcan/archive ...
delete(URL_NODES, user1, d1Id, null, 204);
deleteNode(d1Id);
{
// -ve tests
@@ -760,8 +760,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
finally
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
@@ -891,8 +891,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
if (f1Id != null)
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
}
@@ -1081,7 +1081,7 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
checkVersionHistoryAndContent(d1Id, nodes, verCnt, textContentSuffix, null, 1, minorVersion, false);
// delete to trashcan/archive ...
delete(URL_NODES, user1, d1Id, null, 204);
deleteNode(d1Id);
// -ve tests
{
@@ -1111,8 +1111,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
finally
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
@@ -1344,8 +1344,8 @@ public class NodeVersionsApiTest extends AbstractBaseApiTest
if (f1Id != null)
{
// some cleanup
Map<String, String> params = Collections.singletonMap("permanent", "true");
delete(URL_NODES, user1, f1Id, params, 204);
setRequestContext(user1);
deleteNode(f1Id, true, 204);
}
}
}