From 282c5d2d07b013963a94bc94ad3c7331147610b6 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Thu, 28 Nov 2019 10:34:51 -0800 Subject: polish --- .../systemtest/ajc193/AllTestsAspectJ193.java | 2 +- .../org/aspectj/systemtest/ajc193/Java12Tests.java | 46 ---------------------- .../org/aspectj/systemtest/ajc193/Java13Tests.java | 46 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 47 deletions(-) delete mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc193/Java12Tests.java create mode 100644 tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java (limited to 'tests/src') diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java index ddd88372d..f40e44805 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/AllTestsAspectJ193.java @@ -18,7 +18,7 @@ public class AllTestsAspectJ193 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ 1.9.3 tests"); suite.addTest(Ajc193Tests.suite()); - suite.addTest(Java12Tests.suite()); + suite.addTest(Java13Tests.suite()); return suite; } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Java12Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Java12Tests.java deleted file mode 100644 index 9a36d3daf..000000000 --- a/tests/src/test/java/org/aspectj/systemtest/ajc193/Java12Tests.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2019 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.systemtest.ajc193; - -import org.aspectj.apache.bcel.Constants; -import org.aspectj.testing.XMLBasedAjcTestCase; -import org.aspectj.testing.XMLBasedAjcTestCaseForJava12OrLater; - -import junit.framework.Test; - -/** - * @author Andy Clement - */ -public class Java12Tests extends XMLBasedAjcTestCaseForJava12OrLater { - - public void testSwitch1() { - runTest("switch 1"); - checkVersion("Switch1", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); - } - - public void testSwitch2() { - runTest("switch 2"); - checkVersion("Switch2", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); - } - - public void testSwitch3() { - runTest("switch 3"); - checkVersion("Switch3", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); - } - // --- - - public static Test suite() { - return XMLBasedAjcTestCase.loadSuite(Java12Tests.class); - } - - @Override - protected java.net.URL getSpecFile() { - return getClassResource("ajc193.xml"); - } - -} diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java new file mode 100644 index 000000000..3b007963f --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc193/Java13Tests.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2019 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.systemtest.ajc193; + +import org.aspectj.apache.bcel.Constants; +import org.aspectj.testing.XMLBasedAjcTestCase; +import org.aspectj.testing.XMLBasedAjcTestCaseForJava13OrLater; + +import junit.framework.Test; + +/** + * @author Andy Clement + */ +public class Java13Tests extends XMLBasedAjcTestCaseForJava13OrLater { + + public void testSwitch1() { + runTest("switch 1"); + checkVersion("Switch1", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); + } + + public void testSwitch2() { + runTest("switch 2"); + checkVersion("Switch2", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); + } + + public void testSwitch3() { + runTest("switch 3"); + checkVersion("Switch3", Constants.MAJOR_13, Constants.PREVIEW_MINOR_VERSION); + } + // --- + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Java13Tests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc193.xml"); + } + +} -- cgit v1.2.3