aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authoraclement <aclement>2008-12-15 17:44:08 +0000
committeraclement <aclement>2008-12-15 17:44:08 +0000
commit556625089b5d33b38ecdb212a3db95d7be5a007c (patch)
treeb12cf6f7d425be289f6705d3c40f93669c9a1caf /tests
parent1d771cda423bb19f1d0b57137a9507af178e440b (diff)
downloadaspectj-556625089b5d33b38ecdb212a3db95d7be5a007c.tar.gz
aspectj-556625089b5d33b38ecdb212a3db95d7be5a007c.zip
255643: test and fix
Diffstat (limited to 'tests')
-rw-r--r--tests/features160/weavingJavaxPackage/A.java3
-rw-r--r--tests/features160/weavingJavaxPackage/B.java8
-rw-r--r--tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml18
3 files changed, 24 insertions, 5 deletions
diff --git a/tests/features160/weavingJavaxPackage/A.java b/tests/features160/weavingJavaxPackage/A.java
index 262767b1a..29a1e24ba 100644
--- a/tests/features160/weavingJavaxPackage/A.java
+++ b/tests/features160/weavingJavaxPackage/A.java
@@ -3,9 +3,10 @@ package javax.foo;
public class A {
public static void main(String []argv) throws Exception {
new A().foo();
+ new B().foo();
}
public void foo() {
- System.out.println("Method running");
+ System.out.println("(A) method running");
}
}
diff --git a/tests/features160/weavingJavaxPackage/B.java b/tests/features160/weavingJavaxPackage/B.java
new file mode 100644
index 000000000..7d76f91de
--- /dev/null
+++ b/tests/features160/weavingJavaxPackage/B.java
@@ -0,0 +1,8 @@
+package javax.foo;
+
+public class B {
+
+ public void foo() {
+ System.out.println("(B) method running");
+ }
+}
diff --git a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
index b12520d9f..b01d26957 100644
--- a/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc160/newfeatures-tests.xml
@@ -4,22 +4,32 @@
<suite>
<ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - no">
- <compile files="A.java" />
+ <compile files="A.java B.java" />
<compile files="X.aj" outjar="code.jar"/>
<run class="javax.foo.A" classpath="code.jar" ltw="aop1.xml">
+ <stderr>
+ <line text="AspectJ Weaver Version"/>
+ <line text="register classloader"/>
+ <line text="using configuration"/>
+ <line text="register aspect X"/>
+ <line text="not being woven"/>
+ </stderr>
<stdout>
- <line text="Method running"/>
+ <line text="(A) method running"/>
+ <line text="(B) method running"/>
</stdout>
</run>
</ajc-test>
<ajc-test dir="features160/weavingJavaxPackage" title="weave javax classes - yes">
- <compile files="A.java" />
+ <compile files="A.java B.java" />
<compile files="X.aj" outjar="code.jar"/>
<run class="javax.foo.A" classpath="code.jar" ltw="aop2.xml">
<stdout>
<line text="advised"/>
- <line text="Method running"/>
+ <line text="(A) method running"/>
+ <line text="advised"/>
+ <line text="(B) method running"/>
</stdout>
</run>
</ajc-test>