Skip to content

Commit 30d5e3f

Browse files
committed
Remove some TODOs from Java feature tests
Signed-off-by: Alexander Kriegisch <[email protected]>
1 parent 9279adc commit 30d5e3f

File tree

6 files changed

+0
-18
lines changed

6 files changed

+0
-18
lines changed

tests/features1919/java19/RecordPatternsPreview1ExhaustivenessAspect.aj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ public aspect RecordPatternsPreview1ExhaustivenessAspect {
1313
switch (pair) {
1414
case Pair<I>(I i, C c) -> System.out.println("x");
1515
case Pair<I>(I i, D d) -> System.out.println("y");
16-
// TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed.
1716
// Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessAspect.aj.
1817
default -> System.out.println("z");
1918
}
@@ -22,7 +21,6 @@ public aspect RecordPatternsPreview1ExhaustivenessAspect {
2221
case Pair<I>(C c, I i) -> System.out.println("a");
2322
case Pair<I>(D d, C c) -> System.out.println("b");
2423
case Pair<I>(D d1, D d2) -> System.out.println("c");
25-
// TODO: remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed.
2624
// Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessAspect.aj.
2725
default -> System.out.println("d");
2826
}

tests/features1919/java19/RecordPatternsPreview1ExhaustivenessOK1.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ static void exhaustiveSwitch() {
1010
switch (p2) {
1111
case Pair<I>(I i, C c) -> System.out.println("x");
1212
case Pair<I>(I i, D d) -> System.out.println("y");
13-
// TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed.
1413
// Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessOK1.java.
1514
default -> System.out.println("z");
1615
}
@@ -19,7 +18,6 @@ static void exhaustiveSwitch() {
1918
case Pair<I>(C c, I i) -> System.out.println("a");
2019
case Pair<I>(D d, C c) -> System.out.println("b");
2120
case Pair<I>(D d1, D d2) -> System.out.println("c");
22-
// TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed.
2321
// Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessOK1.java.
2422
default -> System.out.println("d");
2523
}

tests/features1921/java21/StringPatternsPreview1.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public class StringPatternsPreview1 {
1616
public static void main(String[] args) {
1717
// Embedded expressions can be strings
1818
String firstName = "Bill", lastName = "Duck";
19-
// TODO: Due to https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1719, this is currently rendered incorrectly
2019
System.out.println(STR."\{firstName} \{lastName}");
2120

2221
// Embedded expressions can perform arithmetic

tests/src/test/java/org/aspectj/systemtest/ajc1922/Java22PreviewFeaturesTests.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ public void testNamedAspectWithSimpleMainMethod() {
3737
runTest("named aspect with simple main method");
3838
}
3939

40-
/**
41-
* Still not implemented with the Java 21 release Eclipse 2023-12 (4.30),
42-
* see <a href="https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1106">GitHub issue 1106</a>.
43-
*/
4440
public void testUnnamedClassWithSimpleMainMethod() {
4541
runTest("unnamed class with simple main method");
4642
}

tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<!-- Java 21 final, Java 17, 18, 19, 20 preview -->
5555
<ajc-test dir="features1920/java20" vm="21" title="switch pattern matching preview 4 error">
5656
<compile files="SwitchPatternPreview4Error.java" options="-21">
57-
<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
5857
<message kind="error" file="SwitchPatternPreview4Error.java" text="This case label is dominated by one of the preceding case labels"/>
5958
</compile>
6059
</ajc-test>
@@ -89,7 +88,6 @@
8988
<!-- Java 21 final, Java 17, 18, 19, 20 preview -->
9089
<ajc-test dir="features198/java17" vm="21" title="switch pattern matching error">
9190
<compile files="SwitchPatternError.java" options="-21">
92-
<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
9391
<message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case labels"/>
9492
</compile>
9593
</ajc-test>
@@ -105,7 +103,6 @@
105103
<!-- Java 21 final, Java 17, 18, 19, 20 preview -->
106104
<ajc-test dir="features1919/java19" vm="21" title="switch pattern matching preview 3 error 2">
107105
<compile files="SwitchPatternPreview3Error2.java" options="-21">
108-
<!-- TODO: Add correct compiler error message, as soon as JDT Core supports it -->
109106
<message kind="error" file="SwitchPatternPreview3Error2.java" text="This case label is dominated by one of the preceding case labels"/>
110107
</compile>
111108
</ajc-test>
@@ -256,7 +253,6 @@
256253
</ajc-test>
257254

258255
<!-- Java 21 preview -->
259-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/893 is done -->
260256
<ajc-test dir="features1921/java21" vm="21" title="unnamed patterns">
261257
<compile files="UnnamedPatternsPreview1.java" options="--enable-preview -21"/>
262258
<run class="UnnamedPatternsPreview1" vmargs="--enable-preview">
@@ -278,7 +274,6 @@
278274
</ajc-test>
279275

280276
<!-- Java 21 preview -->
281-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/893 is done -->
282277
<ajc-test dir="features1921/java21" vm="21" title="unnamed patterns aspect">
283278
<compile files="UnnamedPatternsPreview1Aspect.aj" options="--enable-preview -21"/>
284279
<run class="UnnamedPatternsPreview1Aspect" vmargs="--enable-preview">
@@ -358,7 +353,6 @@
358353
</ajc-test>
359354

360355
<!-- Java 21 preview -->
361-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1106 is done -->
362356
<ajc-test dir="features1921/java21" vm="21" title="unnamed class with simple main method">
363357
<compile files="UnnamedClassWithSimpleMainMethodPreview1.java" options="--enable-preview -21"/>
364358
<run class="UnnamedClassWithSimpleMainMethodPreview1" vmargs="--enable-preview">

tests/src/test/resources/org/aspectj/systemtest/ajc1922/ajc1922.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
<suite>
2121

2222
<!-- Java 22 final, 21 preview -->
23-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/893 is done -->
2423
<ajc-test dir="features1921/java21" vm="22" title="unnamed patterns">
2524
<compile files="UnnamedPatternsPreview1.java" options="-22"/>
2625
<run class="UnnamedPatternsPreview1">
@@ -42,7 +41,6 @@
4241
</ajc-test>
4342

4443
<!-- Java 22 final, 21 preview -->
45-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/893 is done -->
4644
<ajc-test dir="features1921/java21" vm="22" title="unnamed patterns aspect">
4745
<compile files="UnnamedPatternsPreview1Aspect.aj" options="-22"/>
4846
<run class="UnnamedPatternsPreview1Aspect">
@@ -189,7 +187,6 @@
189187
</ajc-test>
190188

191189
<!-- Java 21, 22 preview -->
192-
<!-- TODO: Activate after https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1106 is done -->
193190
<ajc-test dir="features1921/java21" vm="22" title="unnamed class with simple main method">
194191
<compile files="UnnamedClassWithSimpleMainMethodPreview1.java" options="-22 --enable-preview"/>
195192
<run class="UnnamedClassWithSimpleMainMethodPreview1" vmargs="--enable-preview">

0 commit comments

Comments
 (0)