X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FEnvironment.java;h=4b791d0570768f9b192e8da21131613d6ea9a42e;hb=ee26f9544a0bf7f49390990c68981676e0e51014;hp=00d947b7504e06948eedb178dc1ef6636cfd7308;hpb=fc10e15e031cf409146b04cbb5e98b649c6ccddc;p=utils

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 00d947b7..4b791d05 100644
--- 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,35 @@ 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 static int COUNT = 0; 
 
 	private EventTracker<String> _tracker;
 	private double _random;
+	private int _integer; 
 
 	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();
+        _integer = COUNT++;
+    }
+
+
 
 	public Environment(EventTracker aTracker) {
 		this();
@@ -45,17 +59,17 @@ public class Environment extends AbstractComponent {
 	}
 
 	public Integer getInteger() {
-		return 2;
+		return _integer;
 	}
 
 	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;
 	}