aboutsummaryrefslogtreecommitdiffstats
path: root/tests/src/test/resources/org
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2024-02-12 15:19:33 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2024-02-13 10:31:17 +0700
commit8478d33a68781b3dd950224eb3ebbec6727bfc8e (patch)
treee92a173345b9e6b8002ba37c95ca7a7b82673904 /tests/src/test/resources/org
parentfcf0c35b5d43a5abf7c50970b97da1f3d0a30de8 (diff)
downloadaspectj-8478d33a68781b3dd950224eb3ebbec6727bfc8e.tar.gz
aspectj-8478d33a68781b3dd950224eb3ebbec6727bfc8e.zip
ITD inner type tests: replace '_' by '__'
Classes and methods named '_' are no longer allowed in ECJ, obviously also not for old target versions like 1.5. This probably is due to the added support for unnamed patterns and classes in the latest upstream JDT Core merge. Therefore, we simply rename '_' to '__'. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests/src/test/resources/org')
-rw-r--r--tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml56
1 files changed, 28 insertions, 28 deletions
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 e4dbec2fa..97168ab1f 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc169/intertype.xml
@@ -66,14 +66,14 @@
</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"/>
+ <compile files="Underscorer.aj Vote.java Runner.java RelatedType.java" options="-1.5" vm=""/>
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -83,10 +83,10 @@
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -96,10 +96,10 @@
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -109,10 +109,10 @@
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -122,10 +122,10 @@
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -135,10 +135,10 @@
<run class="a.b.c.Runner">
<stdout>
<line text="wibble"/>
- <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_$choice)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_$choice.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_$choice.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.choice.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=class a.b.c.Vote$__$choice)" vm="-1.8"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__$choice.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__$choice.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.choice.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>
@@ -149,9 +149,9 @@
<stdout>
<line text="wibble"/>
<line text="@a.b.c.RelatedType(value=class a.b.c.Vote$_)" vm="-1.8"/>
- <line text="@a.b.c.RelatedType(value=a.b.c.Vote$_.class)" vm="9-13"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote$_.class)" vm="14-18"/>
- <line text="@a.b.c.RelatedType(a.b.c.Vote._.class)" vm="19-"/>
+ <line text="@a.b.c.RelatedType(value=a.b.c.Vote$__.class)" vm="9-13"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote$__.class)" vm="14-18"/>
+ <line text="@a.b.c.RelatedType(a.b.c.Vote.__.class)" vm="19-"/>
</stdout>
</run>
</ajc-test>