[picocontainer-scm] [5609] java/2.x/trunk/pico/container/src/test/org/picocontainer: picobuilder work for new injection type

Revision 5609
Author paul
Date 2010-02-12 17:13:48 -0600 (Fri, 12 Feb 2010)

Log Message

picobuilder work for new 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 (5608 => 5609)

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/PicoBuilder.java 2010-02-12 23:09:46 UTC (rev 5608)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/PicoBuilder.java 2010-02-12 23:13:48 UTC (rev 5609)
@@ -9,31 +9,33 @@
*****************************************************************************/
package org.picocontainer;

-import static org.picocontainer.behaviors.Behaviors.caching;
-import static org.picocontainer.behaviors.Behaviors.implementationHiding;
+import org.picocontainer.behaviors.Automating;
+import org.picocontainer.behaviors.Locking;
import org.picocontainer.behaviors.PropertyApplying;
import org.picocontainer.behaviors.Synchronizing;
-import org.picocontainer.behaviors.Locking;
-import org.picocontainer.behaviors.Automating;
-import org.picocontainer.injectors.MethodInjection;
import org.picocontainer.containers.EmptyPicoContainer;
import org.picocontainer.containers.TransientPicoContainer;
-import static org.picocontainer.injectors.Injectors.CDI;
-import static org.picocontainer.injectors.Injectors.annotatedMethodDI;
-import static org.picocontainer.injectors.Injectors.annotatedFieldDI;
-import static org.picocontainer.injectors.Injectors.SDI;
-import static org.picocontainer.injectors.Injectors.adaptiveDI;
+import org.picocontainer.injectors.MethodInjection;
+import org.picocontainer.lifecycle.JavaEE5LifecycleStrategy;
import org.picocontainer.lifecycle.NullLifecycleStrategy;
import org.picocontainer.lifecycle.ReflectionLifecycleStrategy;
import org.picocontainer.lifecycle.StartableLifecycleStrategy;
-import org.picocontainer.lifecycle.JavaEE5LifecycleStrategy;
import org.picocontainer.monitors.ConsoleComponentMonitor;
import org.picocontainer.monitors.NullComponentMonitor;

import java.util.ArrayList;
+import java.util.List;
import java.util.Stack;
-import java.util.List;

+import static org.picocontainer.behaviors.Behaviors.caching;
+import static org.picocontainer.behaviors.Behaviors.implementationHiding;
+import static org.picocontainer.injectors.Injectors.CDI;
+import static org.picocontainer.injectors.Injectors.SDI;
+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.namedMethod;
+
/**
* Helps assembles the myriad items available to a picocontainer.
* <p>Simple Example:</p>
@@ -224,6 +226,11 @@
return this;
}

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

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

--- java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injectors.java 2010-02-12 23:09:46 UTC (rev 5608)
+++ java/2.x/trunk/pico/container/src/java/org/picocontainer/injectors/Injectors.java 2010-02-12 23:13:48 UTC (rev 5609)
@@ -9,10 +9,6 @@
*****************************************************************************/
package org.picocontainer.injectors;

-import org.picocontainer.injectors.AdaptingInjection;
-import org.picocontainer.injectors.SetterInjection;
-import org.picocontainer.injectors.ConstructorInjection;
-import org.picocontainer.injectors.AnnotatedMethodInjection;
import org.picocontainer.InjectionFactory;

public class Injectors {
@@ -29,6 +25,10 @@
return new ConstructorInjection();
}

+ public static InjectionFactory namedMethod() {
+ return new NamedMethodInjection();
+ }
+
public static InjectionFactory annotatedMethodDI() {
return new AnnotatedMethodInjection();
}

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

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2010-02-12 23:09:46 UTC (rev 5608)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/PicoBuilderTestCase.java 2010-02-12 23:13:48 UTC (rev 5609)
@@ -9,16 +9,7 @@
*****************************************************************************/
package org.picocontainer;

-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.picocontainer.behaviors.Behaviors.caching;
-import static org.picocontainer.behaviors.Behaviors.implementationHiding;
-import static org.picocontainer.behaviors.Behaviors.synchronizing;
-import static org.picocontainer.injectors.Injectors.SDI;
-
-import java.util.HashMap;
-import java.util.Properties;
-
+import com.thoughtworks.xstream.XStream;
import org.junit.Before;
import org.junit.Test;
import org.picocontainer.behaviors.Caching;
@@ -31,16 +22,25 @@
import org.picocontainer.injectors.AnnotatedFieldInjection;
import org.picocontainer.injectors.AnnotatedMethodInjection;
import org.picocontainer.injectors.ConstructorInjection;
+import org.picocontainer.injectors.NamedMethodInjection;
import org.picocontainer.injectors.SetterInjection;
+import org.picocontainer.lifecycle.JavaEE5LifecycleStrategy;
import org.picocontainer.lifecycle.NullLifecycleStrategy;
import org.picocontainer.lifecycle.ReflectionLifecycleStrategy;
import org.picocontainer.lifecycle.StartableLifecycleStrategy;
-import org.picocontainer.lifecycle.JavaEE5LifecycleStrategy;
import org.picocontainer.monitors.ConsoleComponentMonitor;
import org.picocontainer.monitors.NullComponentMonitor;

-import com.thoughtworks.xstream.XStream;
+import java.util.HashMap;
+import java.util.Properties;
+
import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.picocontainer.behaviors.Behaviors.caching;
+import static org.picocontainer.behaviors.Behaviors.implementationHiding;
+import static org.picocontainer.behaviors.Behaviors.synchronizing;
+import static org.picocontainer.injectors.Injectors.SDI;

@SuppressWarnings("serial")
public class PicoBuilderTestCase {
@@ -252,6 +252,13 @@
assertEquals(xs.toXML(expected), xs.toXML(actual));
}

+ @Test public void testWithNamedMethodInjection() {
+ MutablePicoContainer actual = new PicoBuilder().withNamedMethodInjection().build();
+ MutablePicoContainer expected = new DefaultPicoContainer(new NamedMethodInjection(),
+ 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