Various changes

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / unit / AbstractSpringTestCase.java

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 5166242b4626c9c4873997565af672068eea715f..4ad916d57018f671f5554a3aaab9ea9243118134 100644 (file)
--- 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,17 +1,19 @@
 package org.argeo.slc.unit;\r
 \r
-import java.util.Map;\r
-\r
 import junit.framework.TestCase;\r
 \r
 import org.springframework.context.ApplicationContext;\r
 import org.springframework.context.support.ClassPathXmlApplicationContext;\r
 \r
+import org.apache.commons.logging.Log;\r
+import org.apache.commons.logging.LogFactory;\r
+\r
 import org.argeo.slc.core.SlcException;\r
-import org.argeo.slc.core.process.SlcExecution;\r
+import org.argeo.slc.spring.SpringUtils;\r
 \r
 /** Helper for tests using a Spring application co,text. */\r
 public abstract class AbstractSpringTestCase extends TestCase {\r
+       protected final Log log = LogFactory.getLog(getClass());\r
        private ApplicationContext context;\r
 \r
        /**\r
@@ -33,12 +35,12 @@ public abstract class AbstractSpringTestCase extends TestCase {
        }\r
 \r
        protected <T> T getBean(Class<? extends T> clss) {\r
-               Map<String, T> map = getContext().getBeansOfType(clss);\r
-               if (map.size() == 1) {\r
-                       return map.values().iterator().next();\r
-               } else {\r
+               T bean = SpringUtils.loadSingleFromContext(getContext(), clss);\r
+               if (bean == null) {\r
                        throw new SlcException("Cannot retrieve a unique bean of type "\r
                                        + clss);\r
+               } else {\r
+                       return bean;\r
                }\r
        }\r
 \r