X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FClassConfigurationTest.java;h=1271b922cac8aa8406c0a7bc9566faa8e1a638fa;hb=8de36ff0206c996baf3ee4adc3e2293b12ff5f39;hp=c0fc039815aab0d7963c30ce055128686a941d20;hpb=b2c41b5ad0368ce28715001b6a06381b9eaf7c49;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java
index c0fc0398..1271b922 100644
--- a/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ClassConfigurationTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2008 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.
@@ -15,24 +15,30 @@
  */
 package org.wamblee.system.adapters;
 
-import java.util.Collections;
-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.RequiredInterfaceComparator;
+
 import org.wamblee.test.AssertionUtils;
 
-public class ClassConfigurationTest extends AdapterTestCase {
+import java.util.Collections;
+import java.util.List;
 
+/**
+ * 
+ * @author $author$
+ * @version $Revision$
+ */
+public class ClassConfigurationTest extends AdapterTestCase {
     public void testConstructorConfig() {
         ClassConfiguration classConfig = new ClassConfiguration(X1.class);
 
         ConstructorConfiguration config = classConfig.getConstructorConfig()
-                .greedy();
+            .greedy();
+
         ProvidedInterface provided = new DefaultProvidedInterface("arg",
-                String.class);
+            String.class);
         List<RequiredInterface> required = classConfig.getRequiredInterfaces();
 
         assertEquals(1, required.size());
@@ -40,23 +46,25 @@ public class ClassConfigurationTest extends AdapterTestCase {
 
         required.get(0).setProvider(provided);
 
-        provided.publish("hello", _scope);
-        classConfig.create(_scope);
+        scope.publishInterface(provided, "hello");
+        classConfig.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-                AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
-                        .toArray());
+            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+                .toArray());
     }
 
     public void testConstructorConfigWithSetters() {
         ClassConfiguration classConfig = new ClassConfiguration(X7.class);
 
         classConfig.getConstructorConfig().select(Boolean.class);
-        classConfig.getObjectConfig().getSetterConfig().values("port").setValue(0, 10);
-        
-        ProvidedInterface providedBoolean = new DefaultProvidedInterface("boolean",
-                Boolean.class);
-        ProvidedInterface providedHost = new DefaultProvidedInterface("host", String.class);
+        classConfig.getObjectConfig().getSetterConfig().initAllSetters()
+            .values("setPort").setValue(0, 10);
+
+        ProvidedInterface providedBoolean = new DefaultProvidedInterface(
+            "boolean", Boolean.class);
+        ProvidedInterface providedHost = new DefaultProvidedInterface("host",
+            String.class);
         List<RequiredInterface> required = classConfig.getRequiredInterfaces();
 
         Collections.sort(required, new RequiredInterfaceComparator());
@@ -66,21 +74,21 @@ public class ClassConfigurationTest extends AdapterTestCase {
         required.get(0).setProvider(providedBoolean);
         required.get(1).setProvider(providedHost);
 
-        providedBoolean.publish(true, _scope);
-        providedHost.publish("host.name.org", _scope);
-        
-        Object obj = classConfig.create(_scope);
+        scope.publishInterface(providedBoolean, true);
+        scope.publishInterface(providedHost, "host.name.org");
+
+        Object obj = classConfig.create(scope);
         assertTrue(obj instanceof X7);
-        X7 x7 = (X7)obj;
+
+        X7 x7 = (X7) obj;
         assertNotNull(x7.getBoolean());
         assertTrue(x7.getBoolean());
         assertNull(x7.getHost());
         assertNull(x7.getPort());
 
-        classConfig.inject(_scope, obj);
-        
+        classConfig.inject(scope, obj);
+
         assertEquals("host.name.org", x7.getHost());
         assertEquals(10, x7.getPort().intValue());
     }
-
 }