last couple of withincode tests - this completes the testing and implementation of withincode with generic and parameterized types

3 files changed, 21 insertions, 14 deletions

diff --git a/tests/java5/generics/pointcuts/WithinCodePointcutMatchingParamAndReturnTypes.aj b/tests/java5/generics/pointcuts/WithinCodePointcutMatchingParamAndReturnTypes.aj
index a57e9f75d..6ed0828dc 100644
--- a/tests/java5/generics/pointcuts/WithinCodePointcutMatchingParamAndReturnTypes.aj
+++ b/tests/java5/generics/pointcuts/WithinCodePointcutMatchingParamAndReturnTypes.aj
@@ -23,6 +23,10 @@ public aspect WithinCodePointcutMatchingParamAndReturnTypes {
 	                  : "withincode and interface control test";
 	declare warning : withincode(void UglyBuilding.iSee(Object))
 	                  : "should be no join points for bridge methods";
+	
+	// rule 6) parameterized types in return and args can be matched exactly
+	declare warning : withincode(Generic.new(List<String>)) : "match on parameterized args";
+	declare warning : withincode(List<Number> *(..)) : "match on parameterized return type";
 }
 
 
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index c9ceace53..97bbc29d7 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -79,14 +79,14 @@ public class GenericsTests extends XMLBasedAjcTestCase {
 	 *   - type variables as params PASS
 	 *   - parameterized types as params PASS
 	 *   - no join points for init, preinit of parameterized types (as per staticinit) PASS
-	 * withincode
+	 * withincode  PASS
 	 *    - no generic or parameterized declaring type patterns  PASS
 	 *    - no parameterized throws patterns  PASS
-	 *    - return type as type variable
-	 *    - return type as parameterized type
-	 *    - parameter as type variable
-	 *    - parameter as parameterized type
-	 *    - no join points within bridge methods
+	 *    - return type as type variable PASS
+	 *    - return type as parameterized type PASS
+	 *    - parameter as type variable  PASS
+	 *    - parameter as parameterized type PASS
+	 *    - no join points within bridge methods PASS
 	 * execution
 	 *    - wait till we get there!
 	 * call
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 4d149a135..80411a159 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2801,15 +2801,18 @@
 
     <ajc-test dir="java5/generics/pointcuts" title="withincode with various parameterizations and generic types - matching">
      <compile files="WithinCodePointcutMatchingParamAndReturnTypes.aj" options="-1.5">
-        <message kind="warning" line="31" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="32" text="raw param type matching in withincode ok"/>
-        <message kind="warning" line="63" text="raw return type matching in withincode ok"/>
-        <message kind="warning" line="34" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="35" text="erasure type matching in withincode ok"/>
+        <message kind="warning" line="35" text="raw param type matching in withincode ok"/>
+        <message kind="warning" line="36" text="raw param type matching in withincode ok"/>
+        <message kind="warning" line="67" text="raw return type matching in withincode ok"/>
         <message kind="warning" line="38" text="erasure type matching in withincode ok"/>
-        <message kind="warning" line="58" text="withincode and parameterized method ok"/>
-        <message kind="warning" line="58" text="withincode and generic interface ok"/>
-        <message kind="warning" line="61" text="withincode and interface control test"/>
+        <message kind="warning" line="39" text="erasure type matching in withincode ok"/>
+        <message kind="warning" line="42" text="erasure type matching in withincode ok"/>
+        <message kind="warning" line="62" text="withincode and parameterized method ok"/>
+        <message kind="warning" line="62" text="withincode and generic interface ok"/>
+        <message kind="warning" line="65" text="withincode and interface control test"/>
+        <message kind="warning" line="35" text="match on parameterized args"/>
+        <message kind="warning" line="36" text="match on parameterized args"/>
+        <message kind="warning" line="67" text="match on parameterized return type"/>
       </compile>
    </ajc-test>