(no commit message)

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

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java
index 6a48e045d28a38bc89fa6e775d4c16a27e1acadb..e2c146cb752f6fa075ffbafa4233029ab19d6875 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ClassAdapterTest.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.
@@ -23,17 +23,12 @@ import org.wamblee.system.core.Scope;
 
 import org.wamblee.test.AssertionUtils;
 
-
 /**
- * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
-  */
+ */
 public class ClassAdapterTest extends AdapterTestCase {
-    /**
-     * DOCUMENT ME!
-     */
     public void testSimpleConstructorInjection() {
         ClassConfiguration x1Config = new ClassConfiguration(X1.class);
         x1Config.getObjectConfig().getSetterConfig().initAllSetters();
@@ -45,13 +40,12 @@ public class ClassAdapterTest extends AdapterTestCase {
         ClassAdapter x1Adapter = new ClassAdapter("x1", x1Config);
         ClassAdapter x4Adapter = new ClassAdapter("x4", x4Config);
 
-        Container    container = new Container("top",
-                new Component[] { x1Adapter, x4Adapter },
-                new ProvidedInterface[0], new RequiredInterface[0]);
+        Container container = new Container("top", new Component[] { x1Adapter,
+            x4Adapter }, new ProvidedInterface[0], new RequiredInterface[0]);
 
-        Scope        scope     = container.start();
+        Scope scope = container.start();
         AssertionUtils.assertEquals(new String[] { "x1(hello)", "x4(x1)" },
-            EVENT_TRACKER.getEvents(Thread.currentThread()).toArray());
+            getEventTracker().getEvents(Thread.currentThread()).toArray());
 
         Object obj1 = scope.getRuntime(x1Adapter);
         assertTrue(obj1 instanceof X1);
@@ -65,9 +59,6 @@ public class ClassAdapterTest extends AdapterTestCase {
         assertSame(x1, x4.getX1());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testConstructorAndSetterInjection() {
         ClassConfiguration x1Config = new ClassConfiguration(X1.class);
         x1Config.getObjectConfig().getSetterConfig().initAllSetters();
@@ -83,14 +74,14 @@ public class ClassAdapterTest extends AdapterTestCase {
         ClassAdapter x4Adapter = new ClassAdapter("x4", x4Config);
         ClassAdapter x8Adapter = new ClassAdapter("x8", x8Config);
 
-        Container    container = new Container("top",
-                new Component[] { x1Adapter, x4Adapter, x8Adapter },
-                new ProvidedInterface[0], new RequiredInterface[0]);
+        Container container = new Container("top", new Component[] { x1Adapter,
+            x4Adapter, x8Adapter }, new ProvidedInterface[0],
+            new RequiredInterface[0]);
 
-        Scope        scope     = container.start();
-        AssertionUtils.assertEquals(new String[] {
-                "x1(hello)", "x4(x1)", "x8(x1)", "x8.setX4(x4)"
-            }, EVENT_TRACKER.getEvents(Thread.currentThread()).toArray());
+        Scope scope = container.start();
+        AssertionUtils.assertEquals(new String[] { "x1(hello)", "x4(x1)",
+            "x8(x1)", "x8.setX4(x4)" }, getEventTracker().getEvents(
+            Thread.currentThread()).toArray());
 
         Object obj1 = scope.getRuntime(x1Adapter);
         assertTrue(obj1 instanceof X1);
@@ -100,9 +91,9 @@ public class ClassAdapterTest extends AdapterTestCase {
 
         Object obj8 = scope.getRuntime(x8Adapter);
 
-        X1     x1 = (X1) obj1;
-        X4     x4 = (X4) obj4;
-        X8     x8 = (X8) obj8;
+        X1 x1 = (X1) obj1;
+        X4 x4 = (X4) obj4;
+        X8 x8 = (X8) obj8;
 
         assertSame(x4, x8.getX4());
         assertSame(x1, x8.getX1());