[picocontainer-scm] [5610] java/2.x/trunk/pico/container/src/test/org/picocontainer: picobuilder work for older (missing) injection type

Revision 5610
Author paul
Date 2010-02-12 19:00:02 -0600 (Fri, 12 Feb 2010)

Log Message

picobuilder work for older (missing) injection type

Modified Paths

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

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

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

Diff

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/PicoBuilder.java (5609 => 5610)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/PicoBuilder.java 2010-02-12 23:13:48 UTC (rev 5609)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/PicoBuilder.java 2010-02-13 01:00:02 UTC (rev 5610)
@@ -34,6 +34,7 @@
import static org.picocontainer.injectors.Injectors.adaptiveDI;
import static org.picocontainer.injectors.Injectors.annotatedFieldDI;
import static org.picocontainer.injectors.Injectors.annotatedMethodDI;
+import static org.picocontainer.injectors.Injectors.namedField;
import static org.picocontainer.injectors.Injectors.namedMethod;

/**
@@ -231,6 +232,11 @@
return this;
}

+ public PicoBuilder withNamedFieldInjection() {
+ injectionType = namedField();
+ return this;
+ }
+
public PicoBuilder withCaching() {
componentFactories.push(caching());
return this;

Modified: java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injectors.java (5609 => 5610)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injectors.java 2010-02-12 23:13:48 UTC (rev 5609)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injectors.java 2010-02-13 01:00:02 UTC (rev 5610)
@@ -29,6 +29,10 @@
return new NamedMethodInjection();
}

+ public static InjectionFactory namedField() {
+ return new NamedFieldInjection();
+ }
+
public static InjectionFactory annotatedMethodDI() {
return new AnnotatedMethodInjection();
}

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java (5609 => 5610)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2010-02-12 23:13:48 UTC (rev 5609)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2010-02-13 01:00:02 UTC (rev 5610)
@@ -22,6 +22,7 @@
import org.picocontainer.injectors.AnnotatedFieldInjection;
import org.picocontainer.injectors.AnnotatedMethodInjection;
import org.picocontainer.injectors.ConstructorInjection;
+import org.picocontainer.injectors.NamedFieldInjection;
import org.picocontainer.injectors.NamedMethodInjection;
import org.picocontainer.injectors.SetterInjection;
import org.picocontainer.lifecycle.JavaEE5LifecycleStrategy;
@@ -222,8 +223,6 @@
}
}

-
-
@Test public void testWithSetterDI() {
MutablePicoContainer actual = new PicoBuilder().withSetterInjection().build();
MutablePicoContainer expected = new DefaultPicoContainer(new SetterInjection(),
@@ -259,6 +258,13 @@
assertEquals(xs.toXML(expected), xs.toXML(actual));
}

+ @Test public void testWithNamedFieldInjection() {
+ MutablePicoContainer actual = new PicoBuilder().withNamedFieldInjection().build();
+ MutablePicoContainer expected = new DefaultPicoContainer(new NamedFieldInjection(),
+ new NullLifecycleStrategy(), new EmptyPicoContainer(), new NullComponentMonitor());
+ assertEquals(xs.toXML(expected), xs.toXML(actual));
+ }
+
@Test public void testWithImplementationHidingAndSetterDI() {
MutablePicoContainer actual = new PicoBuilder().withHiddenImplementations().withSetterInjection().build();
MutablePicoContainer expected = new DefaultPicoContainer(new ImplementationHiding().wrap(new SetterInjection()),

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email