[picocontainer-scm] [5829] java/2.x/trunk/pico/container/src: add coverage in advance of PICO-392

Revision 5829
Author paul
Date 2012-10-18 08:54:38 -0500 (Thu, 18 Oct 2012)

Log Message

add coverage in advance of PICO-392

Modified Paths

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java

- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MethodInjector.java

- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/NamedMethodInjectorTestCase.java

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java (5828 => 5829)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2012-10-16 23:17:47 UTC (rev 5828)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/AbstractInjector.java 2012-10-18 13:54:38 UTC (rev 5829)
@@ -9,7 +9,6 @@
*****************************************************************************/
package org.picocontainer.injectors;

-import org.picocontainer.ComponentAdapter;
import org.picocontainer.ComponentMonitor;
import org.picocontainer.ObjectReference;
import org.picocontainer.Parameter;
@@ -28,7 +27,6 @@
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;

/**
* This ComponentAdapter will instantiate a new object for each call to

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java (5828 => 5829)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2012-10-16 23:17:47 UTC (rev 5828)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/ConstructorInjector.java 2012-10-18 13:54:38 UTC (rev 5829)
@@ -28,7 +28,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MethodInjector.java (5828 => 5829)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MethodInjector.java 2012-10-16 23:17:47 UTC (rev 5828)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/MethodInjector.java 2012-10-18 13:54:38 UTC (rev 5829)
@@ -208,14 +208,7 @@

@Override
protected Method getInjectorMethod() {
- Method[] methods;
- try {
- methods = super.getComponentImplementation().getMethods();
- } catch (AmbiguousComponentResolutionException e) {
- e.setComponent(getComponentImplementation());
- throw e;
- }
- for (Method method : methods) {
+ for (Method method : super.getComponentImplementation().getMethods()) {
if (injectionMethodNames.contains(method.getName())) {
return method;
}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/NamedMethodInjectorTestCase.java (5828 => 5829)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/NamedMethodInjectorTestCase.java 2012-10-16 23:17:47 UTC (rev 5828)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/NamedMethodInjectorTestCase.java 2012-10-18 13:54:38 UTC (rev 5829)
@@ -1,5 +1,6 @@
package org.picocontainer.injectors;

+import junit.framework.Assert;
import org.junit.Test;
import org.picocontainer.DefaultPicoContainer;
import org.picocontainer.Parameter;
@@ -47,7 +48,10 @@
.getComponent(Windmill.class);
fail("should have barfed");
} catch (AbstractInjector.AmbiguousComponentResolutionException e) {
- // expected
+ Assert.assertEquals(Windmill.class + " needs a 'java.lang.String' injected via 'public void org.picocontainer.injectors.NamedMethodInjectorTestCase$Windmill.setWind(java.lang.String)', " +
+ "but there are too many choices to inject. " +
+ "These:[class java.lang.String, class java.lang.String], " +
+ "refer http://picocontainer.org/ambiguous-injectable-help.html", e.getMessage());
}
}

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email