From 30d5e3fdccd06bda16c4f96006ebf30ea35837d7 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sat, 23 Mar 2024 08:51:23 +0100 Subject: [PATCH] Remove some TODOs from Java feature tests Signed-off-by: Alexander Kriegisch --- .../java19/RecordPatternsPreview1ExhaustivenessAspect.aj | 2 -- .../java19/RecordPatternsPreview1ExhaustivenessOK1.java | 2 -- tests/features1921/java21/StringPatternsPreview1.java | 1 - .../systemtest/ajc1922/Java22PreviewFeaturesTests.java | 4 ---- .../resources/org/aspectj/systemtest/ajc1921/ajc1921.xml | 6 ------ .../resources/org/aspectj/systemtest/ajc1922/ajc1922.xml | 3 --- 6 files changed, 18 deletions(-) diff --git a/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessAspect.aj b/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessAspect.aj index 37c73788f..e8d47b9af 100644 --- a/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessAspect.aj +++ b/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessAspect.aj @@ -13,7 +13,6 @@ public aspect RecordPatternsPreview1ExhaustivenessAspect { switch (pair) { case Pair(I i, C c) -> System.out.println("x"); case Pair(I i, D d) -> System.out.println("y"); - // TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed. // Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessAspect.aj. default -> System.out.println("z"); } @@ -22,7 +21,6 @@ public aspect RecordPatternsPreview1ExhaustivenessAspect { case Pair(C c, I i) -> System.out.println("a"); case Pair(D d, C c) -> System.out.println("b"); case Pair(D d1, D d2) -> System.out.println("c"); - // TODO: remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed. // Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessAspect.aj. default -> System.out.println("d"); } diff --git a/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessOK1.java b/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessOK1.java index 1d1d9d4f3..cd9a89b38 100644 --- a/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessOK1.java +++ b/tests/features1919/java19/RecordPatternsPreview1ExhaustivenessOK1.java @@ -10,7 +10,6 @@ public class RecordPatternsPreview1ExhaustivenessOK1 { switch (p2) { case Pair(I i, C c) -> System.out.println("x"); case Pair(I i, D d) -> System.out.println("y"); - // TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed. // Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessOK1.java. default -> System.out.println("z"); } @@ -19,7 +18,6 @@ public class RecordPatternsPreview1ExhaustivenessOK1 { case Pair(C c, I i) -> System.out.println("a"); case Pair(D d, C c) -> System.out.println("b"); case Pair(D d1, D d2) -> System.out.println("c"); - // TODO: Remove redundant default clause when https://github.com/eclipse-jdt/eclipse.jdt.core/issues/455 has been fixed. // Fixed since Java 21, see features1921/java21/RecordPatternsPreview1ExhaustivenessOK1.java. default -> System.out.println("d"); } diff --git a/tests/features1921/java21/StringPatternsPreview1.java b/tests/features1921/java21/StringPatternsPreview1.java index ae1829c84..63fc9e594 100644 --- a/tests/features1921/java21/StringPatternsPreview1.java +++ b/tests/features1921/java21/StringPatternsPreview1.java @@ -16,7 +16,6 @@ public class StringPatternsPreview1 { public static void main(String[] args) { // Embedded expressions can be strings String firstName = "Bill", lastName = "Duck"; - // TODO: Due to https://github.com/eclipse-jdt/eclipse.jdt.core/issues/1719, this is currently rendered incorrectly System.out.println(STR."\{firstName} \{lastName}"); // Embedded expressions can perform arithmetic diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc1922/Java22PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc1922/Java22PreviewFeaturesTests.java index 0116f8821..2eec1ff84 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc1922/Java22PreviewFeaturesTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc1922/Java22PreviewFeaturesTests.java @@ -37,10 +37,6 @@ public class Java22PreviewFeaturesTests extends JavaVersionSpecificXMLBasedAjcTe runTest("named aspect with simple main method"); } - /** - * Still not implemented with the Java 21 release Eclipse 2023-12 (4.30), - * see GitHub issue 1106. - */ public void testUnnamedClassWithSimpleMainMethod() { runTest("unnamed class with simple main method"); } diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml index 7e948495a..6d454c423 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1921/ajc1921.xml @@ -54,7 +54,6 @@ - @@ -89,7 +88,6 @@ - @@ -105,7 +103,6 @@ - @@ -256,7 +253,6 @@ - @@ -278,7 +274,6 @@ - @@ -358,7 +353,6 @@ - diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1922/ajc1922.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1922/ajc1922.xml index 56dd2c8dd..d436032e2 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc1922/ajc1922.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1922/ajc1922.xml @@ -20,7 +20,6 @@ - @@ -42,7 +41,6 @@ - @@ -189,7 +187,6 @@ - -- 2.39.5