From 24e42cff3410e4b427a233112ab0c9b7d43f0ea1 Mon Sep 17 00:00:00 2001 From: aclement <aclement> Date: Tue, 27 Sep 2005 09:14:59 +0000 Subject: trick the build machine into compiling our code ! --- weaver5/.classpath | 1 + weaver5/java5-testsrc/Weaver5ModuleTests.java | 40 --------------------------- weaver5/testsrc/Weaver5ModuleTests.java | 40 +++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 40 deletions(-) delete mode 100644 weaver5/java5-testsrc/Weaver5ModuleTests.java create mode 100644 weaver5/testsrc/Weaver5ModuleTests.java (limited to 'weaver5') diff --git a/weaver5/.classpath b/weaver5/.classpath index 9ab8ac4c8..34549e5e8 100644 --- a/weaver5/.classpath +++ b/weaver5/.classpath @@ -2,6 +2,7 @@ <classpath> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="java5-src"/> + <classpathentry kind="src" path="testsrc"/> <classpathentry kind="src" path="java5-testsrc"/> <classpathentry sourcepath="/lib/bcel/bcel-src.zip" kind="lib" path="/lib/bcel/bcel.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/weaver"/> diff --git a/weaver5/java5-testsrc/Weaver5ModuleTests.java b/weaver5/java5-testsrc/Weaver5ModuleTests.java deleted file mode 100644 index 434f3022a..000000000 --- a/weaver5/java5-testsrc/Weaver5ModuleTests.java +++ /dev/null @@ -1,40 +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: (See CVS logs) - * - *******************************************************************************/ - -import org.aspectj.testing.util.TestUtil; -import org.aspectj.util.LangUtil; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - */ -public class Weaver5ModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(Weaver5ModuleTests.class.getName()); - if (TestUtil.is15VMOrGreater()) { -// if (LangUtil.is15VMOrGreater()) { - TestUtil.loadTestsReflectively(suite, "org.aspectj.weaver.tools.Java15PointcutExpressionTest", false); -// } -// TestUtil.loadTestsReflectively(suite, "Weaver515ModuleTests", true); - } else { - suite.addTest(TestUtil.testNamed("all tests require 1.5")); - } - return suite; - } - public static void main(String[] args) { - junit.textui.TestRunner.main(new String[] {Weaver5ModuleTests.class.getName()}); - } - -} diff --git a/weaver5/testsrc/Weaver5ModuleTests.java b/weaver5/testsrc/Weaver5ModuleTests.java new file mode 100644 index 000000000..434f3022a --- /dev/null +++ b/weaver5/testsrc/Weaver5ModuleTests.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * 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: (See CVS logs) + * + *******************************************************************************/ + +import org.aspectj.testing.util.TestUtil; +import org.aspectj.util.LangUtil; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + */ +public class Weaver5ModuleTests extends TestCase { + + public static Test suite() { + TestSuite suite = new TestSuite(Weaver5ModuleTests.class.getName()); + if (TestUtil.is15VMOrGreater()) { +// if (LangUtil.is15VMOrGreater()) { + TestUtil.loadTestsReflectively(suite, "org.aspectj.weaver.tools.Java15PointcutExpressionTest", false); +// } +// TestUtil.loadTestsReflectively(suite, "Weaver515ModuleTests", true); + } else { + suite.addTest(TestUtil.testNamed("all tests require 1.5")); + } + return suite; + } + public static void main(String[] args) { + junit.textui.TestRunner.main(new String[] {Weaver5ModuleTests.class.getName()}); + } + +} -- cgit v1.2.3