Fix tests due to changed JDK 'toString' methods in Java 19

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

3 files changed, 51 insertions, 42 deletions

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
index 650bdea43..838003df5 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1612/ajc1612.xml
@@ -7,7 +7,8 @@
      <run class="AspectWithConstant">
      <stdout>
      <line text="MAX=9"/>
-     <line text="@AspectWithConstant$Loggable()"/>
+     <line text="@AspectWithConstant$Loggable()" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18"/>
+     <line text="@AspectWithConstant.Loggable()" vm="19+"/>
      </stdout></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 185e3084c..5bb0155d3 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
@@ -1,7 +1,7 @@
 <!DOCTYPE suite SYSTEM "../tests/ajcTestSuite.dtd"[]>
 
 <suite>
-   
+
     <ajc-test dir="features169/itdInnerTypes/separate" title="separate compilation">
      <compile files="Basic.java" options="-1.5"/>
      <compile files="Basic2.java"/>
@@ -11,7 +11,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
     <ajc-test dir="features169/itdInnerTypes/separate2" title="separate compilation - 2">
      <compile files="Basic.java" options="-1.5"/>
      <compile files="Basic2.java"/>
@@ -28,7 +28,7 @@
      <message kind="error" text="target type already declares a "/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="construction4">
      <compile files="Construction4.java" options="-1.5"/>
      <run class="Construction4">
@@ -37,7 +37,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="construction3">
      <compile files="Construction3.java" options="-1.5"/>
      <run class="Construction3">
@@ -46,7 +46,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/ten" title="construction2">
      <compile files="Construction.java Aspect1.java Aspect2.java" options="-1.5"/>
      <run class="Construction">
@@ -55,7 +55,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="construction">
      <compile files="Construction.java" options="-1.5"/>
      <run class="Construction">
@@ -64,7 +64,7 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/nine" title="vote - itd mixture 2">
      <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -72,11 +72,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/eight" title="vote - itd mixture">
      <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -84,11 +85,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/seven" title="vote - method reference">
      <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -96,11 +98,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/six" title="vote - field reference">
      <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -108,11 +111,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/five" title="vote - inner inner">
      <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -120,11 +124,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/four" title="vote - reference via annotation - two">
      <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -132,11 +137,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/three" title="vote - reference via annotation">
      <compile files="Vote.java Vote_Amender.aj Runner.java RelatedType.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -144,11 +150,12 @@
        <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,10,11,12,13"/>
-       <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14+"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14,15,16,17,18"/>
+       <line text="@a.b.c.RelatedType(a.b.c.Vote._.class)" vm="19+"/>
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/two" title="vote - construction">
      <compile files="Vote.java Vote_Amender.aj Runner.java" options="-1.5"/>
      <run class="a.b.c.Runner">
@@ -157,12 +164,12 @@
        </stdout>
      </run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes/one" title="vote - basic">
      <compile files="Vote.java Vote_Amender.aj Runner.java" options="-1.5"/>
      <run class="a.b.c.Runner"/>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="choice - generics 1">
      <compile files="ChoiceGenerics1.java" options="-1.5"/>
    </ajc-test>
@@ -172,7 +179,7 @@
        <message kind="error" text="Type mismatch: cannot convert from String to Integer"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="choice">
      <compile files="Choice.java" options="-1.5"/>
      <run class="Choice">
@@ -180,17 +187,17 @@
        <line text="null"/>
        </stdout></run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="choice - weaveinfo">
      <compile files="Choice.java" options="-1.5 -showWeaveInfo">
        <message kind="weave" text="Type 'Choice' (Choice.java) has intertyped member class from 'X' (Choice.java)"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="choice - model">
      <compile files="Choice.java" options="-1.5 -emacssym"/>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="choice2">
      <compile files="Choice2.java" options="-1.5"/>
      <run class="Choice2">
@@ -198,7 +205,7 @@
        <line text="null"/>
        </stdout></run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="field access">
      <compile files="FieldAccess.java" options="-1.5"/>
      <run class="FieldAccess">
@@ -206,7 +213,7 @@
        <line text="42"/>
        </stdout></run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="method access">
      <compile files="MethodCall.java" options="-1.5"/>
      <run class="MethodCall">
@@ -214,43 +221,43 @@
        <line text="42"/>
        </stdout></run>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="only static">
      <compile files="OnlyStatic.java" options="-1.5">
      	<message kind="error" line="5" text="Intertype declared member types can only be static (compiler limitation)"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="on interface">
      <compile files="OnInterface.java" options="-1.5">
      	<message kind="error" line="5" text="Cannot declare new member type on 'OnInterface'. New member types can only be specified on classes (compiler limitation)"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="on enum">
      <compile files="OnEnum.java" options="-1.5">
      	<message kind="error" line="6" text="Cannot declare new member type on 'EEE'. New member types can only be specified on classes (compiler limitation)"/>
      </compile>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="on annotation">
      <compile files="OnAnnotation.java" options="-1.5">
      	<message kind="error" line="8" text="Cannot declare new member type on 'Anno'. New member types can only be specified on classes (compiler limitation)"/>
      </compile>
    </ajc-test>
-   
-   <!-- 
+
+   <!--
    <ajc-test dir="features169/itdInnerTypes" title="simplest 3">
      <compile files="Simplest3.java" options="-1.5"/>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="simplest 2">
      <compile files="Simplest2.java" options="-1.5"/>
    </ajc-test>
-   
+
    <ajc-test dir="features169/itdInnerTypes" title="simplest">
      <compile files="Simplest.java" options="-1.5"/>
    </ajc-test>
    -->
-   
-</suite>
\ No newline at end of file
+
+</suite>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc188/ajc188.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc188/ajc188.xml
index 187fb50b3..7e7f9ba71 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc188/ajc188.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc188/ajc188.xml
@@ -8,10 +8,11 @@
      <run class="AspectWithConstant">
      <stdout>
      <line text="MAXS=hello"/>
-     <line text="@AspectWithConstant$Loggable()"/>
+     <line text="@AspectWithConstant$Loggable()" vm="1.2,1.3,1.4,1.5,1.6,1.7,1.8,9,10,11,12,13,14,15,16,17,18"/>
+     <line text="@AspectWithConstant.Loggable()" vm="19+"/>
      </stdout></run>
    </ajc-test>
-   
+
 <ajc-test dir="bugs188/484941" title="annotation discovery npe">
 <compile files="Test2.java" options="-1.8 -XnoInline"/>
 </ajc-test>