diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-10-02 13:55:59 +0200 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-10-02 13:57:53 +0200 |
| commit | 93e3bd515e5244a2d365862f07aaf7a449b6d510 (patch) | |
| tree | 1523e3ea04fa5a3767ec7c42c69bb83797591e75 /tests/src/test | |
| parent | 30773df20ff88e4fb5ba76a1e0aadc4b02ba0d58 (diff) | |
| download | aspectj-93e3bd515e5244a2d365862f07aaf7a449b6d510.tar.gz aspectj-93e3bd515e5244a2d365862f07aaf7a449b6d510.zip | |
Update ECJ version, activate Java 17 preview features tests
After JDT Core (ECJ) was updated to the final Java 17 feature set, the
tests now pass as expected.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests/src/test')
| -rw-r--r-- | tests/src/test/java/org/aspectj/systemtest/ajc198/Java17PreviewFeaturesTests.java | 22 | ||||
| -rw-r--r-- | tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml | 2 |
2 files changed, 9 insertions, 15 deletions
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Java17PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Java17PreviewFeaturesTests.java index e17ae26d6..c1b0f8c44 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc198/Java17PreviewFeaturesTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Java17PreviewFeaturesTests.java @@ -18,26 +18,20 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava17Only; public class Java17PreviewFeaturesTests extends XMLBasedAjcTestCaseForJava17Only { public void testSwitchPatternMatchingCaseLabelDominatedByPrecedingError() { - // TODO: JDT Core does not support detecting type domination detection in the development version yet -> activate when available - System.out.println("TODO: JDT Core does not support detecting type domination detection in the development version yet -> activate when available"); -// runTest("switch pattern matching error"); + runTest("switch pattern matching error"); } public void testSwitchPatternMatchingJava() { - // TODO: JDT Core does not support sealed class coverage in the development version yet -> activate when available - System.out.println("TODO: JDT Core does not support sealed class coverage in the development version yet -> activate when available"); -// runTest("switch pattern matching java"); -// checkVersion("SwitchPatternOK", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); + runTest("switch pattern matching java"); + checkVersion("SwitchPatternOK", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); } public void testSwitchPatternMatchingAspect() { - // TODO: JDT Core does not support sealed class coverage in the development version yet -> activate when available - System.out.println("TODO: JDT Core does not support sealed class coverage in the development version yet -> activate when available"); -// runTest("switch pattern matching aspect"); -// checkVersion("SwitchPatternAspect", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); -// checkVersion("Application", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); -// checkVersion("Shape", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); -// checkVersion("S", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); + runTest("switch pattern matching aspect"); + checkVersion("SwitchPatternAspect", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); + checkVersion("Application", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); + checkVersion("Shape", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); + checkVersion("S", Constants.MAJOR_17, Constants.PREVIEW_MINOR_VERSION); } public static Test suite() { diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml index a0c26d098..9937413a9 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml @@ -30,7 +30,7 @@ <ajc-test dir="features198/java17" vm="17" title="switch pattern matching error"> <compile files="SwitchPatternError.java" options="--enable-preview -17"> <!-- TODO: Add correct compiler error message, as soon as JDT Core supports it --> - <message kind="error" file="SwitchPatternError.java" text="XXX"/> + <message kind="error" file="SwitchPatternError.java" text="This case label is dominated by one of the preceding case label"/> </compile> </ajc-test> |