Pete Muir's patch for making the TCK follow the spec more closely

git-svn-id: https://atinject.googlecode.com/svn/trunk@48 3bc8319c-20ab-11de-9edc-3f40a397ab60

2 files changed, 5 insertions, 6 deletions

diff --git a/tck/org/atinject/tck/Tck.java b/tck/org/atinject/tck/Tck.java
index d92e99a..e4f9e90 100644
--- a/tck/org/atinject/tck/Tck.java
+++ b/tck/org/atinject/tck/Tck.java
@@ -62,7 +62,6 @@ import junit.framework.TestSuite;
  *       {@link org.atinject.tck.auto.accessories.SpareTire SpareTire}.
  *   <li>The following classes may also be injected:
  *       {@link org.atinject.tck.auto.accessories.Cupholder Cupholder},
- *       {@link org.atinject.tck.auto.accessories.SpareTire SpareTire},
  *       {@link org.atinject.tck.auto.Tire Tire} and
  *       {@link org.atinject.tck.auto.FuelTank FuelTank}.
  * </ul>
diff --git a/tck/org/atinject/tck/auto/Convertible.java b/tck/org/atinject/tck/auto/Convertible.java
index b5b7c48..b843092 100644
--- a/tck/org/atinject/tck/auto/Convertible.java
+++ b/tck/org/atinject/tck/auto/Convertible.java
@@ -29,7 +29,7 @@ public class Convertible implements Car {
 
     @Inject @Drivers Seat driversSeatA;
     @Inject @Drivers Seat driversSeatB;
-    @Inject SpareTire spareTire;
+    @Inject @Named("spare") Tire spareTire;
     @Inject Cupholder cupholder;
     @Inject Provider<Engine> engineProvider;
 
@@ -177,7 +177,7 @@ public class Convertible implements Car {
 
         private final Convertible car = localConvertible.get();
         private final Cupholder cupholder = car.cupholder;
-        private final SpareTire spareTire = car.spareTire;
+        private final Tire spareTire = car.spareTire;
         private final Tire plainTire = car.fieldPlainTire;
         private final Engine engine = car.engineProvider.get();
 
@@ -429,7 +429,7 @@ public class Convertible implements Car {
         }
 
         public void testOverriddingMixedWithPackagePrivate2() {
-            assertTrue(spareTire.packagePrivateMethod2Injected);
+            assertTrue(((SpareTire) spareTire).packagePrivateMethod2Injected);
             assertTrue(((Tire) spareTire).packagePrivateMethod2Injected);
             assertFalse(((RoundThing) spareTire).packagePrivateMethod2Injected);
 
@@ -438,7 +438,7 @@ public class Convertible implements Car {
         }
 
         public void testOverriddingMixedWithPackagePrivate3() {
-            assertFalse(spareTire.packagePrivateMethod3Injected);
+            assertFalse(((SpareTire) spareTire).packagePrivateMethod3Injected);
             assertTrue(((Tire) spareTire).packagePrivateMethod3Injected);
             assertFalse(((RoundThing) spareTire).packagePrivateMethod3Injected);
 
@@ -550,7 +550,7 @@ public class Convertible implements Car {
 
         private final Convertible car = localConvertible.get();
         private final Engine engine = car.engineProvider.get();
-        private final SpareTire spareTire = car.spareTire;
+        private final Tire spareTire = car.spareTire;
 
         public void testSupertypePrivateMethodInjected() {
             assertTrue(spareTire.superPrivateMethodInjected);