162539: NullPointerException when pointcut library missing @aspect annotion: tests and fixes. Modified resolution of @AJ pointcuts and optimized searching for @AJ elements in all classes

2 files changed, 12 insertions, 2 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
index c29ea92f9..6560b56bf 100644
--- a/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc154/Ajc154Tests.java
@@ -44,6 +44,10 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //	//parser.registerPointcutDesignatorHandler(beanHandler);
 //		runTest("new pointcut designators in a reference pointcut");
 //	}
+	public void testNPEWithMissingAtAspectAnnotationInPointcutLibrary_pr162539_1() { runTest("NPE with missing @aspect annotation in pointcut library - 1"); }
+	public void testNPEWithMissingAtAspectAnnotationInPointcutLibrary_pr162539_2() { runTest("NPE with missing @aspect annotation in pointcut library - 2"); }
+	 
+	public void testWrongNumberOfTypeParameters_pr176991() { runTest("wrong number of type parameters");}
 
 	public void testArgNamesDoesNotWork_pr148381_1() { runTest("argNames does not work - simple");}
 	public void testArgNamesDoesNotWork_pr148381_2() { runTest("argNames does not work - error1");}
@@ -65,7 +69,6 @@ public class Ajc154Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	//public void testGenericTypeParameterizedWithArrayType_pr167197() { runTest("generic type parameterized with array type");}
 	
 	
-	//public void testWrongNumberOfTypeParameters_pr176991() { runTest("wrong number of type parameters");}
 	public void testItdOnGenericInnerInterface_pr203646() { runTest("npe with itd on inner generic interface");}
 	public void testItdOnGenericInnerInterface_pr203646_A() { runTest("npe with itd on inner generic interface - exampleA");}
 	public void testItdOnGenericInnerInterface_pr203646_B() { runTest("npe with itd on inner generic interface - exampleB");}
diff --git a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
index ebb449c48..371985a8e 100644
--- a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
+++ b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml
@@ -2,7 +2,6 @@
 
 <!-- AspectJ v1.6.0 Tests -->
 <suite>
-
    <ajc-test dir="bugs154/pr194314" title="broken lvt for woven at aspectj around advice">
      <compile options="-1.5" files="test/IService.java,test/Main.java,test/Service.java,test/ServiceInterceptor.java"/>
    </ajc-test>
@@ -166,6 +165,14 @@
        <message kind="error" text="DeclareParents can only be used inside an aspect type"/>
      </compile>
    </ajc-test>
+
+   <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 1">
+   	 <compile files="test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" classpath="lib.jar" options="-1.5"/>
+   </ajc-test>
+    
+   <ajc-test dir="bugs154/pr162539" title="NPE with missing @aspect annotation in pointcut library - 2">
+   	<compile files="test/ataspectj/pointcutlibrary/PointcutLibrary.java, test/ataspectj/pointcutlibrary/HelloWorld.java, test/ataspectj/pointcutlibrary/AtAspect.java" options="-1.5"/>
+   </ajc-test>
    
    <ajc-test dir="bugs154/pr176991" title="wrong number of type parameters">
      <compile options="-1.5" files="AspectJBugTestCase.java"/>