[picocontainer-scm] [5589] java/2.x/trunk/pico/jsr330-tck/src/test/StoneageSimulationJsr330Tests.java: down to 6/47 failures

Revision 5589
Author paul
Date 2010-02-07 13:36:12 -0600 (Sun, 07 Feb 2010)

Log Message

down to 6/47 failures

Modified Paths

- java/2.x/trunk/pico/jsr330-tck/src/test/StoneageSimulationJsr330Tests.java

Diff

Modified: java/2.x/trunk/pico/jsr330-tck/src/test/StoneageSimulationJsr330Tests.java (5588 => 5589)

--- java/2.x/trunk/pico/jsr330-tck/src/test/StoneageSimulationJsr330Tests.java 2010-02-07 18:21:48 UTC (rev 5588)
+++ java/2.x/trunk/pico/jsr330-tck/src/test/StoneageSimulationJsr330Tests.java 2010-02-07 19:36:12 UTC (rev 5589)
@@ -5,6 +5,7 @@
import org.atinject.tck.auto.DriversSeat;
import org.atinject.tck.auto.Engine;
import org.atinject.tck.auto.FuelTank;
+import org.atinject.tck.auto.GasEngine;
import org.atinject.tck.auto.Seat;
import org.atinject.tck.auto.Tire;
import org.atinject.tck.auto.V8Engine;
@@ -43,7 +44,7 @@
tireInjections(plainTire);

final SpareTire spareTire = new SpareTire(fuelTank, new FuelTank());
- tireInjections(plainTire);
+ tireInjections(spareTire);
spareTireInjections(spareTire);

Provider<Seat> driversSeatProvider = new Provider<Seat>() {
@@ -66,6 +67,7 @@
public Tire get() {
try {
SpareTire aSpareTire = new SpareTire(fuelTank, new FuelTank());
+ tireInjections(aSpareTire);
spareTireInjections(aSpareTire);
return aSpareTire;
} catch (Exception e) {
@@ -75,7 +77,12 @@
};

final V8Engine v8Engine = new V8Engine();
+ injectMethod(v8Engine, Engine.class, "injectTwiceOverriddenWithOmissionInMiddle");
+ injectMethod(v8Engine, Engine.class, "injectPackagePrivateMethodForOverride");
+ injectMethod(v8Engine, Engine.class, "injectPackagePrivateMethod");
+ injectMethod(v8Engine, GasEngine.class, "injectTwiceOverriddenWithOmissionInSubclass");
injectMethod(v8Engine, V8Engine.class, "injectTwiceOverriddenWithOmissionInMiddle");
+ injectMethod(v8Engine, V8Engine.class, "injectPackagePrivateMethod");

Provider<Engine> engineProvider = new Provider<Engine>() {
public Engine get() {
@@ -132,6 +139,8 @@

private static void tireInjections(Tire tire) throws NoSuchFieldException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
injectField(tire, Tire.class,"fieldInjection", new FuelTank());
+ injectMethod(tire, Tire.class, "injectPrivateMethod");
+ injectMethod(tire, Tire.class, "injectPackagePrivateMethod");
injectMethod(tire, Tire.class, "supertypeMethodInjection", FuelTank.class, new FuelTank());
}

----------

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email