test and fix for 126560 (@AJ types resolved in 'current package') and test for 132349

2 files changed, 28 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index 061546114..383fc05b3 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -25,6 +25,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
 
 public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 
+ // public void testItdOnInnerTypeOfGenericType_pr132349() { runTest("ITD on inner type of generic type");}
   public void testAnnotationsAndItds_pr98901() { runTest("annotations and itds");}
   public void testAnnotationsAndItds_pr98901_2() { runTest("annotations and itds - 2");}
   public void testCircularGenerics_pr133307() { runTest("circular generics");}
@@ -52,6 +53,15 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   public void testAtAspectInheritsAdviceWithTJPAndThis_pr125699 () { runTest("inherit advice with this() and thisJoinPoint");  }
   public void testAtAspectInheritsAdviceWithTJPAndThis_pr125699_2 () {runTest("inherit advice with this() and thisJoinPoint - 2");  }
   public void testBrokenLTW_pr128744() { runTest("broken ltw"); }
+  
+  public void testAtAspectNoInvalidAbsoluteTypeName_pr126560() {
+	  runTest("@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same package");
+  }
+  
+  public void testAtAspectNoInvalidAbsoluteTypeName_pr126560_2() {
+	  runTest("@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same file");
+  }
+  
   public void testArrayindexoutofbounds_pr129566() { 
 	  runTest("arrayindexoutofbounds");
 	  // public class SkipList<T extends Comparable> extends Object implements Set<T>, Iterable<T>
diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 96e6d9313..d863a24b2 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -3,6 +3,24 @@
 <!-- AspectJ v1.5.1 Tests -->
 <suite>
 
+    <ajc-test dir="bugs151/pr132349" title="ITD on inner type of generic type">
+     <compile files="TopLevelType.java" options="-1.5"/>
+    </ajc-test>
+
+    <ajc-test dir="bugs151/pr126560" title="@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same package">
+        <compile files="pkg1/C.java, pkg1/A.java" options="-1.5">
+          <message kind="error" line="8" text="error"/>
+          <message kind="warning" line="5" text="warning"/>
+	    </compile>
+    </ajc-test>
+
+    <ajc-test dir="bugs151/pr126560" title="@AJ deow doesn't throw an invalidAbsoluteTypeName when specify type in the same file">
+        <compile files="pkg2/InOneFile.java" options="-1.5">
+          <message kind="warning" line="14" text="call hello"/>
+          <message kind="error" line="15" text="call hi"/>
+	    </compile>
+    </ajc-test>
+
     <ajc-test dir="bugs151/pr98901" title="annotations and itds">
      <compile files="Failing.java" options="-1.5"/>
      <run class="Failing">