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/HEAD/root@127601 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jamal Kaabi-Mofrad
2016-06-02 22:19:19 +00:00
parent 084016b45c
commit c60406cc54
7 changed files with 53 additions and 20 deletions

View File

@@ -20,16 +20,21 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
/*
* Note: synchronized for multi-threaded test access
*/
public synchronized static EnterprisePublicApiTestFixture getInstance() throws Exception
public synchronized static EnterprisePublicApiTestFixture getInstance(boolean createTestData) throws Exception
{
if(instance == null)
{
instance = new EnterprisePublicApiTestFixture();
instance.setup();
instance.setup(createTestData);
}
return instance;
}
public synchronized static EnterprisePublicApiTestFixture getInstance() throws Exception
{
return getInstance(true);
}
private EnterprisePublicApiTestFixture()
{
super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);