255643: test and fix

diff --git a/tests/features160/weavingJavaxPackage/A.java b/tests/features160/weavingJavaxPackage/A.java
index 262767b1a18adf286f33687caf2db4e0e5254609..29a1e24ba6c24d47fc9336230f7ba80c7f842bd8 100644 (file)
--- 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 (file)
index 0000000..7d76f91
--- /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 b12520d9fcce56ed6a959ddd47e18d3c41e2b2ca..b01d26957ce804e6523a41a426b98238d3c2d434 100644 (file)
--- 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>