Cosmetic fixes in Java 18 tests (e.g. copyright year 2022)

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

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18Only.java
index d79229c1b0c3ec5a80e59972b9dcbcf7e60d924c..fade6c92fee27207a8c07ce68b6e7cf19cf6067f 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18Only.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18Only.java
@@ -1,5 +1,5 @@
 /* *******************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved.
  * This program and the accompanying materials are made available
  * under the terms of the Eclipse Public License v 2.0

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18OrLater.java
index 9b9efdd34bf29a80b0ffdeef047fb842baa0857b..20e26862f8dc9dc0def5ab0630133e873cbc5f38 100644 (file)
--- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18OrLater.java
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava18OrLater.java
@@ -1,5 +1,5 @@
 /* *******************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved.
  * This program and the accompanying materials are made available
  * under the terms of the Eclipse Public License v 2.0

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/Ajc199TestsJava.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/Ajc199TestsJava.java
index 7040deba42fee616b20084a9147dc6268ff7e2af..2b3ad813a0c7565d43322f9415ca7e88b89d3ef4 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/Ajc199TestsJava.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/Ajc199TestsJava.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at
@@ -17,7 +17,7 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava18OrLater;
 public class Ajc199TestsJava extends XMLBasedAjcTestCaseForJava18OrLater {
 
   public void testDummyJava18() {
-    runTest("dummy Java 18");
+    //runTest("dummy Java 18");
   }
 
   public static Test suite() {

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java
index 9cb01eec8f97ccab559cafda236b9814a1541fba..6ff7adee40bbdb4b3d9faa191c46c4bc3efcb010 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/AllTestsAspectJ199.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
index 5b2087ed21b57c29b906d4772b90754767c0115f..9d1dc6c6d9f1c8f1056f6963f27fb53f6d28134d 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/Java18PreviewFeaturesTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/Java18PreviewFeaturesTests.java
index dbe6f733af63944bb6f241d6a1264c34c98e2a6d..8afe68946f33851a3f7a7db04e6a98970206f95f 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/Java18PreviewFeaturesTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/Java18PreviewFeaturesTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at

diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/SanityTestsJava18.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/SanityTestsJava18.java
index d86e11454f0ba1853c0566a2fb145dfcad016b27..2fd9d2660ab056376cfc7092a6f8e3ece37962a8 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/SanityTestsJava18.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/SanityTestsJava18.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2021 Contributors
+ * Copyright (c) 2022 Contributors
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v 2.0
  * which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@ import org.aspectj.testing.XMLBasedAjcTestCaseForJava18OrLater;
 
 /*
  * Some very trivial tests that help verify things are OK.
- * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -17 option
+ * These are a copy of the earlier Sanity Tests created for 1.6 but these supply the -18 option
  * to check code generation and modification with that version specified.
  *
  * @author Alexander Kriegisch

diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
index 7c38db68e5bedd94f490ece148d752bca1182205..5488671f5531c85b8851143e137172ce53cbf595 100644 (file)
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc199/ajc199.xml
@@ -3,10 +3,6 @@
 
 <suite>
 
-       <!-- Java 18 final: no new features, only 2nd preview for "JEP 420: Pattern Matching for switch (Second Preview)" -->
-       <ajc-test dir="features199/java18" vm="18" title="dummy Java 18">
-       </ajc-test>
-
        <!-- Java ?? final, Java 17, 18 preview -->
        <ajc-test dir="features198/java17" vm="18" title="switch pattern matching error">
                <compile files="SwitchPatternError.java" options="--enable-preview -18">