tests for 123695 and 124105

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index 92c4705b58111585b8d5e4dbe0c59ab1224fa915..6bf01d7f3b68372f89ab8a38c58e8bc906e93300 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -20,7 +20,8 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
          
   public void testMemberTypesInGenericTypes_pr122458()    { runTest("member types in generic types");}
   public void testMemberTypesInGenericTypes_pr122458_2()  { runTest("member types in generic types - 2");}
-  
+  public void testNPEOnDeclareAnnotation_pr123695() { runTest("Internal nullptr exception with complex declare annotation");}
+  public void testHasMemberPackageProblem_pr124105() { runTest("hasMember problems with packages");}
   
   /////////////////////////////////////////
   public static Test suite() {

diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 9a8b081a1ae621d18ceb1ce4cb0834ac2bfd75cf..4fb00ce9147f076a7bb840af98bc1e490ea41a2e 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -11,5 +11,16 @@
         <compile files="pr122458_2.aj" options="-1.5 -emacssym"/>
         <run class="pr122458_2"/>
     </ajc-test>
+    
+    <ajc-test dir="bugs151/pr123695" title="Internal nullptr exception with complex declare annotation">
+        <compile files="InjectName.java,Main.java,MarkMyMethods.java,MarkMyMethodsAspect.java,NameAspect.java,Named.java,Read.java,Write.java" options="-1.5"/>
+    </ajc-test>
+    
+    <ajc-test dir="bugs151/pr124105" title="hasMember problems with packages">
+        <compile files="com/test/IOption.java,com/test/IXOption.java,com/test/IYOption.java,com/test/IZOption.java,com/test/MyBrokenXOption.java,com/test/MyXOption.java,com/test/OptionAspect.aj,com/test/OptionType.java" options="-1.5 -XhasMember">
+          <message kind="error" line="4" text="IOption implementations must provide a constructor which accepts an OptionType"/>
+        </compile>
+    </ajc-test>
+    
 
 </suite>
\ No newline at end of file