X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FObjectAdapterTest.java;h=a0e477cf0734fb0f18b06a10f5f9e50aad6cc289;hb=9508b56fcc5b2e9addf93106ac2d6f492c21c070;hp=95a26b2bfe541deb5af2f1849c92ac587816cfd5;hpb=539c6d91b7a34e32c6669445d00e9275c337530a;p=utils 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 95a26b2b..a0e477cf 100644 --- 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,33 +1,27 @@ /* - * 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. * See the License for the specific language governing permissions and * limitations under the License. - */ + */ 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,11 +50,11 @@ 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()) + "x8.setX4(x4)" }, getEventTracker().getEvents(Thread.currentThread()) .toArray()); Object obj1 = scope.getRuntime(x1Adapter);