X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Funit%2FAbstractSpringTestCase.java;h=a37c4a7ceb4147cdff4e031d2315cd02ea3d9b16;hb=42aa6ffce6a95107cd10f908e5f9c695d902d571;hp=5166242b4626c9c4873997565af672068eea715f;hpb=a59910934f488093ac8855896103c9bc9612a02b;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java
index 5166242b4..a37c4a7ce 100644
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/unit/AbstractSpringTestCase.java
@@ -1,25 +1,25 @@
 package org.argeo.slc.unit;
 
-import java.util.Map;
-
 import junit.framework.TestCase;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.core.SlcException;
-import org.argeo.slc.core.process.SlcExecution;
+import org.argeo.slc.spring.SpringUtils;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /** Helper for tests using a Spring application co,text. */
 public abstract class AbstractSpringTestCase extends TestCase {
-	private ApplicationContext context;
+	protected final Log log = LogFactory.getLog(getClass());
+	private ConfigurableApplicationContext context;
 
 	/**
 	 * Gets (and create if necessary) the application context to use. Default
 	 * implementation uses a class path xml application context and calls
 	 * {@link #getApplicationContextLocation()}.
 	 */
-	protected ApplicationContext getContext() {
+	protected ConfigurableApplicationContext getContext() {
 		if (context == null) {
 			context = new ClassPathXmlApplicationContext(
 					getApplicationContextLocation());
@@ -33,12 +33,12 @@ public abstract class AbstractSpringTestCase extends TestCase {
 	}
 
 	protected <T> T getBean(Class<? extends T> clss) {
-		Map<String, T> map = getContext().getBeansOfType(clss);
-		if (map.size() == 1) {
-			return map.values().iterator().next();
-		} else {
+		T bean = SpringUtils.loadSingleFromContext(getContext(), clss);
+		if (bean == null) {
 			throw new SlcException("Cannot retrieve a unique bean of type "
 					+ clss);
+		} else {
+			return bean;
 		}
 	}