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=cf0491738740585dc89da0c90e7395c691692146;hpb=ddd261f331280640c5b53c7128230b629ebcd268;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 cf049173..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
@@ -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,53 +15,47 @@
  */
 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;
-
-
 /**
- * DOCUMENT ME!
- *
+ * 
  * @author $author$
  * @version $Revision$
-  */
+ */
 public class ConstructorConfigurationTest extends AdapterTestCase {
-    /**
-     * DOCUMENT ME!
-     */
     public void testGreedyUnique() {
-        ConstructorConfiguration config   = new ConstructorConfiguration(X1.class)
+        ConstructorConfiguration config = new ConstructorConfiguration(X1.class)
             .greedy();
-        ProvidedInterface        provided = new DefaultProvidedInterface("arg",
-                String.class);
-        List<RequiredInterface>  required = config.getRequiredInterfaces();
+        ProvidedInterface provided = new DefaultProvidedInterface("arg",
+            String.class);
+        List<RequiredInterface> required = config.getRequiredInterfaces();
 
         assertEquals(1, required.size());
         assertFalse(required.get(0).isOptional());
 
         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())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testGreedyNonUnique() {
         try {
-            ConstructorConfiguration config = new ConstructorConfiguration(X2.class)
-                .greedy();
+            ConstructorConfiguration config = new ConstructorConfiguration(
+                X2.class).greedy();
+            ignoredVariable(config);
         } catch (SystemAssemblyException e) {
             // e.printStackTrace();
             return;
@@ -70,111 +64,100 @@ public class ConstructorConfigurationTest extends AdapterTestCase {
         fail();
     }
 
-    /**
-     * DOCUMENT ME!
-     */
+    private static void ignoredVariable(Object aObject) {
+        // for findbugs.
+    }
+
     public void testSpecificConstructor() {
-        ConstructorConfiguration config   = new ConstructorConfiguration(X2.class)
+        ConstructorConfiguration config = new ConstructorConfiguration(X2.class)
             .select(String.class);
-        ProvidedInterface        provided = new DefaultProvidedInterface("arg",
-                String.class);
-        List<RequiredInterface>  required = config.getRequiredInterfaces();
+        ProvidedInterface provided = new DefaultProvidedInterface("arg",
+            String.class);
+        List<RequiredInterface> required = config.getRequiredInterfaces();
 
         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())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testSetValue() {
         ConstructorConfiguration config = new ConstructorConfiguration(X1.class)
             .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());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testOptionalValueProvided() {
         ConstructorConfiguration config = new ConstructorConfiguration(X1.class)
             .greedy();
         config.getParameters().setOptional(0);
 
-        ProvidedInterface       provided = new DefaultProvidedInterface("arg",
-                String.class);
+        ProvidedInterface provided = new DefaultProvidedInterface("arg",
+            String.class);
         List<RequiredInterface> required = config.getRequiredInterfaces();
 
         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())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testOptionalValueMissing() {
         ConstructorConfiguration config = new ConstructorConfiguration(X1.class)
             .greedy();
         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())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testIgnoredNonPublic() {
-        ConstructorConfiguration config   = new ConstructorConfiguration(X3.class)
+        ConstructorConfiguration config = new ConstructorConfiguration(X3.class)
             .greedy();
-        List<RequiredInterface>  required = config.getRequiredInterfaces();
         assertEquals(0, config.getParameters().getTypes().length);
     }
 
-    /**
-     * DOCUMENT ME!
-     */
     public void testNonPublicConstructor() {
-        ConstructorConfiguration config   = new ConstructorConfiguration(X3.class).setNonPublic(true)
-            .greedy();
-        ProvidedInterface        provided = new DefaultProvidedInterface("arg",
-                String.class);
-        List<RequiredInterface>  required = config.getRequiredInterfaces();
+        ConstructorConfiguration config = new ConstructorConfiguration(X3.class)
+            .setNonPublic(true).greedy();
+        ProvidedInterface provided = new DefaultProvidedInterface("arg",
+            String.class);
+        List<RequiredInterface> required = config.getRequiredInterfaces();
 
         assertEquals(1, required.size());
         assertFalse(required.get(0).isOptional());
 
         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())
-            .toArray());
+            AdapterTestCase.getEventTracker().getEvents(Thread.currentThread())
+                .toArray());
     }
 }