Improve unit tests

[gpl/argeo-slc.git] / org.argeo.slc.core / src / main / java / org / argeo / slc / core / test / context / SimpleContextAware.java

diff --git a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
index 9ce69cdee1e83ae5121a44fad632aca377e962b5..eee918c64509103df3ed0f8266246bee55167cd5 100644 (file)
--- a/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
+++ b/org.argeo.slc.core/src/main/java/org/argeo/slc/core/test/context/SimpleContextAware.java
@@ -1,17 +1,21 @@
 package org.argeo.slc.core.test.context;\r
 \r
-import java.beans.BeanInfo;\r
 import java.util.Map;\r
 import java.util.TreeMap;\r
 \r
 import org.springframework.beans.factory.InitializingBean;\r
 \r
+import org.argeo.slc.core.SlcException;\r
+\r
 public class SimpleContextAware implements ContextAware, InitializingBean {\r
-       private SimpleParentContextAware parentContext;\r
+       private ParentContextAware parentContext;\r
 \r
        private Map<String, Object> values = new TreeMap<String, Object>();\r
        private Map<String, Object> expectedValues = new TreeMap<String, Object>();\r
 \r
+       private String contextSkipFlag = "!";\r
+       private String contextAnyFlag = "*";\r
+\r
        public Map<String, Object> getValues() {\r
                return values;\r
        }\r
@@ -29,12 +33,14 @@ public class SimpleContextAware implements ContextAware, InitializingBean {
        }\r
 \r
        /** Used to add this context as a child by setting a property. */\r
-       public void setParentContext(SimpleParentContextAware parentContextAware) {\r
-               parentContextAware.addChildContext(this);\r
+       public void setParentContext(ParentContextAware parentContextAware) {\r
+               if (parentContext != null)\r
+                       throw new SlcException("Parent context already set");\r
                this.parentContext = parentContextAware;\r
+               this.parentContext.addChildContext(this);\r
        }\r
 \r
-       protected SimpleParentContextAware getParentContext() {\r
+       protected ParentContextAware getParentContext() {\r
                return parentContext;\r
        }\r
 \r
@@ -44,4 +50,20 @@ public class SimpleContextAware implements ContextAware, InitializingBean {
                }\r
        }\r
 \r
+       public String getContextSkipFlag() {\r
+               return contextSkipFlag;\r
+       }\r
+\r
+       public void setContextSkipFlag(String contextSkipFlag) {\r
+               this.contextSkipFlag = contextSkipFlag;\r
+       }\r
+\r
+       public String getContextAnyFlag() {\r
+               return contextAnyFlag;\r
+       }\r
+\r
+       public void setContextAnyFlag(String contextAnyFlag) {\r
+               this.contextAnyFlag = contextAnyFlag;\r
+       }\r
+\r
 }\r