(no commit message)

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

diff --git a/system/general/src/test/java/org/wamblee/system/Environment.java b/system/general/src/test/java/org/wamblee/system/Environment.java
index 7209c273f17e705ce68fe9e5492bbb3294978c90..d6465d68e3266b0fc60c0e508ac0db118df8a765 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/Environment.java
+++ b/system/general/src/test/java/org/wamblee/system/Environment.java
@@ -2,22 +2,45 @@ package org.wamblee.system;
 
 import javax.sql.DataSource;
 
+import org.wamblee.test.EventTracker;
 
-public class Environment extends AbstractSubSystem {
+
+public class Environment extends AbstractComponent {
        
-       private static final ServiceDescriptor[] PROVIDED = 
-               new ServiceDescriptor[] { 
-                       new DefaultServiceDescriptor(DataSource.class), 
-                       new DefaultServiceDescriptor(Integer.class)
+       private static final ProvidedInterface[] provided() { 
+               return new ProvidedInterface[] { 
+                       new DefaultProvidedInterface("datasource", DataSource.class), 
+                       new DefaultProvidedInterface("integer", Integer.class)
        };
-
+       }
+       
+       private EventTracker<String> _tracker; 
+       
        public Environment() { 
-               super("environment", PROVIDED, new ServiceDescriptor[0]);
+               super("environment", provided(), new RequiredInterface[0]);
+       }
+       
+       public Environment(EventTracker aTracker) { 
+               this();
+               _tracker = aTracker; 
        }
        
        @Override
-       protected void doStart(String aContext, ServiceRegistry aRegistry, Service[] aRequiredServices) {
-           addService(aContext, aRegistry.register(PROVIDED[0], new Integer(1)));
-           addService(aContext, aRegistry.register(PROVIDED[1], new Integer(2)));
+       protected void doStart(String aContext) {
+           addService(aContext, getProvidedServices()[0], new Integer(1));
+           addService(aContext, getProvidedServices()[1], new Integer(2));
+           track("start." + getName());
+       }
+
+       @Override
+       protected void doStop() {
+               track("stop." + getName());
+       }
+       
+       private void track(String aString) {
+               if ( _tracker == null ) { 
+                       return; 
+               }
+               _tracker.eventOccurred(aString);
        }
 }