diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-09-27 14:18:22 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-09-27 14:18:22 -0700 |
| commit | e0cb106a33b8e4b8dfe0918a3b71b31f122b0627 (patch) | |
| tree | d4672f701d17a5430d5af6f36506a5b408c269ee /tests | |
| parent | 647ab7aba5eda88e8e0e762073da251263a7240f (diff) | |
| download | aspectj-e0cb106a33b8e4b8dfe0918a3b71b31f122b0627.tar.gz aspectj-e0cb106a33b8e4b8dfe0918a3b71b31f122b0627.zip | |
Adjusted test expectations for Java9
Annotation toString() changes on Java9 so need to include those quotes
in expected output.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/org/aspectj/systemtest/ajc150/ajc150.xml | 57 |
1 files changed, 38 insertions, 19 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index 27e4c9a02..cf75f7426 100644 --- 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="TOP-SECRET")" 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="my-value") 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="my-value") 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="my-value") 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="bar") 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="bar") 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="my-value") 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="my-value") 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="my-value") 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="my-value") 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="on Y") 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="on Y") 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="on Y") 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="my-value") 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="my-value") 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="on Y") 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="on Y") 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="on Y") 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="my-value") get(X Y.x)" vm="1.9"/> </stdout> </run> </ajc-test> |