Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

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

@@ -0,0 +1,47 @@
+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"
+    };
+	
+    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 CMISTCKJettyComponent(port, contextPath, servletName, configLocations, classLocations);
+		return jettyComponent;
+	}
+
+	@Override
+	protected RepoService makeRepoService() throws Exception
+	{
+		return new RepoService(applicationContext);
+	}
+}