checkstyle

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

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 ec7070dfddff15c218f11e9e445b7dc4e8675f20..d1ced96f9b7effb7f3c320203f3cacf0c56cf529 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
@@ -15,15 +15,15 @@
  */ 
 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());
     }
 }