[picocontainer-scm] [scm-git][2/2] JSR 330 tests now actually running. (hooray)

Michael Rimov <git-yCVjj/[email protected]> Thu, 30 May 2013 23:34:07 -0500 (CDT)
Newsgroups gmane.comp.java.picocontainer.cvs
Message-ID <[email protected]>
commit ec1bee4d75c23434fbbf41a3f70984acd31acd7a
Author:     Michael Rimov <[email protected]>
AuthorDate: Thu, 30 May 2013 21:31:37 -0700
Commit:     Michael Rimov <[email protected]>
CommitDate: Thu, 30 May 2013 21:31:37 -0700

    JSR 330 tests now actually running.  (hooray)

diff --git a/pico/jsr330-tck/src/test/PicoContainerJsr330TestCase.java b/pico/jsr330-tck/src/test/PicoContainerJsr330TestCase.java
index 45dde6f..e748244 100644
--- a/pico/jsr330-tck/src/test/PicoContainerJsr330TestCase.java
+++ b/pico/jsr330-tck/src/test/PicoContainerJsr330TestCase.java
@@ -106,6 +106,19 @@ public class PicoContainerJsr330TestCase extends TestCase {
         }    	
 	}
     
+    public static class EngineProvider implements Provider<Engine> {
+		private MutablePicoContainer pico;
+
+		public EngineProvider(MutablePicoContainer pico) {
+			this.pico = pico;
+		}
+		
+		public Engine get() {
+			return (Engine)pico.getComponent("engine");
+		}
+    	
+    }
+	
 	
 	public static Test suite() throws InvocationTargetException, IllegalAccessException, InstantiationException, NoSuchMethodException, NoSuchFieldException {
 		//        DefaultPicoContainer pico = new DefaultPicoContainer(new Caching(), 
@@ -116,23 +129,25 @@ public class PicoContainerJsr330TestCase extends TestCase {
     	PlainTireProvider plainTireProvider = new PlainTireProvider(pico);
     	SpareTireProvider spareTireProvider = new SpareTireProvider(pico);
     	PlainSeatProvider plainSeatProvider = new PlainSeatProvider(pico);
+    	EngineProvider engineProvider = new EngineProvider(pico);
     	
         pico.addComponent(Car.class, Convertible.class)
                 //.addAdapter(new AnnotatedMethodInjection.AnnotatedMethodInjector(DriversSeat.class, DriversSeat.class, Parameter.DEFAULT, new NullComponentMonitor(), false, Drivers.class))
                 .addComponent(FuelTank.class)
-                .addComponent(Engine.class, V8Engine.class)
                 .addComponent(Seatbelt.class)
                 .addComponent(Cupholder.class, Cupholder.class)
                 .addProvider(driversSeatProvider)
                 .addProvider(plainSeatProvider)
                 .addProvider(plainTireProvider)
                 .addProvider(spareTireProvider)
+                .addProvider(engineProvider)
         
                 //Components Used By the providers
                 .addComponent("plainSeat", Seat.class)
         		.addComponent("theDriversSeat", DriversSeat.class)
                 .addComponent("spareTire", SpareTire.class)
-                .addComponent("plainTire", Tire.class);
+                .addComponent("plainTire", Tire.class)
+        		.addComponent("engine", V8Engine.class);