Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)

128642 jvonka: V1 REST API: cleanup and rationalise new api tests (re: remotable helpers & runAs user / admin) - round 5b
   - fix test fallout
   REPO-113


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@129180 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2016-08-05 13:47:41 +00:00
parent a65e2f48f1
commit 7fa1d5b889
5 changed files with 85 additions and 38 deletions

View File

@@ -78,7 +78,7 @@ public class RenditionsTest extends AbstractBaseApiTest
/**
* Test network one
*/
TestNetwork networkOne;
TestNetwork networkN1;
/**
* User one from network one
@@ -93,11 +93,11 @@ public class RenditionsTest extends AbstractBaseApiTest
@Before
public void setup() throws Exception
{
networkOne = repoService.createNetworkWithAlias("ping", true);
networkOne.create();
userOneN1 = networkOne.createUser();
networkN1 = repoService.createNetworkWithAlias("ping", true);
networkN1.create();
userOneN1 = networkN1.createUser();
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
String siteTitle = "RandomSite" + System.currentTimeMillis();
userOneN1Site = createSite(siteTitle, SiteVisibility.PRIVATE);
@@ -106,7 +106,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@After
public void tearDown() throws Exception
{
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
deleteSite(userOneN1Site.getId(), true, 204);
}
@@ -118,7 +118,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testListNodeRenditions() throws Exception
{
setRequestContext(networkOne.getId(), userOneN1.getId(), null);
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
@@ -258,7 +258,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testGetNodeRendition() throws Exception
{
setRequestContext(userOneN1.getId());
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
@@ -342,7 +342,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testCreateRendition() throws Exception
{
setRequestContext(userOneN1.getId());
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
@@ -476,7 +476,7 @@ public class RenditionsTest extends AbstractBaseApiTest
public void testCreateRenditionOnUpload() throws Exception
{
String userId = userOneN1.getId();
setRequestContext(userId);
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();
@@ -597,7 +597,7 @@ public class RenditionsTest extends AbstractBaseApiTest
@Test
public void testDownloadRendition() throws Exception
{
setRequestContext(userOneN1.getId());
setRequestContext(networkN1.getId(), userOneN1.getId(), null);
// Create a folder within the site document's library
String folderName = "folder" + System.currentTimeMillis();