From eb31ec6c3d7016f7b57210f61c27daa54118c263 Mon Sep 17 00:00:00 2001 From: mwebster Date: Sun, 30 Jul 2006 18:20:50 +0000 Subject: Bug 113948 "Repackage AspectJ" (move module root suites out of default package) --- tests/testsrc/TestsModuleTests.java | 41 --------------------- .../org/aspectj/tests/TestsModuleTests.java | 42 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 41 deletions(-) delete mode 100644 tests/testsrc/TestsModuleTests.java create mode 100644 tests/testsrc/org/aspectj/tests/TestsModuleTests.java (limited to 'tests') diff --git a/tests/testsrc/TestsModuleTests.java b/tests/testsrc/TestsModuleTests.java deleted file mode 100644 index 8df16f222..000000000 --- a/tests/testsrc/TestsModuleTests.java +++ /dev/null @@ -1,41 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html - * - * Contributors: - * Wes Isberg initial implementation - * ******************************************************************/ - -import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.aspectj.systemtest.AllTests; -import org.aspectj.systemtest.AllTests14; -import org.aspectj.systemtest.AllTests15; -import org.aspectj.util.LangUtil; - -public class TestsModuleTests extends TestCase { - - public static Test suite() { - String name = TestsModuleTests.class.getName(); - TestSuite suite = new TestSuite(name); - // compiler tests, wrapped for JUnit - if (LangUtil.is15VMOrGreater()) { - suite.addTest(AllTests15.suite()); - } else if (LangUtil.is14VMOrGreater()) { - System.err.println("Skipping tests for 1.5"); - //suite.addTest(TestUtil.skipTest("for 1.5")); - suite.addTest(AllTests14.suite()); - } else { - System.err.println("Skipping tests for 1.4 and 1.5"); - //suite.addTest(TestUtil.skipTest("for 1.4 and 1.5")); - suite.addTest(AllTests.suite()); - } - return suite; - } -} diff --git a/tests/testsrc/org/aspectj/tests/TestsModuleTests.java b/tests/testsrc/org/aspectj/tests/TestsModuleTests.java new file mode 100644 index 000000000..ddb62dd3e --- /dev/null +++ b/tests/testsrc/org/aspectj/tests/TestsModuleTests.java @@ -0,0 +1,42 @@ +package org.aspectj.tests; +/* ******************************************************************* + * Copyright (c) 2005 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://eclipse.org/legal/epl-v10.html + * + * Contributors: + * Wes Isberg initial implementation + * ******************************************************************/ + +import junit.framework.TestCase; +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.aspectj.systemtest.AllTests; +import org.aspectj.systemtest.AllTests14; +import org.aspectj.systemtest.AllTests15; +import org.aspectj.util.LangUtil; + +public class TestsModuleTests extends TestCase { + + public static Test suite() { + String name = TestsModuleTests.class.getName(); + TestSuite suite = new TestSuite(name); + // compiler tests, wrapped for JUnit + if (LangUtil.is15VMOrGreater()) { + suite.addTest(AllTests15.suite()); + } else if (LangUtil.is14VMOrGreater()) { + System.err.println("Skipping tests for 1.5"); + //suite.addTest(TestUtil.skipTest("for 1.5")); + suite.addTest(AllTests14.suite()); + } else { + System.err.println("Skipping tests for 1.4 and 1.5"); + //suite.addTest(TestUtil.skipTest("for 1.4 and 1.5")); + suite.addTest(AllTests.suite()); + } + return suite; + } +} -- cgit v1.2.3