X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=system%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fsystem%2Fadapters%2FConstructorConfigurationTest.java;h=3e5f5aa42dc685c4f040cd8062ef2494918a388b;hb=49ce7cb8387601982d5e6ef186ce206d38f6e3d7;hp=ec7070dfddff15c218f11e9e445b7dc4e8675f20;hpb=17775e14ecfb286e59f67117e5cee7e21e95ab1f;p=utils

diff --git a/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
index ec7070df..3e5f5aa4 100644
--- a/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
+++ b/system/general/src/test/java/org/wamblee/system/adapters/ConstructorConfigurationTest.java
@@ -12,18 +12,18 @@
  * 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 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.Scope;
 import org.wamblee.system.core.SystemAssemblyException;
-
 import org.wamblee.test.AssertionUtils;
 
-import java.util.List;
-
 /**
  * 
  * @author $author$
@@ -42,11 +42,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -54,6 +55,7 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         try {
             ConstructorConfiguration config = new ConstructorConfiguration(
                 X2.class).greedy();
+            ignoredVariable(config);
         } catch (SystemAssemblyException e) {
             // e.printStackTrace();
             return;
@@ -62,6 +64,10 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         fail();
     }
 
+    private static void ignoredVariable(Object aObject) {
+        // for findbugs.
+    }
+
     public void testSpecificConstructor() {
         ConstructorConfiguration config = new ConstructorConfiguration(X2.class)
             .select(String.class);
@@ -72,11 +78,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         assertEquals(1, required.size());
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x2(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -85,11 +92,11 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
             .greedy();
         config.getParameters().setValue(0, "bla");
 
+        Scope scope = getScope();
         config.create(scope);
 
-        AssertionUtils.assertEquals(new String[] { "x1(bla)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
-                .toArray());
+        AssertionUtils.assertEquals(new String[] { "x1(bla)" }, AdapterTestCase
+            .getEventTracker().getEvents(Thread.currentThread()).toArray());
     }
 
     public void testOptionalValueProvided() {
@@ -104,11 +111,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         assertEquals(1, required.size());
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
@@ -118,17 +126,17 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         config.getParameters().setOptional(0);
         assertTrue(config.getRequiredInterfaces().get(0).isOptional());
 
+        Scope scope = getScope();
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x1(null)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 
     public void testIgnoredNonPublic() {
         ConstructorConfiguration config = new ConstructorConfiguration(X3.class)
             .greedy();
-        List<RequiredInterface> required = config.getRequiredInterfaces();
         assertEquals(0, config.getParameters().getTypes().length);
     }
 
@@ -144,11 +152,12 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
 
         required.get(0).setProvider(provided);
 
+        Scope scope = getScope();
         scope.publishInterface(provided, "hello");
         config.create(scope);
 
         AssertionUtils.assertEquals(new String[] { "x3(hello)" },
-            AdapterTestCase.EVENT_TRACKER.getEvents(Thread.currentThread())
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
                 .toArray());
     }
 }