X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Funit%2FAbstractSpringTestCase.java;h=4ad916d57018f671f5554a3aaab9ea9243118134;hb=3b00f618dbc08ee5f28861d0bcf5079e6c3d8da4;hp=f0af1086ea977209e9c9def97e2a8c59d3439031;hpb=4702ba4b34097101ddfa7806f25ae5f698dbf0f4;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 f0af1086e..4ad916d57 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,7 +1,5 @@
 package org.argeo.slc.unit;
 
-import java.util.Map;
-
 import junit.framework.TestCase;
 
 import org.springframework.context.ApplicationContext;
@@ -11,7 +9,7 @@ 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;
 
 /** Helper for tests using a Spring application co,text. */
 public abstract class AbstractSpringTestCase extends TestCase {
@@ -37,12 +35,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;
 		}
 	}