diff options
| author | Andy Clement <aclement@pivotal.io> | 2020-04-20 16:24:02 -0700 |
|---|---|---|
| committer | Andy Clement <aclement@pivotal.io> | 2020-04-20 16:24:02 -0700 |
| commit | 4471ba76ac755b504d99e514a1cf5a375e7d02d1 (patch) | |
| tree | 5f8d4f4dfb79d72f6c344294a319b0b04b01e2ae /tests/src/test/resources/org | |
| parent | 17026e35243f229c2e3c07c292f2caaac65503a4 (diff) | |
| download | aspectj-4471ba76ac755b504d99e514a1cf5a375e7d02d1.tar.gz aspectj-4471ba76ac755b504d99e514a1cf5a375e7d02d1.zip | |
Include JDTCore for Java14
Diffstat (limited to 'tests/src/test/resources/org')
9 files changed, 252 insertions, 98 deletions
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml index 9eda00b0c..98029d475 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc150/ajc150.xml @@ -3813,46 +3813,64 @@ <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="9+"/> + <line text="@this-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="9,10,11,12,13"/> + <line text="@this-ok @MyAnnotation("my-value") execution(void X.foo())" vm="14+"/> <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="9+"/> + <line text="@target-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="9,10,11,12,13"/> + <line text="@target-ok @MyAnnotation("my-value") execution(void X.foo())" vm="14+"/> <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="9+"/> + <line text="@within-ok @MyAnnotation(value="my-value") execution(void X.foo())" vm="9,10,11,12,13"/> + <line text="@within-ok @MyAnnotation("my-value") execution(void X.foo())" vm="14+"/> <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="9+"/> + <line text="@annotation-ok-sub @MyAnnotation(value="bar") execution(void X.bar())" vm="9,10,11,12,13"/> + <line text="@annotation-ok-sub @MyAnnotation("bar") execution(void X.bar())" vm="14+"/> <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="9+"/> + <line text="@annotation-ok @MyAnnotation(value="bar") execution(void X.bar())" vm="9,10,11,12,13"/> + <line text="@annotation-ok @MyAnnotation("bar") execution(void X.bar())" vm="14+"/> <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="9+"/> + <line text="@this-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="9,10,11,12,13"/> + <line text="@this-ok @MyAnnotation("my-value") execution(void X.bar())" vm="14+"/> <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="9+"/> + <line text="@target-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="9,10,11,12,13"/> + <line text="@target-ok @MyAnnotation("my-value") execution(void X.bar())" vm="14+"/> <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="9+"/> + <line text="@within-ok @MyAnnotation(value="my-value") execution(void X.bar())" vm="9,10,11,12,13"/> + <line text="@within-ok @MyAnnotation("my-value") execution(void X.bar())" vm="14+"/> <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="9+"/> + <line text="@args-ok @MyAnnotation(value="my-value") execution(void Y.foo(X))" vm="9,10,11,12,13"/> + <line text="@args-ok @MyAnnotation("my-value") execution(void Y.foo(X))" vm="14+"/> <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="9+"/> + <line text="@this-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="9,10,11,12,13"/> + <line text="@this-ok @MyAnnotation("on Y") execution(void Y.foo(X))" vm="14+"/> <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="9+"/> + <line text="@target-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="9,10,11,12,13"/> + <line text="@target-ok @MyAnnotation("on Y") execution(void Y.foo(X))" vm="14+"/> <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="9+"/> + <line text="@within-ok @MyAnnotation(value="on Y") execution(void Y.foo(X))" vm="9,10,11,12,13"/> + <line text="@within-ok @MyAnnotation("on Y") execution(void Y.foo(X))" vm="14+"/> <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="9+"/> + <line text="@annotation-ok-sub @MyAnnotation(value="my-value") execution(X Y.bar())" vm="9,10,11,12,13"/> + <line text="@annotation-ok-sub @MyAnnotation("my-value") execution(X Y.bar())" vm="14+"/> <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="9+"/> + <line text="@annotation-ok @MyAnnotation(value="my-value") execution(X Y.bar())" vm="9,10,11,12,13"/> + <line text="@annotation-ok @MyAnnotation("my-value") execution(X Y.bar())" vm="14+"/> <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="9+"/> + <line text="@this-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="9,10,11,12,13"/> + <line text="@this-ok @MyAnnotation("on Y") execution(X Y.bar())" vm="14+"/> <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="9+"/> + <line text="@target-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="9,10,11,12,13"/> + <line text="@target-ok @MyAnnotation("on Y") execution(X Y.bar())" vm="14+"/> <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="9+"/> + <line text="@within-ok @MyAnnotation(value="on Y") execution(X Y.bar())" vm="9,10,11,12,13"/> + <line text="@within-ok @MyAnnotation("on Y") execution(X Y.bar())" vm="14+"/> <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="9+"/> + <line text="@withincode-ok @MyAnnotation(value="my-value") get(X Y.x)" vm="9,10,11,12,13"/> + <line text="@withincode-ok @MyAnnotation("my-value") get(X Y.x)" vm="14+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc151/ajc151.xml index 279c56e04..8d8cd66b8 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc151/ajc151.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc151/ajc151.xml @@ -92,8 +92,10 @@ <compile files="Failing.java" options="-1.5"/> <run class="Failing"> <stderr> - <line text="On TestInterface:@TestAnnotation(value=true)"/> - <line text="On Failing:@TestAnnotation(value=true)"/> + <line text="On TestInterface:@TestAnnotation(value=true)" vm="1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="On TestInterface:@TestAnnotation(true)" vm="14+"/> + <line text="On Failing:@TestAnnotation(value=true)" vm="1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="On Failing:@TestAnnotation(true)" vm="14+"/> </stderr> </run> </ajc-test> @@ -102,8 +104,10 @@ <compile files="Failing2.java" options="-1.5"/> <run class="Failing2"> <stderr> - <line text="On TestInterface:@TestAnnotation(value=true)"/> - <line text="On Failing2:@TestAnnotation(value=true)"/> + <line text="On TestInterface:@TestAnnotation(value=true)" vm="1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="On TestInterface:@TestAnnotation(true)" vm="14+"/> + <line text="On Failing2:@TestAnnotation(value=true)" vm="1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="On Failing2:@TestAnnotation(true)" vm="14+"/> </stderr> </run> </ajc-test> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml index 75846b05c..185e3084c 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml @@ -71,7 +71,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -82,7 +83,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -93,7 +95,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -104,7 +107,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -115,7 +119,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -126,7 +131,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/> </stdout> </run> </ajc-test> @@ -137,7 +143,8 @@ <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="9+"/> + <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9,10,11,12,13"/> + <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc170/ajc170.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc170/ajc170.xml index e379d6cab..f372197c0 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc170/ajc170.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc170/ajc170.xml @@ -184,7 +184,8 @@ <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="9+"/> - <line text="@AnnoLong(value=999, jjj=111)"/> + <line text="@AnnoLong(value=999L, jjj=111L)" vm="14+"/> + <line text="@AnnoLong(value=999, jjj=111)" vm="1.2,1.3,1.4,1.5,1.6,1.6,1.8,9,10,11,12,13"/> <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="9+"/> <line text="Annotations on field2? true"/> @@ -209,7 +210,8 @@ <line text="@AnnoShort(value=8, sss=3)"/> <line text="Annotations on field2? true"/> <line text="Annotation count is 2"/> - <line text="@AnnoByte(value=88, bbb=66)"/> + <line text="@AnnoByte(value=88, bbb=66)" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="@AnnoByte(value=(byte)0x58, bbb=(byte)0x42)" vm="14+"/> <line text="@AnnoInt(iii=111, value=99)"/> </stdout> </run> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc174/ajc174.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc174/ajc174.xml index 456fb412f..00a0166fa 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc174/ajc174.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc174/ajc174.xml @@ -99,7 +99,8 @@ <run class="Target4"> <stdout> <line text="1"/> - <line text="@Tagged(value=31)"/> + <line text="@Tagged(value=31)" vm="1.5,1.6,1.7,1.8,9,10,11,12,13"/> + <line text="@Tagged(31)" vm="14+"/> </stdout> </run> </ajc-test> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml index cea315f82..2a4be40f8 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc193/ajc193.xml @@ -51,46 +51,6 @@ Method call </run> </ajc-test> - <!-- with the release of 13 this behaviour seems to have moved from 12 to 13?? --> - <ajc-test dir="features193" vm="13" title="switch 1"> - <compile files="Switch1.java" options="-13 --enable-preview"> - </compile> - <run class="Switch1" vmargs="--enable-preview"> - <stdout> - <line text="0"/> - <line text="1"/> - <line text="2"/> - <line text="3"/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="features193" vm="13" title="switch 2"> - <compile files="Switch2.java" options="--enable-preview -source 13"> - </compile> - <run class="Switch2" vmargs="--enable-preview"> - <stdout> - <line text="0"/> - <line text="2"/> - <line text="4"/> - <line text="6"/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="features193" vm="13" title="switch 3"> - <compile files="Switch3.java" options="--enable-preview -source 13"> - </compile> - <run class="Switch3" vmargs="--enable-preview"> - <stdout> - <line text="3"/> - <line text="6"/> - <line text="9"/> - <line text="12"/> - </stdout> - </run> - </ajc-test> - <ajc-test dir="bugs193/543657" vm="1.8" title="overweaving decm - reweaving"> <compile files="MoodIndicator.java,Code1.java" options="-showWeaveInfo -1.8" outjar="one.jar"> <message kind="weave" text="Mixing interface 'MoodIndicator$Moody' (MoodIndicator.java) into type 'Code1' (Code1.java)"/> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc195/ajc195.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc195/ajc195.xml index d9d679859..9b109a3f1 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc195/ajc195.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc195/ajc195.xml @@ -103,31 +103,6 @@ </run> </ajc-test> - - <ajc-test dir="features195/textblock" vm="13" title="textblock 1"> - <compile files="Code.java" options="--enable-preview -source 13"> - </compile> - <run class="Code" vmargs="--enable-preview"> - <stdout> - <line text="this is a text"/> - <!-- the incidental space is removed with a trim in output matching but the test app doesn't remove it when printing it, why? --> - <line text="block"/> - <line text=""/> - </stdout> - </run> - </ajc-test> - - <ajc-test dir="features195/textblock" vm="13" title="textblock 2"> - <compile files="Code2.java" options="--enable-preview -source 13"> - </compile> - <run class="Code2" vmargs="--enable-preview"> - <stdout> - <!-- why is the incidental space not removed here?? --> - <line text="this is a text"/> - <line text="block in advice"/> - <line text=""/> - </stdout> - </run> - </ajc-test> + </suite> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml new file mode 100644 index 000000000..cd5a4870a --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc196/ajc196.xml @@ -0,0 +1,118 @@ +<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> + +<suite> + + <!-- switch now in Java14 and doesn't need -enable-preview flag --> + <ajc-test dir="features193" vm="14" title="switch 1"> + <compile files="Switch1.java" options="-14"> + </compile> + <run class="Switch1" vmargs="--enable-preview"> + <stdout> + <line text="0" /> + <line text="1" /> + <line text="2" /> + <line text="3" /> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="features193" vm="14" title="switch 2"> + <compile files="Switch2.java" options="-source 14"> + </compile> + <run class="Switch2" vmargs=""> + <stdout> + <line text="0" /> + <line text="2" /> + <line text="4" /> + <line text="6" /> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="features193" vm="14" title="switch 3"> + <compile files="Switch3.java" options="-source 14"> + </compile> + <run class="Switch3" vmargs=""> + <stdout> + <line text="3" /> + <line text="6" /> + <line text="9" /> + <line text="12" /> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs196/java14" vm="14" title="simple record"> + <compile files="Person.java" options="--enable-preview -14" /> + </ajc-test> + + <ajc-test dir="bugs196/java14" vm="14" title="using a record"> + <compile files="Person.java UsingPersonRecord.java" + options="--enable-preview -14" /> + <run class="UsingPersonRecord" vmargs="--enable-preview"> + <stdout> + <line text="Person[firstName=A, lastName=B, age=99]" /> + <line text="A" /> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs196/java14" vm="14" + title="instanceof patterns"> + <compile files="Jep305.java" options="--enable-preview -14" /> + <run class="Jep305" vmargs="--enable-preview"> + <stdout> + <line text="orange" /> + <line text="apple" /> + </stdout> + </run> + </ajc-test> + + + <ajc-test dir="bugs196/java14" vm="14" + title="advising records"> + <compile + files="TraceRecordComponents.aj Person.java UsingPersonRecord.java" + options="--enable-preview -14" /> + <run class="UsingPersonRecord" vmargs="--enable-preview"> + <stdout> + <line text="execution(String Person.toString())" /> + <line text="Person[firstName=A, lastName=B, age=99]" /> + <line text="execution(String Person.firstName())" /> + <line text="A" /> + </stdout> + </run> + </ajc-test> + + + <!-- textblock still in preview at 14 level --> + <ajc-test dir="features195/textblock" vm="14" + title="textblock 1"> + <compile files="Code.java" + options="--enable-preview -source 14"> + </compile> + <run class="Code" vmargs="--enable-preview"> + <stdout> + <line text="this is a text" /> + <!-- the incidental space is removed with a trim in output matching but + the test app doesn't remove it when printing it, why? --> + <line text="block" /> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="features195/textblock" vm="14" + title="textblock 2"> + <compile files="Code2.java" + options="--enable-preview -source 14"> + </compile> + <run class="Code2" vmargs="--enable-preview"> + <stdout> + <!-- why is the incidental space not removed here?? --> + <line text="this is a text" /> + <line text="block in advice" /> + </stdout> + </run> + </ajc-test> + +</suite> diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml new file mode 100644 index 000000000..e831c9916 --- /dev/null +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc196/sanity-tests-14.xml @@ -0,0 +1,69 @@ +<!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]> + +<suite> + + <!-- empty class --> + <ajc-test dir="bugs160/simplejava" title="simple - a"> + <compile files="SimpleA.java" options="-14"/> + </ajc-test> + + <!-- class with one method --> + <ajc-test dir="bugs160/simplejava" title="simple - b"> + <compile files="SimpleB.java" options="-14"/> + <run class="SimpleB"/> + </ajc-test> + + <!-- empty aspect --> + <ajc-test dir="bugs160/simplejava" title="simple - c"> + <compile files="SimpleC.java" options="-13"/> + </ajc-test> + + <!-- simple before --> + <ajc-test dir="bugs160/simplejava" title="simple - d"> + <compile files="SimpleD.java" options="-14"/> + </ajc-test> + + <!-- simple itd field --> + <ajc-test dir="bugs160/simplejava" title="simple - e"> + <compile files="SimpleE.java" options="-14"/> + </ajc-test> + + <!-- aspect with main calling a static method --> + <ajc-test dir="bugs160/simplejava" title="simple - f"> + <compile files="SimpleF.java" options="-14"/> + </ajc-test> + + <!-- pertarget --> + <ajc-test dir="bugs160/simplejava" title="simple - g"> + <compile files="SimpleG.java" options="-14"/> + </ajc-test> + + <!-- generic ctor itds --> + <ajc-test dir="bugs160/simplejava" title="simple - h"> + <compile files="SimpleH.java" options="-14"/> + </ajc-test> + + <!-- overriding generic itd methods --> + <ajc-test dir="bugs160/simplejava" title="simple - i"> + <compile files="SimpleI.java" options="-14"/> + </ajc-test> + + <!-- check class file version is 57.0 --> + <ajc-test dir="bugs160/simplejava" title="simple - j"> + <compile files="SimpleJ.java" options="-14"/> + </ajc-test> + + <!-- check class file version is 57.0 --> + <ajc-test dir="bugs160/simplejava" title="simple - k"> + <compile files="SimpleJ.java" options="-source 14"/> + </ajc-test> + + <!-- check class file version is 49.0 --> + <ajc-test dir="bugs160/simplejava" title="simple - m"> + <compile files="SimpleJ.java" options="-1.5"/> + </ajc-test> + + <ajc-test dir="bugs160/simplejava" title="simple - n"> + <compile files="SimpleN.java" options="-14"/> + </ajc-test> +</suite> |