s/subclass/subtype/. Added a couple more test cases.

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

5 files changed, 47 insertions, 3 deletions

diff --git a/src/javax/inject/Inject.java b/src/javax/inject/Inject.java
index fe41467..7dc7b76 100644
--- a/src/javax/inject/Inject.java
+++ b/src/javax/inject/Inject.java
@@ -32,7 +32,7 @@ import static java.lang.annotation.ElementType.FIELD;
  * in superclasses are injected before those in subclasses. Ordering of
  * injection among fields and among methods in the same class is not specified.
  * For a given type T and optional qualifier, an injector must
- * be able to inject a user-specified subclass of T that has an injectable
+ * be able to inject a user-specified subtype of T that has an injectable
  * constructor. Beyond that, which values are injected depend upon the
  * injector implementation and its configuration.
  *
diff --git a/tck/org/atinject/tck/auto/Convertible.java b/tck/org/atinject/tck/auto/Convertible.java
index 0eee4db..c763e4f 100644
--- a/tck/org/atinject/tck/auto/Convertible.java
+++ b/tck/org/atinject/tck/auto/Convertible.java
@@ -428,7 +428,7 @@ public class Convertible implements Car {
             assertFalse(engine.overriddenTwiceWithOmissionInSubclassInjected);
         }
 
-        public void testOverriddingMixedWithPackagePrivate() {
+        public void testOverriddingMixedWithPackagePrivate2() {
             assertTrue(spareTire.packagePrivateMethod2Injected);
             assertTrue(((Tire) spareTire).packagePrivateMethod2Injected);
             assertFalse(((RoundThing) spareTire).packagePrivateMethod2Injected);
@@ -437,6 +437,20 @@ public class Convertible implements Car {
             assertTrue(((RoundThing) plainTire).packagePrivateMethod2Injected);
         }
 
+        public void testOverriddingMixedWithPackagePrivate3() {
+            assertFalse(spareTire.packagePrivateMethod3Injected);
+            assertTrue(((Tire) spareTire).packagePrivateMethod3Injected);
+            assertFalse(((RoundThing) spareTire).packagePrivateMethod3Injected);
+
+            assertTrue(plainTire.packagePrivateMethod3Injected);
+            assertTrue(((RoundThing) plainTire).packagePrivateMethod3Injected);
+        }
+
+        public void testOverriddingMixedWithPackagePrivate4() {
+            assertFalse(plainTire.packagePrivateMethod4Injected);
+            assertTrue(((RoundThing) plainTire).packagePrivateMethod4Injected);
+        }
+
         // inject only once
 
         public void testOverriddenPackagePrivateMethodInjectedOnlyOnce() {
diff --git a/tck/org/atinject/tck/auto/Tire.java b/tck/org/atinject/tck/auto/Tire.java
index e88a668..1a8423f 100644
--- a/tck/org/atinject/tck/auto/Tire.java
+++ b/tck/org/atinject/tck/auto/Tire.java
@@ -163,8 +163,20 @@ public class Tire extends RoundThing {
     }
 
     boolean packagePrivateMethod2Injected;
-    
+
     @Inject void injectPackagePrivateMethod2() {
         packagePrivateMethod2Injected = true;
     }
+
+    public boolean packagePrivateMethod3Injected;
+
+    @Inject void injectPackagePrivateMethod3() {
+        packagePrivateMethod3Injected = true;
+    }
+
+    public boolean packagePrivateMethod4Injected;
+
+    void injectPackagePrivateMethod4() {
+        packagePrivateMethod4Injected = true;
+    }
 }
diff --git a/tck/org/atinject/tck/auto/accessories/RoundThing.java b/tck/org/atinject/tck/auto/accessories/RoundThing.java
index 99495be..582979c 100644
--- a/tck/org/atinject/tck/auto/accessories/RoundThing.java
+++ b/tck/org/atinject/tck/auto/accessories/RoundThing.java
@@ -25,4 +25,16 @@ public class RoundThing {
     @Inject void injectPackagePrivateMethod2() {
         packagePrivateMethod2Injected = true;
     }
+
+    public boolean packagePrivateMethod3Injected;
+
+    @Inject void injectPackagePrivateMethod3() {
+        packagePrivateMethod3Injected = true;
+    }
+
+    public boolean packagePrivateMethod4Injected;
+
+    @Inject void injectPackagePrivateMethod4() {
+        packagePrivateMethod4Injected = true;
+    }
 }
diff --git a/tck/org/atinject/tck/auto/accessories/SpareTire.java b/tck/org/atinject/tck/auto/accessories/SpareTire.java
index d41ec6e..5dd6211 100644
--- a/tck/org/atinject/tck/auto/accessories/SpareTire.java
+++ b/tck/org/atinject/tck/auto/accessories/SpareTire.java
@@ -113,4 +113,10 @@ public class SpareTire extends Tire {
     @Inject void injectPackagePrivateMethod2() {
         packagePrivateMethod2Injected = true;
     }
+
+    public boolean packagePrivateMethod3Injected;
+
+    void injectPackagePrivateMethod3() {
+        packagePrivateMethod3Injected = true;
+    }
 }