code for 116679: targetting a 1.2.1 runtime

6 files changed, 53 insertions, 0 deletions

diff --git a/tests/bugs150/pr111667/A.java b/tests/bugs150/pr111667/A.java
new file mode 100644
index 000000000..431af1ba1
--- /dev/null
+++ b/tests/bugs150/pr111667/A.java
@@ -0,0 +1,13 @@
+public class A{
+  public static void main(String []argv) {
+    A a = new A();
+    a.m1();
+    a.m2();
+    a.m3();
+  }
+
+  public void m1() {}
+  public void m2() {}
+  public void m3() {}
+}
+
diff --git a/tests/bugs150/pr111667/X.java b/tests/bugs150/pr111667/X.java
new file mode 100644
index 000000000..232adb7e4
--- /dev/null
+++ b/tests/bugs150/pr111667/X.java
@@ -0,0 +1,3 @@
+public aspect X {
+  before():execution(* m1()) {}
+}
diff --git a/tests/bugs150/pr111667/Y.java b/tests/bugs150/pr111667/Y.java
new file mode 100644
index 000000000..8ed31b5f1
--- /dev/null
+++ b/tests/bugs150/pr111667/Y.java
@@ -0,0 +1,4 @@
+public aspect Y {
+
+  before():execution(* m1()) {}
+}
diff --git a/tests/compatibility/Simple.java b/tests/compatibility/Simple.java
new file mode 100644
index 000000000..72fec1886
--- /dev/null
+++ b/tests/compatibility/Simple.java
@@ -0,0 +1,21 @@
+public class Simple {
+  public static void main(String []argv) {
+    new Simple().a();
+  }
+
+  public void a() {}
+}
+
+aspect X {
+   before():execution(* a(..)) {
+     System.err.println(thisJoinPoint);
+     System.err.println(thisJoinPointStaticPart);
+     System.err.println(thisEnclosingJoinPointStaticPart);
+   }
+
+   before():execution(Simple.new(..)) {
+     System.err.println(thisJoinPoint);
+     System.err.println(thisEnclosingJoinPointStaticPart);
+     System.err.println(thisJoinPointStaticPart);
+   }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 282e04c8b..c692b30d9 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -48,6 +48,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testCunningDeclareParents_pr92311() { runTest("cunning declare parents");}
   public void testGenericITDsAndAbstractMethodError_pr102357() { runTest("generic itds and abstract method error");}
   */
+  public void testGeneratingCodeForAnOldRuntime_pr116679() { runTest("generating code for a 1.2.1 runtime");}
   
   public void testAtDeclareParents_pr117681() { runTest("at declare parents");}
   public void testPrivilegeProblem_pr87525() { runTest("privilege problem with switch");}
@@ -79,6 +80,7 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
   public void testVarargsITD_pr110906() { runTest("ITD varargs problem");}
   public void testBadRenderer_pr86903() { runTest("bcelrenderer bad");}
+  //public void testLintForAdviceSorting_pr111667() { runTest("lint for advice sorting");}
   
   public void testIncompatibleClassChangeError_pr113630_1() {runTest("IncompatibleClassChangeError - errorscenario");}
   public void testIncompatibleClassChangeError_pr113630_2() {runTest("IncompatibleClassChangeError - workingscenario");}
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index bc6d6d009..fc6457043 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -86,6 +86,11 @@
      <run class="Test"/>
     </ajc-test>
     
+    <ajc-test dir="bugs150/pr111667" pr="111667" title="lint for advice sorting">
+     <compile files="A.java,X.java,Y.java" options="-1.5">
+     </compile>
+    </ajc-test>
+
     <ajc-test dir="bugs150/pr117296" pr="117296" title="self bounding generic types">
      <compile files="PropertySupport.java" options="-1.5"/>
      <run class="PropertySupport"/>
@@ -108,6 +113,11 @@
 		<run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
 	</ajc-test>
 	
+	<ajc-test dir="compatibility" title="generating code for a 1.2.1 runtime">
+		<compile files="Simple.java" options="-Xajruntimetarget:1.2"></compile>
+		<run class="Simple" classpath="../lib/aspectj/lib/aspectjrt121.jar"/>
+	</ajc-test>
+	
 	<ajc-test dir="java5/reflection" pr="114322" title="reflection on abstract ITDs (Billing example)">
 		<compile files="ReflectBilling.java,Billing.aj" options="-1.5"/>
 		<run class="ReflectBilling">