tests (?) and fixes for 152873 - optimized check for @AJ aspects in LTW

5 files changed, 44 insertions, 0 deletions

diff --git a/tests/java5/ataspectj/ataspectj/bugs/NotAspect.java b/tests/java5/ataspectj/ataspectj/bugs/NotAspect.java
new file mode 100644
index 000000000..bb57b7a30
--- /dev/null
+++ b/tests/java5/ataspectj/ataspectj/bugs/NotAspect.java
@@ -0,0 +1,6 @@
+package ataspectj.bugs;
+
+@Deprecated
+public class NotAspect {
+	public static void main(String argz[]) {}
+}
diff --git a/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhenaspectexcludedtest.xml b/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhenaspectexcludedtest.xml
new file mode 100644
index 000000000..d2082538b
--- /dev/null
+++ b/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhenaspectexcludedtest.xml
@@ -0,0 +1,9 @@
+<aspectj>
+    <weaver options="-1.5 -showWeaveInfo">
+        <exclude within="ataspectj..*"/>
+    </weaver>
+    <aspects>
+        <aspect name="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest.TestAspect"/>
+        <aspect name="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest.TestAspectForAspect"/>
+    </aspects>
+</aspectj>
diff --git a/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhennonaspectexcludedtest.xml b/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhennonaspectexcludedtest.xml
new file mode 100644
index 000000000..fe068fc97
--- /dev/null
+++ b/tests/java5/ataspectj/ataspectj/bugs/aop-aspectofwhennonaspectexcludedtest.xml
@@ -0,0 +1,8 @@
+<aspectj>
+    <weaver options="-1.5 -verbose">
+        <exclude within="ataspectj..*"/>
+    </weaver>
+    <aspects>
+        <aspect name="ataspectj.bugs.NotAspect"/>
+    </aspects>
+</aspectj>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
index d600cc223..3d586958f 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/AtAjLTWTests.java
@@ -201,6 +201,13 @@ public class AtAjLTWTests extends XMLBasedAjcTestCase {
         runTest("AspectOfWhenAspectNotInInclude");
     }
 
+    public void testAspectOfWhenAspectExcluded_pr152873() {
+        runTest("AspectOfWhenAspectExcluded");
+    }
+    public void testAspectOfWhenNonAspectExcluded_pr152873() {
+    	runTest("AspectOfWhenNonAspectExcluded");
+    }
+
     public void testAppContainer() {
         runTest("AppContainer");
     }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
index ebccda9a0..a74d17ede 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
@@ -298,6 +298,20 @@
         <run class="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest" ltw="ataspectj/bugs/aop-aspectofwhenaspectnotinincludetest.xml"/>
     </ajc-test>
 
+    <ajc-test dir="java5/ataspectj" title="AspectOfWhenAspectExcluded">
+        <compile
+            files="ataspectj/bugs/AspectOfWhenAspectNotInIncludeTest.java,ataspectj/TestHelper.java"
+            options="-1.5 -XterminateAfterCompilation"/>
+        <run class="ataspectj.bugs.AspectOfWhenAspectNotInIncludeTest" ltw="ataspectj/bugs/aop-aspectofwhenaspectexcludedtest.xml"/>
+    </ajc-test>
+
+    <ajc-test dir="java5/ataspectj" title="AspectOfWhenNonAspectExcluded">
+        <compile
+            files="ataspectj/bugs/NotAspect.java"
+            options="-1.5 -XterminateAfterCompilation"/>
+        <run class="ataspectj.bugs.NotAspect" ltw="ataspectj/bugs/aop-aspectofwhennonaspectexcludedtest.xml"/>
+    </ajc-test>
+
     <ajc-test dir="java5/ataspectj" title="AppContainer">
         <compile
             files="ataspectj/hierarchy/AppContainerTest.java,ataspectj/hierarchy/app/SubApp.java,ataspectj/TestHelper.java"