X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fcore%2FEnvironment.java;h=c202d1ab23d317e83701bd8ba71d90e555466810;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=00d947b7504e06948eedb178dc1ef6636cfd7308;hpb=dea786c9d49228a37cb5fd5b4113b86d9f6cddbf;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..c202d1ab 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,56 +23,70 @@ 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 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();
-		_tracker = aTracker;
+		tracker = aTracker;
 	}
 
 	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;
+		return random;
 	}
 
 	@Override
 	protected void doStop(Object aRuntime) {
 		track("stop." + getName());
-		if (_random != (Double) aRuntime) {
+		if (random != (Double) aRuntime) {
 			throw new IllegalArgumentException("Wrong runtime: expected "
-					+ _random + " but got " + aRuntime);
+					+ random + " but got " + aRuntime);
 		}
 	}
 
 	private void track(String aString) {
-		if (_tracker == null) {
+		if (tracker == null) {
 			return;
 		}
-		_tracker.eventOccurred(aString);
+		tracker.eventOccurred(aString);
 	}
 }