199130: test and fix - checking aspect bounds for generic aspects

tests/bugs161/pr199130/Complex.java

@@ -2,3 +2,8 @@ interface A {}
 interface B {}
 abstract aspect Parent< V extends A > {}
 abstract aspect Child< V extends A & B > extends Parent< V > {}
+
+public class Complex {
+  public static void main(String [] argv) {
+  }
+}

tests/bugs161/pr199130/Complex2.java

@@ -0,0 +1,15 @@
+interface A {}
+interface B {}
+abstract aspect Parent< V extends A > {}
+abstract aspect Child< V extends A & B > extends Parent< V > {}
+
+aspect Foo extends Child<AExtension> {}
+
+class AImpl implements A {}
+
+class AExtension extends AImpl implements B {}
+
+public class Complex2 {
+  public static void main(String [] argv) {
+  }
+}

tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java

@@ -23,8 +23,10 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	
 	// AspectJ1.6.1
-	//public void testComplexBoundsGenericAspect_pr199130_1() { runTest("complex bounds on generic aspect - 1");}
-	//public void testComplexBoundsGenericAspect_pr199130_2() { runTest("complex bounds on generic aspect - 2");}
+//	public void testFinalStringsAnnotationPointcut_pr174385() { runTest("static strings in annotation pointcuts");}
+	public void testComplexBoundsGenericAspect_pr199130_1() { runTest("complex bounds on generic aspect - 1");}
+	public void testComplexBoundsGenericAspect_pr199130_2() { runTest("complex bounds on generic aspect - 2");}
+	public void testComplexBoundsGenericAspect_pr199130_3() { runTest("complex bounds on generic aspect - 3");}
 	public void testGenericAspectAroundAdvice_pr226201() { runTest("generic aspect around advice");}
 	public void testCrazyGenericsInnerTypes_pr235829() { runTest("crazy generics and inner types");}
 	public void testAnnotationExposureGenerics_pr235597() { runTest("annotation exposure and generics");}

tests/src/org/aspectj/systemtest/ajc161/ajc161.xml

@@ -3,7 +3,12 @@
 <!-- AspectJ v1.6.1 Tests -->
 <suite>
 
-	<ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1">
+	<ajc-test dir="bugs161/pr174385" title="static strings in annotation pointcuts">
+    	<compile files="StaticFinalStringInPointcutAspect.java" options="-1.5"/>
+    	<run class="bug.StaticFinalStringInPointcutAspect"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1">
     	<compile files="Simple.java" options="-1.5"/>
     	<run class="Simple">
     	</run>
@@ -15,18 +20,22 @@
     	</run>
     </ajc-test>
     
+	<ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 3">
+    	<compile files="Complex2.java" options="-1.5"/>
+    	<run class="Complex2">
+    	</run>
+    </ajc-test>
+
 	<ajc-test dir="bugs161/pr226201" title="generic aspect around advice">
     	<compile files="IntAspTest.java" options="-1.5"/>
     	<run class="IntAspTest">
     	</run>
     </ajc-test>
-    
 
 	<ajc-test dir="bugs161/pr235829" title="crazy generics and inner types">
     	<compile files="Main.java a/Adapter.java a/b/Adapter.java" options="-1.5"/>
     	<run class="Main"/>
-    </ajc-test>
-    
+    </ajc-test>    
 
     <ajc-test dir="bugs161/pr235597" title="annotation exposure and generics">
         <compile files="AnnotationTest1.java SomeAnnotation.java SomeAspect.java" options="-1.5"/>