diff options
| author | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2017-11-09 13:14:02 -0800 |
| commit | d92319c43f5723d57887e09f2a839ee5b595fcfd (patch) | |
| tree | 155e25d455e598ff5b55b0563645d4af23903bb4 /tests | |
| parent | 6765fdc34c775e99799b36d88cff8ab88dffc8e7 (diff) | |
| download | aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.tar.gz aspectj-d92319c43f5723d57887e09f2a839ee5b595fcfd.zip | |
Updates to better cope with future JDKs
The version handling in LangUtil has been overhauled
to cope better with post 1.8 releases (JDK9 and JDK10 or 18.3
or whatever they call it). As part of this moved
to treating JDK9 as '9' rather than '1.9'. Also removed
duplicate version processing logic and had that defer to
the one place in LangUtil where we now deal with it.
Includes some generics tidyup in ajdoc. More ajdoc work
is necessary for Java10 because it removes the standard doclet
(old style). However trying to invoke the internal Javadoc
handler in Java10 is failing due to module visibility rules.
Diffstat (limited to 'tests')
9 files changed, 44 insertions, 48 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml index cf75f7426..d0da94ec9 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml @@ -2809,7 +2809,7 @@ <line text="1 @Foo()"/> <line text="1 @Foo()"/> <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="1 @Classified(classification="TOP-SECRET")" vm="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"/> @@ -3813,46 +3813,46 @@ <stdout> <line text="target-ok an X 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="@this-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="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="@target-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="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="@within-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="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())" 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-sub @MyAnnotation(value="bar") execution(void X.bar())" vm="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="@annotation-ok @MyAnnotation(value="bar") execution(void X.bar())" vm="9+"/> <line text="target-ok an X execution(void X.bar())"/> <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="@this-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="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="@target-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="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="@within-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="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 @MyAnnotation(value="my-value") execution(void Y.foo(X))" vm="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))" 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="@this-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="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="@target-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="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="@within-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="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-sub @MyAnnotation(value="my-value") execution(X Y.bar())" vm="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="@annotation-ok @MyAnnotation(value="my-value") execution(X Y.bar())" vm="9+"/> <line text="this-ok a Y execution(X Y.bar())"/> <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="@this-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="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="@target-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="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="@within-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="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"/> + <line text="@withincode-ok @MyAnnotation(value="my-value") get(X Y.x)" vm="9+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml index a3297e68c..9cb0eae87 100644 --- a/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml +++ b/tests/src/org/aspectj/systemtest/ajc154/ajc154.xml @@ -28,7 +28,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @a.b.SimpleAnnotation(classname="oranges")" vm="1.9"/> + <line text="Annotation is @a.b.SimpleAnnotation(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> @@ -41,7 +41,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @a.b.SimpleAnnotation(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @a.b.SimpleAnnotation(classname="oranges")" vm="1.9"/> + <line text="Annotation is @a.b.SimpleAnnotation(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> @@ -54,7 +54,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="1.9"/> + <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> @@ -67,7 +67,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="1.9"/> + <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> @@ -81,7 +81,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="1.9"/> + <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> @@ -96,7 +96,7 @@ <run class="c.d.DistantResource"> <stdout> <line text="Annotation is @e.f.SimpleAnnotation2(classname=oranges)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="1.9"/> + <line text="Annotation is @e.f.SimpleAnnotation2(classname="oranges")" vm="9+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml b/tests/src/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml index 0a8105df7..914042633 100644 --- a/tests/src/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml +++ b/tests/src/org/aspectj/systemtest/ajc1611/newfeatures-tests.xml @@ -110,7 +110,7 @@ <stdout> <line text="i does not have Anno"/> <line text="j has Banno:@Banno(hoo=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="j has Banno:@Banno(hoo="abc")" vm="1.9"/> + <line text="j has Banno:@Banno(hoo="abc")" vm="9+"/> <line text="j does not have Anno"/> </stdout></run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml index 8011cd68f..38f46c7d6 100644 --- a/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml +++ b/tests/src/org/aspectj/systemtest/ajc1612/ajc1612.xml @@ -258,9 +258,9 @@ <run class="AnnoBinding2"> <stdout> <line text="get(int AnnoBinding2.field1) @Marker(message=foo)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> -<line text="get(int AnnoBinding2.field1) @Marker(message="foo")" vm="1.9"/> +<line text="get(int AnnoBinding2.field1) @Marker(message="foo")" vm="9+"/> <line text="get(int AnnoBinding2.field2) @Marker(message=bar)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> -<line text="get(int AnnoBinding2.field2) @Marker(message="bar")" vm="1.9"/> +<line text="get(int AnnoBinding2.field2) @Marker(message="bar")" vm="9+"/> <line text="2 ajc$anno$NNN fields"/> </stdout> </run> diff --git a/tests/src/org/aspectj/systemtest/ajc169/intertype.xml b/tests/src/org/aspectj/systemtest/ajc169/intertype.xml index f9c788b0c..75846b05c 100644 --- a/tests/src/org/aspectj/systemtest/ajc169/intertype.xml +++ b/tests/src/org/aspectj/systemtest/ajc169/intertype.xml @@ -71,7 +71,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -82,7 +82,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -93,7 +93,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -104,7 +104,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -115,7 +115,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -126,7 +126,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -137,7 +137,7 @@ <stdout> <line text="wibble"/> <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="1.9"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml b/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml index 241ad3867..e379d6cab 100644 --- a/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml +++ b/tests/src/org/aspectj/systemtest/ajc170/ajc170.xml @@ -183,14 +183,14 @@ <line text="Annotation count is 4"/> <line text="@AnnoBoolean(value=true, zzz=false)"/> <line text="@AnnoClass(value=class java.lang.Integer, ccc=class java.lang.String)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@AnnoClass(value=java.lang.Integer.class, ccc=java.lang.String.class)" vm="1.9"/> + <line text="@AnnoClass(value=java.lang.Integer.class, ccc=java.lang.String.class)" vm="9+"/> <line text="@AnnoLong(value=999, jjj=111)"/> <line text="@AnnoString(value=set from xml, sss=xyz)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@AnnoString(value="set from xml", sss="xyz")" vm="1.9"/> + <line text="@AnnoString(value="set from xml", sss="xyz")" vm="9+"/> <line text="Annotations on field2? true"/> <line text="Annotation count is 1"/> <line text="@AnnoClass(value=class java.lang.String, ccc=class java.lang.String)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@AnnoClass(value=java.lang.String.class, ccc=java.lang.String.class)" vm="1.9"/> + <line text="@AnnoClass(value=java.lang.String.class, ccc=java.lang.String.class)" vm="9+"/> </stdout> </run> </ajc-test> @@ -202,10 +202,10 @@ <line text="Annotations on field1? true"/> <line text="Annotation count is 4"/> <line text="@AnnoChar(value=z, ccc=a)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@AnnoChar(value='z', ccc='a')" vm="1.9"/> + <line text="@AnnoChar(value='z', ccc='a')" vm="9+"/> <line text="@AnnoDouble(value=99.0, ddd=3.0)"/> <line text="@AnnoFloat(value=6.0, fff=4.0)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@AnnoFloat(value=6.0f, fff=4.0f)" vm="1.9"/> + <line text="@AnnoFloat(value=6.0f, fff=4.0f)" vm="9+"/> <line text="@AnnoShort(value=8, sss=3)"/> <line text="Annotations on field2? true"/> <line text="Annotation count is 2"/> @@ -222,7 +222,7 @@ <line text="Annotations on field1? true"/> <line text="Annotation count is 1"/> <line text="@Annot(a=a, fred=false, value=abc)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@Annot(a='a', fred=false, value="abc")" vm="1.9"/> + <line text="@Annot(a='a', fred=false, value="abc")" vm="9+"/> </stdout> </run> </ajc-test> @@ -234,7 +234,7 @@ <line text="Annotations on field1? true"/> <line text="Annotation count is 1"/> <line text="@Annot(a=a, fred=false, value=abc)" vm="1.4,1.5,1.6,1.7,1.8"/> - <line text="@Annot(a='a', fred=false, value="abc")" vm="1.9"/> + <line text="@Annot(a='a', fred=false, value="abc")" vm="9+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc173/ajc173.xml b/tests/src/org/aspectj/systemtest/ajc173/ajc173.xml index 4a784fff8..398fae62f 100644 --- a/tests/src/org/aspectj/systemtest/ajc173/ajc173.xml +++ b/tests/src/org/aspectj/systemtest/ajc173/ajc173.xml @@ -10,7 +10,7 @@ <run class="Hello"> <stdout> <line text="@MyAnnotation(dummy1=, dummy2=korte)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="@MyAnnotation(dummy1="", dummy2="korte")" vm="1.9"/> + <line text="@MyAnnotation(dummy1="", dummy2="korte")" vm="9+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java b/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java index 26d0905e8..607f723fc 100644 --- a/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc190/Ajc190Tests.java @@ -21,10 +21,6 @@ import junit.framework.Test; */ public class Ajc190Tests extends org.aspectj.testing.XMLBasedAjcTestCase { - public void testVarious_SettingFinalStatic() { - runTest("setting static final outside clinit"); - } - public void testAnnotMethodHasMember_pr156962_1() { // From similar in Ajc153Tests runTest("Test Annot Method Has Member 1"); } diff --git a/tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml b/tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml index 41a75c0ae..24d683928 100644 --- a/tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml +++ b/tests/src/org/aspectj/systemtest/ajc190/ajc190_from150.xml @@ -2809,7 +2809,7 @@ <line text="1 @Foo()"/> <line text="1 @Foo()"/> <line text="1 @Classified(classification=TOP-SECRET)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8"/> - <line text="1 @Classified(classification="TOP-SECRET")" vm="1.9"/> + <line text="1 @Classified(classification="TOP-SECRET")" vm="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"/> |