From d69da227ca5394e4d8ce8dbc320467f839b4fd8b Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Sat, 19 May 2007 05:42:57 +0000
Subject: [PATCH] BaseSpringTest uses ApplicationContextHelper, which now
 ensures that the context is only started once.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/util/BaseSpringTest.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/source/java/org/alfresco/util/BaseSpringTest.java b/source/java/org/alfresco/util/BaseSpringTest.java
index 349a050b8a..deb48926e4 100644
--- a/source/java/org/alfresco/util/BaseSpringTest.java
+++ b/source/java/org/alfresco/util/BaseSpringTest.java
@@ -26,6 +26,7 @@ package org.alfresco.util;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.orm.hibernate3.SessionFactoryUtils;
 import org.springframework.test.AbstractTransactionalDataSourceSpringContextTests;
 
@@ -86,6 +87,7 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
 	 * 
 	 * @return  an array containing the config locations
 	 */
+    @Override
     protected String[] getConfigLocations()
     {
         if (logger.isDebugEnabled())
@@ -94,4 +96,13 @@ public abstract class BaseSpringTest extends AbstractTransactionalDataSourceSpri
         }
         return ApplicationContextHelper.CONFIG_LOCATIONS;
     }
+
+    /**
+     * Ignores the key and loads the {@link ApplicationContextHelper application context}.
+     */
+    @Override
+    protected ConfigurableApplicationContext loadContext(Object key) throws Exception
+    {
+        return (ConfigurableApplicationContext) ApplicationContextHelper.getApplicationContext();
+    }
 }