(no commit message)

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

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 5baaad55a877daaf21c4957a4032e8a4bda3a09c..6211d133e6c36d728171fae793c9cfb3b4c258e4 100644 (file)
--- 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.
- *
+ * 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.
@@ -15,66 +15,54 @@
  */
 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.system.core.Scope;
 import org.wamblee.test.AssertionUtils;
 
-import java.util.Collections;
-import java.util.List;
-
-
 /**
- * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
-  */
+ */
 public class ClassConfigurationTest extends AdapterTestCase {
-    /**
-     * DOCUMENT ME!
-     */
     public void testConstructorConfig() {
-        ClassConfiguration       classConfig = new ClassConfiguration(X1.class);
-
-        ConstructorConfiguration config      = classConfig.getConstructorConfig()
-            .greedy();
+        ClassConfiguration classConfig = new ClassConfiguration(X1.class);
 
-        ProvidedInterface        provided    = new DefaultProvidedInterface("arg",
-                String.class);
-        List<RequiredInterface>  required    = classConfig.getRequiredInterfaces();
+        ProvidedInterface provided = new DefaultProvidedInterface("arg",
+            String.class);
+        List<RequiredInterface> required = classConfig.getRequiredInterfaces();
 
         assertEquals(1, required.size());
         assertFalse(required.get(0).isOptional());
 
         required.get(0).setProvider(provided);
 
-        scope.publishInterface(provided, "hello");
-        classConfig.create(scope);
+        getScope().publishInterface(provided, "hello");
+        classConfig.create(getScope());
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testConstructorConfigWithSetters() {
         ClassConfiguration classConfig = new ClassConfiguration(X7.class);
 
         classConfig.getConstructorConfig().select(Boolean.class);
         classConfig.getObjectConfig().getSetterConfig().initAllSetters()
-        .values("setPort").setValue(0, 10);
+            .values("setPort").setValue(0, 10);
 
-        ProvidedInterface       providedBoolean = new DefaultProvidedInterface("boolean",
-                Boolean.class);
-        ProvidedInterface       providedHost    = new DefaultProvidedInterface("host",
-                String.class);
-        List<RequiredInterface> required        = classConfig
-            .getRequiredInterfaces();
+        ProvidedInterface providedBoolean = new DefaultProvidedInterface(
+            "boolean", Boolean.class);
+        ProvidedInterface providedHost = new DefaultProvidedInterface("host",
+            String.class);
+        List<RequiredInterface> required = classConfig.getRequiredInterfaces();
 
         Collections.sort(required, new RequiredInterfaceComparator());
         assertEquals(2, required.size());
@@ -83,6 +71,7 @@ public class ClassConfigurationTest extends AdapterTestCase {
         required.get(0).setProvider(providedBoolean);
         required.get(1).setProvider(providedHost);
 
+        Scope scope = getScope();
         scope.publishInterface(providedBoolean, true);
         scope.publishInterface(providedHost, "host.name.org");