(no commit message)

[utils] / system / general / src / test / java / org / wamblee / system / core / Environment.java

diff --git a/system/general/src/test/java/org/wamblee/system/core/Environment.java b/system/general/src/test/java/org/wamblee/system/core/Environment.java
index 00d947b7504e06948eedb178dc1ef6636cfd7308..d2c052715e7089f8a4a7a2d0a3b9584fe47aedc7 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/core/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/core/Environment.java
@@ -23,21 +23,31 @@ import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
 import org.wamblee.test.EventTracker;
 
-public class Environment extends AbstractComponent {
+public class Environment extends AbstractComponent<Object> {
 
-       private static final ProvidedInterface[] provided() {
+       private static final ProvidedInterface[] provided(String aPrefix) {
                return new ProvidedInterface[] {
-                               new DefaultProvidedInterface("datasource", String.class),
-                               new DefaultProvidedInterface("integer", Integer.class) };
+                               new DefaultProvidedInterface(aPrefix + "datasource", String.class),
+                               new DefaultProvidedInterface(aPrefix + "integer", Integer.class) };
        }
 
        private EventTracker<String> _tracker;
        private double _random;
 
        public Environment() {
-               super("environment", provided(), new RequiredInterface[0]);
-               _random = Math.random();
+               this("environment");
        }
+       
+       public Environment(String aName) {
+       this(aName, "");
+    }
+       
+       public Environment(String aName, String aPrefix) {
+        super(aName, provided(aPrefix), new RequiredInterface[0]);
+        _random = Math.random();
+    }
+
+
 
        public Environment(EventTracker aTracker) {
                this();
@@ -49,13 +59,13 @@ public class Environment extends AbstractComponent {
        }
 
        public String getString() {
-               return "Hello";
+               return getName() + ".hello";
        }
 
        @Override
        protected Object doStart(Scope aScope) {
-               addInterface(getProvidedInterfaces()[0], getString(), aScope);
-               addInterface(getProvidedInterfaces()[1], getInteger(), aScope);
+               addInterface(getProvidedInterfaces().get(0), getString(), aScope);
+               addInterface(getProvidedInterfaces().get(1), getInteger(), aScope);
                track("start." + getName());
                return _random;
        }