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

127601 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127330 amukha: RA-941: V1 REST API Tests: rationalise the test startup - eg. only create test data when needed ;-)
         - Added checks to defer test data creation until it is required.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127693 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 14:48:37 +00:00
parent eb8cf53b69
commit d812ec3601
7 changed files with 53 additions and 20 deletions

View File

@@ -31,6 +31,7 @@ import static org.alfresco.rest.api.tests.util.RestApiUtil.toJsonAsStringNonNull
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.rest.api.tests.AbstractBaseApiTest;
import org.alfresco.rest.api.tests.NodeApiTest;
import org.alfresco.rest.api.tests.RepoService;
import org.alfresco.rest.api.tests.client.HttpResponse;
import org.alfresco.rest.api.tests.client.data.ContentInfo;
@@ -75,7 +76,9 @@ public class AbstractSingleNetworkSiteTest extends AbstractBaseApiTest
jacksonUtil = new JacksonUtil(applicationContext.getBean("jsonHelper", JacksonHelper.class));
networkOne = getTestFixture().getRandomNetwork();
getTestFixture(false);
networkOne = getRepoService().createNetwork(this.getClass().getName().toLowerCase(), true);
networkOne.create();
u1 = networkOne.createUser();
tSite = createSite(networkOne, u1, SiteVisibility.PRIVATE);