X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FConstructorConfigurationTest.java;h=d1ced96f9b7effb7f3c320203f3cacf0c56cf529;hb=5e33a52ba36ac928b9863ddd79d2d09f6a308af6;hp=15eff28e9a282066857107f24c8f72ef32b8de82;hpb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
index 15eff28e..d1ced96f 100644
--- a/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
@@ -1,29 +1,29 @@
 /*
- * Copyright 2008 the original author or authors.
- *
+ * Copyright 2005-2010 the original author or authors.
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */
+ */ 
 package org.wamblee.system.adapters;
 
+import java.util.List;
+
 import org.wamblee.system.core.DefaultProvidedInterface;
 import org.wamblee.system.core.ProvidedInterface;
 import org.wamblee.system.core.RequiredInterface;
+import org.wamblee.system.core.Scope;
 import org.wamblee.system.core.SystemAssemblyException;
-
 import org.wamblee.test.AssertionUtils;
 
-import java.util.List;
-
 /**
  * 
  * @author $author$
@@ -42,11 +42,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -72,11 +73,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         assertEquals(1, required.size());
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x2(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -85,10 +87,11 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
             .greedy();
         config.getParameters().setValue(0, "bla");
 
+        Scope scope = getScope();
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(bla)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -104,11 +107,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         assertEquals(1, required.size());
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -118,10 +122,11 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         config.getParameters().setOptional(0);
         assertTrue(config.getRequiredInterfaces().get(0).isOptional());
 
+        Scope scope = getScope();
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(null)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -144,11 +149,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x3(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 }