199130: testcode

diff --git a/tests/bugs161/pr199130/Complex.java b/tests/bugs161/pr199130/Complex.java
new file mode 100644 (file)
index 0000000..36e2364
--- /dev/null
+++ b/tests/bugs161/pr199130/Complex.java
@@ -0,0 +1,4 @@
+interface A {}
+interface B {}
+abstract aspect Parent< V extends A > {}
+abstract aspect Child< V extends A & B > extends Parent< V > {}

diff --git a/tests/bugs161/pr199130/Simple.java b/tests/bugs161/pr199130/Simple.java
new file mode 100644 (file)
index 0000000..1479a62
--- /dev/null
+++ b/tests/bugs161/pr199130/Simple.java
@@ -0,0 +1,12 @@
+interface A {}
+abstract aspect Parent< T > {
+  public void m(T i) {}
+}
+abstract aspect Child< V extends A > extends Parent< V > {
+  public void n(V i) {}
+}
+
+public class Simple {
+  public static void main(String []argv) {
+  }
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
index 7b15ef994201c2b8b944135335e96c577b4d3cee..fe45d6daf947a8bff151afaf594a6ff3c0c943e6 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
@@ -23,6 +23,8 @@ 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 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");}

diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
index 8e7e714cdbf12c27b232594d6c7a8ee8e54d2edd..f4bb6f8a36655cabd1a9e09ab4810be5b9699346 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
@@ -3,6 +3,18 @@
 <!-- AspectJ v1.6.1 Tests -->
 <suite>
 
+       <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 1">
+       <compile files="Simple.java" options="-1.5"/>
+       <run class="Simple">
+       </run>
+    </ajc-test>
+    
+       <ajc-test dir="bugs161/pr199130" title="complex bounds on generic aspect - 2">
+       <compile files="Complex.java" options="-1.5"/>
+       <run class="Complex">
+       </run>
+    </ajc-test>
+    
        <ajc-test dir="bugs161/pr226201" title="generic aspect around advice">
        <compile files="IntAspTest.java" options="-1.5"/>
        <run class="IntAspTest">