Rolling back r48. I'd forgotten that we updated the spec to address this...
git-svn-id: https://atinject.googlecode.com/svn/trunk@49 3bc8319c-20ab-11de-9edc-3f40a397ab60
diff --git a/tck/org/atinject/tck/Tck.java b/tck/org/atinject/tck/Tck.java
index e4f9e90..d92e99a 100644
--- a/tck/org/atinject/tck/Tck.java
+++ b/tck/org/atinject/tck/Tck.java
@@ -62,6 +62,7 @@
* {@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 b843092..b5b7c48 100644
--- a/tck/org/atinject/tck/auto/Convertible.java
+++ b/tck/org/atinject/tck/auto/Convertible.java
@@ -29,7 +29,7 @@
@Inject @Drivers Seat driversSeatA;
@Inject @Drivers Seat driversSeatB;
- @Inject @Named("spare") Tire spareTire;
+ @Inject SpareTire spareTire;
@Inject Cupholder cupholder;
@Inject Provider<Engine> engineProvider;
@@ -177,7 +177,7 @@
private final Convertible car = localConvertible.get();
private final Cupholder cupholder = car.cupholder;
- private final Tire spareTire = car.spareTire;
+ private final SpareTire spareTire = car.spareTire;
private final Tire plainTire = car.fieldPlainTire;
private final Engine engine = car.engineProvider.get();
@@ -429,7 +429,7 @@
}
public void testOverriddingMixedWithPackagePrivate2() {
- assertTrue(((SpareTire) spareTire).packagePrivateMethod2Injected);
+ assertTrue(spareTire.packagePrivateMethod2Injected);
assertTrue(((Tire) spareTire).packagePrivateMethod2Injected);
assertFalse(((RoundThing) spareTire).packagePrivateMethod2Injected);
@@ -438,7 +438,7 @@
}
public void testOverriddingMixedWithPackagePrivate3() {
- assertFalse(((SpareTire) spareTire).packagePrivateMethod3Injected);
+ assertFalse(spareTire.packagePrivateMethod3Injected);
assertTrue(((Tire) spareTire).packagePrivateMethod3Injected);
assertFalse(((RoundThing) spareTire).packagePrivateMethod3Injected);
@@ -550,7 +550,7 @@
private final Convertible car = localConvertible.get();
private final Engine engine = car.engineProvider.get();
- private final Tire spareTire = car.spareTire;
+ private final SpareTire spareTire = car.spareTire;
public void testSupertypePrivateMethodInjected() {
assertTrue(spareTire.superPrivateMethodInjected);
