aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2009-09-15 16:39:34 +0000
committeraclement <aclement>2009-09-15 16:39:34 +0000
commitdf77d3ac901b2bc91d1580732d0b967da8947ecf (patch)
tree58dbe40e5bff7149e42465c68836d7892a969d7a
parentebd2c14134d346b39e2c1d581627132f8b4337c6 (diff)
downloadaspectj-df77d3ac901b2bc91d1580732d0b967da8947ecf.tar.gz
aspectj-df77d3ac901b2bc91d1580732d0b967da8947ecf.zip
more aop.xml compile time config stuff
-rw-r--r--tests/features164/aopconfig/one/case4.xml10
-rw-r--r--tests/features164/aopconfig/one/case5.xml10
-rw-r--r--tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java10
-rw-r--r--tests/src/org/aspectj/systemtest/ajc164/ajc164.xml22
4 files changed, 52 insertions, 0 deletions
diff --git a/tests/features164/aopconfig/one/case4.xml b/tests/features164/aopconfig/one/case4.xml
new file mode 100644
index 000000000..5015955c0
--- /dev/null
+++ b/tests/features164/aopconfig/one/case4.xml
@@ -0,0 +1,10 @@
+<!-- B2 is exluded from being woven -->
+<aspectj>
+<aspects>
+ <aspect name="A"/>
+ <aspect name="A2"/>
+</aspects>
+<weaver>
+ <exclude within="B2"/>
+</weaver>
+</aspectj>
diff --git a/tests/features164/aopconfig/one/case5.xml b/tests/features164/aopconfig/one/case5.xml
new file mode 100644
index 000000000..cbc652f98
--- /dev/null
+++ b/tests/features164/aopconfig/one/case5.xml
@@ -0,0 +1,10 @@
+<!-- B2 is exluded from being woven -->
+<aspectj>
+<aspects>
+ <aspect name="A"/>
+ <aspect name="A2"/>
+</aspects>
+<weaver>
+ <exclude within="B*"/>
+</weaver>
+</aspectj>
diff --git a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
index 04726b168..5a0f567b9 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc164/Ajc164Tests.java
@@ -219,6 +219,16 @@ public class Ajc164Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("aop config - 3");
}
+ // excluding types from weaving
+ public void testAopConfig4() {
+ runTest("aop config - 4");
+ }
+
+ // excluding types from weaving
+ public void testAopConfig5() {
+ runTest("aop config - 5");
+ }
+
public void testAjcThisNotRead() {
runTest("ajcthis not read");
}
diff --git a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
index 371b206c0..4f5f9bd97 100644
--- a/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
+++ b/tests/src/org/aspectj/systemtest/ajc164/ajc164.xml
@@ -158,6 +158,28 @@
</compile>
</ajc-test>
+ <ajc-test dir="features164/aopconfig/one" title="aop config - 4">
+ <!-- excluding a type -->
+ <compile files="A.java A2.java B.java B2.java case4.xml" options="-1.5 -Xlint:ignore -xmlConfigured -showWeaveInfo">
+ <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A2' (A2.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A' (A.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A2' (A2.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A' (A.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A2' (A2.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void B.&lt;clinit&gt;())' in Type 'B' (B.java:1) advised by before advice from 'A' (A.java:2)"/>
+ </compile>
+ </ajc-test>
+
+ <ajc-test dir="features164/aopconfig/one" title="aop config - 5">
+ <!-- excluding a type -->
+ <compile files="A.java A2.java B.java B2.java case5.xml" options="-1.5 -Xlint:ignore -xmlConfigured -showWeaveInfo">
+ <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A2' (A2.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.java:1) advised by before advice from 'A' (A.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A2' (A2.java:2)"/>
+ <message kind="weave" text="Join point 'staticinitialization(void A2.&lt;clinit&gt;())' in Type 'A2' (A2.java:1) advised by before advice from 'A' (A.java:2)"/>
+ </compile>
+ </ajc-test>
+
<ajc-test dir="bugs164/pr263310" title="inner handles">
<compile files="HandleTestingAspect.java" options="-1.5 -emacssym -Xlint:ignore"/>
</ajc-test>