From ee2bec7cbcd81659b6944d81b0d6e9ac36c8d28a Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Sun, 14 Mar 2021 22:09:02 +0700 Subject: [PATCH] Simplify execution of PureJavaTests and KnownLimitationsTests Getting rid of XML includes and two superfluous files, merging them with their respective including counterparts. As far as I can see, the two test suites are not part of the automatic build process, but can be started manually as easily as any other test (suite) now. Signed-off-by: Alexander Kriegisch --- .../KnownLimitationsTests.java | 6 +- .../incremental/incremental-tests.xml | 70 +- .../knownLimitations-tests.xml | 297 --- .../knownlimitations/knownLimitations.xml | 303 ++- .../systemtest/purejava/pureJava-tests.xml | 1894 ---------------- .../aspectj/systemtest/purejava/pureJava.xml | 1901 ++++++++++++++++- 6 files changed, 2229 insertions(+), 2242 deletions(-) delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml delete mode 100644 tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava-tests.xml diff --git a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java index 4115ff90e..0c0379b58 100644 --- a/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/knownlimitations/KnownLimitationsTests.java @@ -4,8 +4,8 @@ * 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 - * + * http://www.eclipse.org/legal/epl-v10.html + * * ******************************************************************/ package org.aspectj.systemtest.knownlimitations; @@ -20,7 +20,7 @@ public class KnownLimitationsTests extends org.aspectj.testing.XMLBasedAjcTestCa } protected java.net.URL getSpecFile() { - return getClassResource("knownlimitations.xml"); + return getClassResource("knownLimitations.xml"); // return new File("../tests/src/org/aspectj/systemtest/knownlimitations/knownlimitations.xml"); } diff --git a/tests/src/test/resources/org/aspectj/systemtest/incremental/incremental-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/incremental/incremental-tests.xml index 1ce24711e..87fe7c33d 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/incremental/incremental-tests.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/incremental/incremental-tests.xml @@ -1,9 +1,10 @@ + - - @@ -13,11 +14,11 @@ - - @@ -26,10 +27,10 @@ - - @@ -39,11 +40,11 @@ - - @@ -56,11 +57,11 @@ - - @@ -68,12 +69,12 @@ - + - - - @@ -97,7 +98,7 @@ - + @@ -107,9 +108,9 @@ - @@ -119,9 +120,9 @@ - @@ -132,7 +133,7 @@ - - - @@ -156,11 +157,11 @@ - + - @@ -171,8 +172,8 @@ - @@ -182,4 +183,5 @@ - + + diff --git a/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml deleted file mode 100644 index d420885de..000000000 --- a/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations-tests.xml +++ /dev/null @@ -1,297 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations.xml b/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations.xml index 25d99f6e4..ff00c6837 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/knownlimitations/knownLimitations.xml @@ -1,11 +1,300 @@ - -]> + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -&tests; - diff --git a/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava-tests.xml b/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava-tests.xml deleted file mode 100644 index 9864ffe79..000000000 --- a/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava-tests.xml +++ /dev/null @@ -1,1894 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava.xml b/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava.xml index 1eb4b9f60..b7aa09fb5 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/purejava/pureJava.xml @@ -1,10 +1,1897 @@ - -]> - - -&tests; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + -- 2.39.5