(no commit message)

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

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java
index 95a26b2bfe541deb5af2f1849c92ac587816cfd5..ea381ca9b32bd3c0c7291656b037d7163b17532f 100644 (file)
--- a/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ObjectAdapterTest.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.
@@ -17,17 +17,11 @@ package org.wamblee.system.adapters;
 
 import org.wamblee.system.container.Container;
 import org.wamblee.system.core.Component;
-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;
-
 /**
  * 
  * @author $author$
@@ -56,12 +50,12 @@ public class ObjectAdapterTest extends AdapterTestCase {
             x4Adapter, x8Adapter }, new ProvidedInterface[0],
             new RequiredInterface[0]);
 
-        EVENT_TRACKER.clear();
+        getEventTracker().clear();
 
         Scope scope = container.start();
         AssertionUtils.assertEquals(new String[] { "x1(hello)", "x4(x1)",
-            "x8.setX4(x4)" }, EVENT_TRACKER.getEvents(Thread.currentThread())
-            .toArray());
+            "x8.setX4(x4)" }, getEventTracker().getEvents(
+            Thread.currentThread()).toArray());
 
         Object obj1 = scope.getRuntime(x1Adapter);
         assertTrue(obj1 instanceof X1);