Improve how the Metadata and Content Transform tests request their contexts, to make it possible for them to run on the smaller context

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

source/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java

@@ -62,7 +62,11 @@ public abstract class AbstractContentTransformerTest extends TestCase
     
     private static Log logger = LogFactory.getLog(AbstractContentTransformerTest.class);
     
-    protected static ApplicationContext ctx = ApplicationContextHelper.getApplicationContext();
+    /**
+     * This context will be fetched each time, but almost always
+     *  will have been cached by {@link ApplicationContextHelper}
+     */
+    protected ApplicationContext ctx;
 
     protected ServiceRegistry serviceRegistry;
     protected MimetypeService mimetypeService;
@@ -86,6 +90,10 @@ public abstract class AbstractContentTransformerTest extends TestCase
     @Override
     protected void setUp() throws Exception
     {
+        // Grab a suitably configured context
+        ctx = TransformTestSuite.getContext();
+
+        // Grab other useful beans
         serviceRegistry = (ServiceRegistry) ctx.getBean(ServiceRegistry.SERVICE_REGISTRY);
         mimetypeService = serviceRegistry.getMimetypeService();
         // perform a little cleaning up

source/java/org/alfresco/repo/content/transform/RuntimeExecutableContentTransformerTest.java

@@ -47,6 +47,12 @@ public class RuntimeExecutableContentTransformerTest extends BaseAlfrescoTestCas
 {
     private ContentTransformer transformer;
     
+    @Override
+    protected void setUpContext() {
+       // We use a smaller context
+       ctx = TransformTestSuite.getContext();
+    }
+
     @Override
     protected void setUp() throws Exception
     {

source/java/org/alfresco/repo/content/transform/TransformTestSuite.java

@@ -28,15 +28,29 @@ import junit.framework.Test;
 import junit.framework.TestSuite;
 
 import org.alfresco.repo.content.transform.magick.ImageMagickContentTransformerTest;
+import org.alfresco.util.ApplicationContextHelper;
+import org.springframework.context.ApplicationContext;
 
 
 /**
- * Version test suite
+ * Content Transformation test suite
  * 
  * @author Roy Wetherall
  */
 public class TransformTestSuite extends TestSuite
 {
+    /**
+     * Asks {@link ApplicationContextHelper} to give us a 
+     *  suitable, perhaps cached context for use in our tests
+     */
+    public static ApplicationContext getContext() {
+       ApplicationContextHelper.setUseLazyLoading(false);
+       ApplicationContextHelper.setNoAutoStart(true);
+       return ApplicationContextHelper.getApplicationContext(
+            new String[] { "classpath:alfresco/minimal-context.xml" }
+       );
+    }
+    
     /**
      * Creates the test suite
      * 
@@ -44,6 +58,10 @@ public class TransformTestSuite extends TestSuite
      */
     public static Test suite() 
     {
+        // Setup the context
+        getContext();
+       
+        // Off we go
         TestSuite suite = new TestSuite();
         suite.addTestSuite(BinaryPassThroughContentTransformerTest.class);
         suite.addTestSuite(ComplexContentTransformerTest.class);
@@ -53,7 +71,7 @@ public class TransformTestSuite extends TestSuite
         suite.addTestSuite(MediaWikiContentTransformerTest.class);
         suite.addTestSuite(OpenOfficeContentTransformerTest.class);
         suite.addTestSuite(PdfBoxContentTransformerTest.class);
-        suite.addTestSuite(PoiHssfContentTransformerTest.class);        
+        suite.addTestSuite(PoiHssfContentTransformerTest.class);
         suite.addTestSuite(RuntimeExecutableContentTransformerTest.class);
         suite.addTestSuite(StringExtractingContentTransformerTest.class);
         suite.addTestSuite(TextMiningContentTransformerTest.class);