summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/ltw/EmptyAspect.aj3
-rw-r--r--tests/ltw/EmptyTest1.java8
-rw-r--r--tests/ltw/EmptyTest2.java7
-rw-r--r--tests/ltw/aop-emptytests.xml8
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml1
-rw-r--r--tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/ajc152/ajc152.xml19
7 files changed, 50 insertions, 0 deletions
diff --git a/tests/ltw/EmptyAspect.aj b/tests/ltw/EmptyAspect.aj
new file mode 100644
index 000000000..e24bad3e8
--- /dev/null
+++ b/tests/ltw/EmptyAspect.aj
@@ -0,0 +1,3 @@
+public aspect EmptyAspect {
+
+} \ No newline at end of file
diff --git a/tests/ltw/EmptyTest1.java b/tests/ltw/EmptyTest1.java
new file mode 100644
index 000000000..42e579d78
--- /dev/null
+++ b/tests/ltw/EmptyTest1.java
@@ -0,0 +1,8 @@
+public class EmptyTest1 {
+
+ public static void main (String[] args) {
+ System.out.println("EmptyTest1.main()");
+ EmptyTest2.main(args);
+ }
+
+} \ No newline at end of file
diff --git a/tests/ltw/EmptyTest2.java b/tests/ltw/EmptyTest2.java
new file mode 100644
index 000000000..6b51489d7
--- /dev/null
+++ b/tests/ltw/EmptyTest2.java
@@ -0,0 +1,7 @@
+public class EmptyTest2 {
+
+ public static void main (String[] args) {
+ System.out.println("EmptyTest2.main()");
+ }
+
+} \ No newline at end of file
diff --git a/tests/ltw/aop-emptytests.xml b/tests/ltw/aop-emptytests.xml
new file mode 100644
index 000000000..da7bd5e2a
--- /dev/null
+++ b/tests/ltw/aop-emptytests.xml
@@ -0,0 +1,8 @@
+<aspectj>
+ <aspects>
+ <aspect name="EmptyAspect"/>
+ </aspects>
+ <weaver options="-verbose">
+ <include within="*1"/>
+ </weaver>
+</aspectj> \ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
index 23f0bfac1..ebccda9a0 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
@@ -113,6 +113,7 @@
<line text="info register classloader"/>
<line text="info using"/>
<line text="info register aspect ataspectj.EmptyAspect"/>
+ <line text="info not weaving 'com.foo.bar.Test$$EnhancerByCGLIB$$12345'"/>
<line text="info weaving 'com.foo.bar.Test'"/>
</stderr>
</run>
diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index bc572fc48..3b23af93a 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -199,6 +199,10 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("Ensure no weaving without included aspects");
}
+ public void testWeaveinfoMessages (){
+ runTest("weaveinfo messages with include and exclude");
+ }
+
// tests that can't be included for some reason
// Not valid whilst the ajc compiler forces debug on (ignores -g:none) - it will be green but is invalid, trust me
diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index 948741547..b91caf7ea 100644
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -668,4 +668,23 @@
</run>
</ajc-test>
+ <ajc-test dir="ltw" title="weaveinfo messages with include and exclude">
+ <compile files="EmptyTest1.java, EmptyTest2.java"/>
+ <compile files="EmptyAspect.aj"/>
+ <run class="EmptyTest1" ltw="aop-emptytests.xml">
+ <stdout>
+ <line text="EmptyTest1.main()"/>
+ <line text="EmptyTest2.main()"/>
+ </stdout>
+ <stderr>
+ <line text="info AspectJ Weaver Version"/>
+ <line text="info register classloader org.aspectj.weaver.loadtime.WeavingURLClassLoader"/>
+ <line text="info using configuration"/>
+ <line text="info register aspect EmptyAspect"/>
+ <line text="info weaving"/>
+ <line text="info not weaving"/>
+ </stderr>
+ </run>
+ </ajc-test>
+
</suite> \ No newline at end of file