X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FConstructorConfigurationTest.java;h=fe0ece622431a7850ab50585d37b510a57feac8a;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=1ee899f869c8ad5947a5352a7e83a9c0aaf6d2bb;hpb=7273d083a2f03cd3d2061d3c6628a46b679e718b;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 1ee899f8..fe0ece62 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
@@ -18,15 +18,10 @@ package org.wamblee.system.adapters;
 import java.util.List;
 
 import org.wamblee.system.core.DefaultProvidedInterface;
-import org.wamblee.system.core.DefaultScope;
 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 org.wamblee.test.EventTracker;
-
-import junit.framework.TestCase;
 
 public class ConstructorConfigurationTest extends AdapterTestCase {
 
@@ -42,8 +37,8 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
 		required.get(0).setProvider(provided);
 
-		provided.publish("hello", _scope);
-		config.create(_scope);
+		scope.publishInterface(provided, "hello");
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x1(hello)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());
@@ -70,8 +65,8 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 		assertEquals(1, required.size());
 		required.get(0).setProvider(provided);
 
-		provided.publish("hello", _scope);
-		config.create(_scope);
+		scope.publishInterface(provided, "hello");
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x2(hello)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());
@@ -82,7 +77,7 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 				.greedy();
 		config.getParameters().setValue(0, "bla");
 
-		config.create(_scope);
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x1(bla)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());
@@ -99,8 +94,8 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 		assertEquals(1, required.size());
 		required.get(0).setProvider(provided);
 
-		provided.publish("hello", _scope);
-		config.create(_scope);
+		scope.publishInterface(provided, "hello");
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x1(hello)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());
@@ -112,7 +107,7 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 		config.getParameters().setOptional(0);
 		assertTrue(config.getRequiredInterfaces().get(0).isOptional());
 
-		config.create(_scope);
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x1(null)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());
@@ -137,8 +132,8 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
 		required.get(0).setProvider(provided);
 
-		provided.publish("hello", _scope);
-		config.create(_scope);
+		scope.publishInterface(provided, "hello");
+		config.create(scope);
 
 		AssertionUtils.assertEquals(new String[] { "x3(hello)" }, AdapterTestCase.EVENT_TRACKER
 				.getEvents(Thread.currentThread()).toArray());