update to expected messages for type pattern matching with generics

diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
index df50661c9634462a264e4646ccaf8e1acfc0a21f..dd9de938207124bfa2c63624b6a46b1f8e3e6afa 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/GenericsTests.java
@@ -266,9 +266,9 @@ public class GenericsTests extends XMLBasedAjcTestCase {
                runTest("annotation pcds with parameterized types");
        }
 
-//     public void testAnnotationPatternsWithParameterizedTypes() {
-//             runTest("annotation patterns with parameterized types");
-//     }
+       public void testAnnotationPatternsWithParameterizedTypes() {
+               runTest("annotation patterns with parameterized types");
+       }
        
        public void testStaticInitializationWithParameterizedTypes() {
                runTest("staticinitialization and parameterized types");
@@ -278,9 +278,9 @@ public class GenericsTests extends XMLBasedAjcTestCase {
                runTest("staticinitialization and parameterized type matching");
        }
 
-//     public void testStaticInitializationWithGenericTypes() {
-//             runTest("staticinitialization with generic types");
-//     }
+       public void testStaticInitializationWithGenericTypes() {
+               runTest("staticinitialization with generic types");
+       }
        
 //     public void testStaticInitializationWithGenericTypesAdvanced() {
 //             runTest("staticinitialization with generic types - advanced");          

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index ad3fb70e8e5e1e945bb76bf411a0312fc8efd76b..35a90302a071ce19da3c97607dad9b417e0f1a33 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2548,7 +2548,7 @@
          <message kind="warning" line="1" text="works with classes too"/>
          <message kind="warning" line="4" text="Type T does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericInterface"/>
          <message kind="warning" line="20" text="Type pattern does not match because the wrong number of type parameters are specified: Type GenericImplementingClass requires 1 parameter(s)"/>
-         <message kind="warning" line="24" text="Type N extends java.lang.Name &amp; java.lang.Comparable does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericImplementingClass"/>
+         <message kind="warning" line="24" text="Type N extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (N extends java.lang.Number) in generic type GenericImplementingClass"/>
      </compile>
    </ajc-test>
    
@@ -2565,6 +2565,9 @@
          <message kind="warning" line="63" text="matches a generic type with any upper bound and i/f bounds"/>
          <message kind="warning" line="76" text="matches a generic type with any upper bound and i/f bounds"/>
          <message kind="warning" line="82" text="matches a generic type with any upper bound and i/f bounds"/>
+         <message kind="warning" line="19" text="Type X does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
+         <message kind="warning" line="23" text="Type Y extends java.lang.Number does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
+         <message kind="warning" line="27" text="Type Z extends java.lang.Number &amp; java.lang.Comparable does not meet the specification for type parameter 1 (T extends java.lang.Number &amp; java.lang.Comparable &amp; java.io.Serializable) in generic type ClassWithInterfaceBounds"/>
      </compile>
    </ajc-test>