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 HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
127603 jkaabimofrad: Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)
      127347 amukha: RA-941: V1 REST API Tests: rationalise the test startup - eg. only create test data when needed ;-)
         - Removed a duplicate implementation - TCKEnterpriseTestFixture


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@127710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:18:03 +00:00
parent a0b13ea954
commit b2b51abb1e
3 changed files with 2 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/test-java/org/alfresco/rest/api/tests/AbstractEnterpriseOpenCMISTCKTest.java
View File

@@ -46,7 +46,7 @@ public abstract class AbstractEnterpriseOpenCMISTCKTest extends EnterpriseTestAp
@Override
protected TestFixture getTestFixture() throws Exception
{
return TCKEnterpriseTestFixture.getInstance();
return EnterprisePublicApiTestFixture.getInstance();
}
protected void overrideVersionableAspectProperties(ApplicationContext ctx)

2
source/test-java/org/alfresco/rest/api/tests/EnterprisePublicApiTestFixture.java
View File

@@ -55,7 +55,7 @@ public class EnterprisePublicApiTestFixture extends EnterpriseTestFixture
return instance;
}
public synchronized static EnterprisePublicApiTestFixture getInstance() throws Exception
public static EnterprisePublicApiTestFixture getInstance() throws Exception
{
return getInstance(true);
}

74
source/test-java/org/alfresco/rest/api/tests/TCKEnterpriseTestFixture.java
View File

@@ -1,74 +0,0 @@
/*
* #%L
* Alfresco Remote API
* %%
* Copyright (C) 2005 - 2016 Alfresco Software Limited
* %%
* This file is part of the Alfresco software.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #L%
*/
package org.alfresco.rest.api.tests;
import org.alfresco.repo.web.util.JettyComponent;
public class TCKEnterpriseTestFixture extends EnterpriseTestFixture
{
public final static String[] CONFIG_LOCATIONS = new String[]
{
"classpath:alfresco/application-context.xml",
"classpath:alfresco/web-scripts-application-context.xml",
"classpath:alfresco/web-scripts-application-context-test.xml",
"rest-api-test-context.xml"
};
public final static String[] CLASS_LOCATIONS = new String[] {"classpath*:/publicapi/lucene/"};
private static TCKEnterpriseTestFixture instance;
/*
* Note: synchronized for multi-threaded test access
*/
public synchronized static TCKEnterpriseTestFixture getInstance() throws Exception
{
if(instance == null)
{
instance = new TCKEnterpriseTestFixture();
instance.setup();
}
return instance;
}
private TCKEnterpriseTestFixture()
{
super(CONFIG_LOCATIONS, CLASS_LOCATIONS, PORT, CONTEXT_PATH, PUBLIC_API_SERVLET_NAME, DEFAULT_NUM_MEMBERS_PER_SITE, false);
}
@Override
protected JettyComponent makeJettyComponent()
{
JettyComponent jettyComponent = new EnterpriseJettyComponent(port, contextPath, configLocations, classLocations);
return jettyComponent;
}
@Override
protected RepoService makeRepoService() throws Exception
{
return new RepoService(applicationContext);
}
}