[picocontainer-scm] [5576] java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors: move injector level lifecycle management out to a separate component adapter

Revision 5576
Author paul
Date 2010-02-04 22:49:44 -0600 (Thu, 04 Feb 2010)

Log Message

move injector level lifecycle management out to a separate component adapter

Modified Paths

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

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

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

Diff

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/StoringTestCase.java (5575 => 5576)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/StoringTestCase.java 2010-02-05 04:43:46 UTC (rev 5575)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/StoringTestCase.java 2010-02-05 04:49:44 UTC (rev 5576)
@@ -40,7 +40,7 @@

@Test public void testThatForASingleThreadTheBehaviorIsTheSameAsPlainCaching() {

- DefaultPicoContainer parent = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer parent = new DefaultPicoContainer(new Caching());
Storing storeCaching = new Storing();
DefaultPicoContainer child = new DefaultPicoContainer(storeCaching, new NullLifecycleStrategy(), parent);

@@ -106,7 +106,7 @@
final Foo[] foos = new Foo[4];
final Bar[] bars = new Bar[4];

- DefaultPicoContainer appScope = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer appScope = new DefaultPicoContainer(new Caching());
final DefaultPicoContainer sessionScope = new DefaultPicoContainer(new Storing(), new NullLifecycleStrategy(), appScope);
final DefaultPicoContainer requestScope = new DefaultPicoContainer(new Storing(), new NullLifecycleStrategy(), sessionScope);

@@ -146,7 +146,7 @@

final Foo[] foos = new Foo[4];

- DefaultPicoContainer parent = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer parent = new DefaultPicoContainer(new Caching());
final Storing storeCaching = new Storing();
final DefaultPicoContainer child = new DefaultPicoContainer(storeCaching, new NullLifecycleStrategy(), parent);

@@ -192,7 +192,7 @@
@Test public void testThatCacheMapCanBeResetOnASubsequentThreadSimulatingASessionConcept() {

- DefaultPicoContainer parent = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer parent = new DefaultPicoContainer(new Caching());
final Storing storeCaching = new Storing();
final DefaultPicoContainer child = new DefaultPicoContainer(storeCaching, new NullLifecycleStrategy(), parent);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/ThreadCachingTestCase.java (5575 => 5576)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/ThreadCachingTestCase.java 2010-02-05 04:43:46 UTC (rev 5575)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/behaviors/ThreadCachingTestCase.java 2010-02-05 04:49:44 UTC (rev 5576)
@@ -37,7 +37,7 @@

@Test public void testThatForASingleThreadTheBehaviorIsTheSameAsPlainCaching() {

- DefaultPicoContainer parent = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer parent = new DefaultPicoContainer(new Caching());
DefaultPicoContainer child = new DefaultPicoContainer(new ThreadCaching(), new NullLifecycleStrategy(), parent);

parent.addComponent(StringBuilder.class);
@@ -57,7 +57,7 @@

final Foo[] foos = new Foo[4];

- DefaultPicoContainer parent = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer parent = new DefaultPicoContainer(new Caching());
final DefaultPicoContainer child = new DefaultPicoContainer(new ThreadCaching(), new NullLifecycleStrategy(), parent);

parent.addComponent(StringBuilder.class);
@@ -95,7 +95,7 @@
final Foo[] foos = new Foo[4];
final Bar[] bars = new Bar[4];

- DefaultPicoContainer appScope = new DefaultPicoContainer(new Caching(), new NullLifecycleStrategy(), new EmptyPicoContainer());
+ DefaultPicoContainer appScope = new DefaultPicoContainer(new Caching());
final DefaultPicoContainer sessionScope = new DefaultPicoContainer(new ThreadCaching(), new NullLifecycleStrategy(), appScope);
final DefaultPicoContainer requestScope = new DefaultPicoContainer(new ThreadCaching(), new NullLifecycleStrategy(), sessionScope);

Modified: java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/LifecycleAdapterTestCase.java (5575 => 5576)

--- java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/LifecycleAdapterTestCase.java 2010-02-05 04:43:46 UTC (rev 5575)
+++ java/2.x/trunk/pico/container/src/test/org/picocontainer/injectors/LifecycleAdapterTestCase.java 2010-02-05 04:49:44 UTC (rev 5576)
@@ -1,11 +1,8 @@
package org.picocontainer.injectors;

import org.junit.Test;
-import org.picocontainer.ComponentMonitor;
import org.picocontainer.ComponentMonitorStrategy;
import org.picocontainer.Parameter;
-import org.picocontainer.monitors.AbstractComponentMonitor;
-import org.picocontainer.monitors.ConsoleComponentMonitor;
import org.picocontainer.monitors.NullComponentMonitor;
import org.picocontainer.monitors.WriterComponentMonitor;
import org.picocontainer.tck.AbstractComponentAdapterTest;

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email