Add Java 15 / AspectJ 1.9.7 test suite

Also fix some minor details in Java 14 suite

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

1 files changed, 39 insertions, 0 deletions

diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java
new file mode 100644
index 000000000..82fe4045c
--- /dev/null
+++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava15Only.java
@@ -0,0 +1,39 @@
+/* *******************************************************************
+ * Copyright (c) 2021 Contributors
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * ******************************************************************/
+package org.aspectj.testing;
+
+import org.aspectj.util.LangUtil;
+
+/**
+ * Makes sure tests are running on the right level of JDK.
+ *
+ * @author Alexander Kriegisch
+ */
+public abstract class XMLBasedAjcTestCaseForJava15Only extends XMLBasedAjcTestCase {
+
+	@Override
+	public void runTest(String title) {
+		// Activate this block after upgrading to JDT Core Java 16
+		/*
+		throw new IllegalStateException(
+			"These tests need a Java 15 level AspectJ compiler " +
+				"(e.g. because they use version-specific preview features). " +
+				"This compiler does not support preview features of a previous version anymore."
+		);
+		*/
+		if (!LangUtil.is15VMOrGreater() || LangUtil.is16VMOrGreater()) {
+			throw new IllegalStateException(
+				"These tests should be run on Java 15 only " +
+				"(e.g. because they use version-specific preview features)"
+			);
+		}
+		super.runTest(title);
+	}
+
+}