Adjusted test expectations for Java9

Annotation toString() changes on Java9 so need to include those quotes
in expected output.

diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 27e4c9a02eefd9f9415250120f4f22e701821378..cf75f74263ea9190458a443e9ce57f4e009b3993 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -2808,7 +2808,8 @@
               <line text="@target(Classified) at call(Class java.lang.Object.getClass())"/>
               <line text="1 @Foo()"/>
               <line text="1 @Foo()"/>
-              <line text="1 @Classified(classification=TOP-SECRET)"/>
+              <line text="1 @Classified(classification=TOP-SECRET)" vm="1.5,1.6,1.7,1.8"/>
+              <line text="1 @Classified(classification=&quot;TOP-SECRET&quot;)" vm="1.9"/>
               <line text="This information is TOP-SECRET"/>
               <line text="Entering critical join point with priority 3"/>
               <line text="Entering critical join point with reflectively obtained priority 3"/>
@@ -3811,29 +3812,47 @@
      <run class="GenericAspectRuntimePointcuts">
        <stdout>
          <line text="target-ok an X execution(void X.foo())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.foo())"/>
+         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.foo())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.foo())" vm="1.9"/>
          <line text="cflow-ok an X a Y set(Y X.y)"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=bar) execution(void X.bar())"/>
-         <line text="@annotation-ok @MyAnnotation(value=bar) execution(void X.bar())"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@annotation-ok @MyAnnotation(value=bar) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@annotation-ok @MyAnnotation(value=&quot;bar&quot;) execution(void X.bar())" vm="1.9"/>
          <line text="target-ok an X execution(void X.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.bar())"/>
-         <line text="@args-ok @MyAnnotation(value=my-value) execution(void Y.foo(X))"/>
+         <line text="@this-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=my-value) execution(void X.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void X.bar())" vm="1.9"/>
+         <line text="@args-ok @MyAnnotation(value=my-value) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@args-ok @MyAnnotation(value=&quot;my-value&quot;) execution(void Y.foo(X))" vm="1.9"/>
          <line text="args-ok an X execution(void Y.foo(X))"/>
          <line text="this-ok a Y execution(void Y.foo(X))"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))"/>
-         <line text="@annotation-ok-sub @MyAnnotation(value=my-value) execution(X Y.bar())"/>
-         <line text="@annotation-ok @MyAnnotation(value=my-value) execution(X Y.bar())"/>
+         <line text="@this-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@target-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=on Y) execution(void Y.foo(X))" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(void Y.foo(X))" vm="1.9"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@annotation-ok-sub @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@annotation-ok @MyAnnotation(value=my-value) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@annotation-ok @MyAnnotation(value=&quot;my-value&quot;) execution(X Y.bar())" vm="1.9"/>
          <line text="this-ok a Y execution(X Y.bar())"/>
-         <line text="@this-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/> 
-         <line text="@target-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/>
-         <line text="@within-ok @MyAnnotation(value=on Y) execution(X Y.bar())"/>
-         <line text="@withincode-ok @MyAnnotation(value=my-value) get(X Y.x)"/>
+         <line text="@this-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/> 
+         <line text="@this-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/> 
+         <line text="@target-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@target-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@within-ok @MyAnnotation(value=on Y) execution(X Y.bar())" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@within-ok @MyAnnotation(value=&quot;on Y&quot;) execution(X Y.bar())" vm="1.9"/>
+         <line text="@withincode-ok @MyAnnotation(value=my-value) get(X Y.x)" vm="1.5,1.6,1.7,1.8"/>
+         <line text="@withincode-ok @MyAnnotation(value=&quot;my-value&quot;) get(X Y.x)" vm="1.9"/>
        </stdout>
      </run>
    </ajc-test>