From f4d5e9485ae910220e06b0b6c778587ed6b4ebb3 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 30 Jan 2019 16:15:14 -0800 Subject: [PATCH] mavenizing testing - done --- .../internal/tools/ant/taskdefs/Ajctest.java | 0 .../tools/ant/taskdefs/MainWrapper.java | 0 .../java/org/aspectj/testing/AjcTest.java | 0 .../java/org/aspectj/testing/AntSpec.java | 0 .../testing/AutowiredXMLBasedAjcTestCase.java | 0 .../java/org/aspectj/testing/CompileSpec.java | 0 .../aspectj/testing/ExpectedMessageSpec.java | 0 .../java/org/aspectj/testing/FileSpec.java | 0 .../java/org/aspectj/testing/ITestStep.java | 0 .../org/aspectj/testing/MakeTestClass.java | 0 .../java/org/aspectj/testing/OutputLine.java | 0 .../java/org/aspectj/testing/OutputSpec.java | 0 .../java/org/aspectj/testing/RunSpec.java | 0 .../aspectj/testing/TestingModuleTests.java | 36 ----------------- .../java/org/aspectj/testing/WeaveSpec.java | 0 .../aspectj/testing/XMLBasedAjcTestCase.java | 0 .../XMLBasedAjcTestCaseForJava10OrLater.java | 0 .../XMLBasedAjcTestCaseForJava11OrLater.java | 0 .../XMLBasedAjcTestCaseForJava9OrLater.java | 0 .../aspectj/testing/ajde/CompileCommand.java | 0 .../harness/bridge/AbstractRunSpec.java | 0 .../harness/bridge/AjcMessageHandler.java | 0 .../testing/harness/bridge/AjcTest.java | 0 .../testing/harness/bridge/CompilerRun.java | 0 .../testing/harness/bridge/DirChanges.java | 0 .../harness/bridge/FlatSuiteReader.java | 0 .../testing/harness/bridge/Globals.java | 0 .../testing/harness/bridge/IAjcRun.java | 0 .../testing/harness/bridge/IRunSpec.java | 0 .../harness/bridge/IncCompilerRun.java | 0 .../testing/harness/bridge/JavaRun.java | 0 .../harness/bridge/RunSpecIterator.java | 0 .../testing/harness/bridge/Sandbox.java | 0 .../harness/bridge/TestingBridgeTests.java | 38 ------------------ .../testing/harness/bridge/Validator.java | 0 .../java/org/aspectj/testing/run/IRun.java | 0 .../org/aspectj/testing/run/IRunIterator.java | 0 .../org/aspectj/testing/run/IRunListener.java | 0 .../org/aspectj/testing/run/IRunStatus.java | 0 .../aspectj/testing/run/IRunValidator.java | 0 .../org/aspectj/testing/run/RunIterator.java | 0 .../org/aspectj/testing/run/RunListener.java | 0 .../org/aspectj/testing/run/RunListeners.java | 0 .../org/aspectj/testing/run/RunStatus.java | 0 .../org/aspectj/testing/run/RunValidator.java | 0 .../java/org/aspectj/testing/run/Runner.java | 0 .../testing/run/WrappedRunIterator.java | 0 .../taskdefs/AjcTaskCompileCommand.java | 0 .../testing/taskdefs/TaskdefTests.java | 29 -------------- .../testing/util/AccumulatingFileFilter.java | 0 .../org/aspectj/testing/util/BridgeUtil.java | 0 .../testing/util/CollectorFileFilter.java | 0 .../java/org/aspectj/testing/util/Diffs.java | 0 .../org/aspectj/testing/util/FileUtil.java | 0 .../org/aspectj/testing/util/IntRange.java | 0 .../aspectj/testing/util/IntValidator.java | 0 .../aspectj/testing/util/IteratorWrapper.java | 0 .../org/aspectj/testing/util/LangUtil.java | 0 .../org/aspectj/testing/util/LineReader.java | 0 .../org/aspectj/testing/util/LinkCheck.java | 0 .../java/org/aspectj/testing/util/Node.java | 0 .../aspectj/testing/util/NullPrintStream.java | 0 .../aspectj/testing/util/ObjectChecker.java | 0 .../testing/util/ProxyPrintStream.java | 0 .../org/aspectj/testing/util/RunUtils.java | 0 .../org/aspectj/testing/util/SFileReader.java | 0 .../testing/util/StandardObjectChecker.java | 0 .../aspectj/testing/util/StreamSniffer.java | 0 .../aspectj/testing/util/StreamsHandler.java | 0 .../testing/util/StringAccumulator.java | 0 .../aspectj/testing/util/StringVisitor.java | 0 .../testing/util/StructureModelUtil.java | 0 .../aspectj/testing/util/TestClassLoader.java | 0 .../org/aspectj/testing/util/TestDiffs.java | 0 .../aspectj/testing/util/UtilLineReader.java | 0 .../org/aspectj/testing/util/UtilTests.java | 39 ------------------- .../aspectj/testing/util/ValidFileFilter.java | 0 .../org/aspectj/testing/util/WebInstall.java | 0 .../aspectj/testing/util/options/Option.java | 0 .../aspectj/testing/util/options/Options.java | 0 .../testing/util/options/OptionsTests.java | 30 -------------- .../aspectj/testing/util/options/Values.java | 0 .../aspectj/testing/xml/AjcSpecXmlReader.java | 0 .../org/aspectj/testing/xml/IXmlWritable.java | 0 .../testing/xml/MessageListXmlReader.java | 0 .../org/aspectj/testing/xml/SoftMessage.java | 0 .../testing/xml/SoftSourceLocation.java | 0 .../aspectj/testing/xml/TestingXmlTests.java | 35 ----------------- .../org/aspectj/testing/xml/XMLWriter.java | 0 89 files changed, 207 deletions(-) rename testing/src/{main => test}/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java (100%) rename testing/src/{main => test}/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/AjcTest.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/AntSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/CompileSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/ExpectedMessageSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/FileSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/ITestStep.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/MakeTestClass.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/OutputLine.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/OutputSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/RunSpec.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/TestingModuleTests.java rename testing/src/{main => test}/java/org/aspectj/testing/WeaveSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/XMLBasedAjcTestCase.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/ajde/CompileCommand.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/AjcTest.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/CompilerRun.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/DirChanges.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/Globals.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/IAjcRun.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/IRunSpec.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/JavaRun.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/Sandbox.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java rename testing/src/{main => test}/java/org/aspectj/testing/harness/bridge/Validator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/IRun.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/IRunIterator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/IRunListener.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/IRunStatus.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/IRunValidator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/RunIterator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/RunListener.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/RunListeners.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/RunStatus.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/RunValidator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/Runner.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/run/WrappedRunIterator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java rename testing/src/{main => test}/java/org/aspectj/testing/util/AccumulatingFileFilter.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/BridgeUtil.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/CollectorFileFilter.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/Diffs.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/FileUtil.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/IntRange.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/IntValidator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/IteratorWrapper.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/LangUtil.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/LineReader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/LinkCheck.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/Node.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/NullPrintStream.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/ObjectChecker.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/ProxyPrintStream.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/RunUtils.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/SFileReader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StandardObjectChecker.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StreamSniffer.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StreamsHandler.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StringAccumulator.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StringVisitor.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/StructureModelUtil.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/TestClassLoader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/TestDiffs.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/UtilLineReader.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/util/UtilTests.java rename testing/src/{main => test}/java/org/aspectj/testing/util/ValidFileFilter.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/WebInstall.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/options/Option.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/util/options/Options.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java rename testing/src/{main => test}/java/org/aspectj/testing/util/options/Values.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/xml/AjcSpecXmlReader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/xml/IXmlWritable.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/xml/MessageListXmlReader.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/xml/SoftMessage.java (100%) rename testing/src/{main => test}/java/org/aspectj/testing/xml/SoftSourceLocation.java (100%) delete mode 100644 testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java rename testing/src/{main => test}/java/org/aspectj/testing/xml/XMLWriter.java (100%) diff --git a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java similarity index 100% rename from testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java rename to testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java diff --git a/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java similarity index 100% rename from testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java rename to testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java diff --git a/testing/src/main/java/org/aspectj/testing/AjcTest.java b/testing/src/test/java/org/aspectj/testing/AjcTest.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/AjcTest.java rename to testing/src/test/java/org/aspectj/testing/AjcTest.java diff --git a/testing/src/main/java/org/aspectj/testing/AntSpec.java b/testing/src/test/java/org/aspectj/testing/AntSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/AntSpec.java rename to testing/src/test/java/org/aspectj/testing/AntSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java rename to testing/src/test/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java diff --git a/testing/src/main/java/org/aspectj/testing/CompileSpec.java b/testing/src/test/java/org/aspectj/testing/CompileSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/CompileSpec.java rename to testing/src/test/java/org/aspectj/testing/CompileSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java b/testing/src/test/java/org/aspectj/testing/ExpectedMessageSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java rename to testing/src/test/java/org/aspectj/testing/ExpectedMessageSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/FileSpec.java b/testing/src/test/java/org/aspectj/testing/FileSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/FileSpec.java rename to testing/src/test/java/org/aspectj/testing/FileSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/ITestStep.java b/testing/src/test/java/org/aspectj/testing/ITestStep.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/ITestStep.java rename to testing/src/test/java/org/aspectj/testing/ITestStep.java diff --git a/testing/src/main/java/org/aspectj/testing/MakeTestClass.java b/testing/src/test/java/org/aspectj/testing/MakeTestClass.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/MakeTestClass.java rename to testing/src/test/java/org/aspectj/testing/MakeTestClass.java diff --git a/testing/src/main/java/org/aspectj/testing/OutputLine.java b/testing/src/test/java/org/aspectj/testing/OutputLine.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/OutputLine.java rename to testing/src/test/java/org/aspectj/testing/OutputLine.java diff --git a/testing/src/main/java/org/aspectj/testing/OutputSpec.java b/testing/src/test/java/org/aspectj/testing/OutputSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/OutputSpec.java rename to testing/src/test/java/org/aspectj/testing/OutputSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/RunSpec.java b/testing/src/test/java/org/aspectj/testing/RunSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/RunSpec.java rename to testing/src/test/java/org/aspectj/testing/RunSpec.java diff --git a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java deleted file mode 100644 index b6c20b215..000000000 --- a/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.aspectj.testing; -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * 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 - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -// default package - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class TestingModuleTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(TestingModuleTests.class.getName()); - suite.addTest(org.aspectj.testing.harness.bridge.TestingBridgeTests.suite()); - suite.addTest(org.aspectj.testing.taskdefs.TaskdefTests.suite()); - suite.addTest(org.aspectj.testing.util.UtilTests.suite()); - suite.addTest(org.aspectj.testing.util.options.OptionsTests.suite()); - suite.addTest(org.aspectj.testing.xml.TestingXmlTests.suite()); - return suite; - } - - public TestingModuleTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/WeaveSpec.java b/testing/src/test/java/org/aspectj/testing/WeaveSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/WeaveSpec.java rename to testing/src/test/java/org/aspectj/testing/WeaveSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java rename to testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java rename to testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java rename to testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java diff --git a/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java rename to testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java diff --git a/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java rename to testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/AjcTest.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRun.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChanges.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/DirChanges.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Globals.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/Globals.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IAjcRun.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/IAjcRun.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IRunSpec.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/IRunSpec.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/JavaRun.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Sandbox.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/Sandbox.java diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java deleted file mode 100644 index 1fd4cb342..000000000 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java +++ /dev/null @@ -1,38 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * 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 - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.testing.harness.bridge; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class TestingBridgeTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(TestingBridgeTests.class.getName()); - // XXX disabled DirChangesTest pending implementation - //$JUnit-BEGIN$ - suite.addTestSuite(AbstractRunSpecTest.class); - suite.addTestSuite(AjcSpecTest.class); - suite.addTestSuite(CompilerRunTest.class); - suite.addTestSuite(CompilerRunSpecTest.class); - suite.addTestSuite(ParseTestCase.class); - //$JUnit-END$ - return suite; - } - - public TestingBridgeTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/Validator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/Validator.java diff --git a/testing/src/main/java/org/aspectj/testing/run/IRun.java b/testing/src/test/java/org/aspectj/testing/run/IRun.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/IRun.java rename to testing/src/test/java/org/aspectj/testing/run/IRun.java diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java b/testing/src/test/java/org/aspectj/testing/run/IRunIterator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/IRunIterator.java rename to testing/src/test/java/org/aspectj/testing/run/IRunIterator.java diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunListener.java b/testing/src/test/java/org/aspectj/testing/run/IRunListener.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/IRunListener.java rename to testing/src/test/java/org/aspectj/testing/run/IRunListener.java diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java b/testing/src/test/java/org/aspectj/testing/run/IRunStatus.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/IRunStatus.java rename to testing/src/test/java/org/aspectj/testing/run/IRunStatus.java diff --git a/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java b/testing/src/test/java/org/aspectj/testing/run/IRunValidator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/IRunValidator.java rename to testing/src/test/java/org/aspectj/testing/run/IRunValidator.java diff --git a/testing/src/main/java/org/aspectj/testing/run/RunIterator.java b/testing/src/test/java/org/aspectj/testing/run/RunIterator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/RunIterator.java rename to testing/src/test/java/org/aspectj/testing/run/RunIterator.java diff --git a/testing/src/main/java/org/aspectj/testing/run/RunListener.java b/testing/src/test/java/org/aspectj/testing/run/RunListener.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/RunListener.java rename to testing/src/test/java/org/aspectj/testing/run/RunListener.java diff --git a/testing/src/main/java/org/aspectj/testing/run/RunListeners.java b/testing/src/test/java/org/aspectj/testing/run/RunListeners.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/RunListeners.java rename to testing/src/test/java/org/aspectj/testing/run/RunListeners.java diff --git a/testing/src/main/java/org/aspectj/testing/run/RunStatus.java b/testing/src/test/java/org/aspectj/testing/run/RunStatus.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/RunStatus.java rename to testing/src/test/java/org/aspectj/testing/run/RunStatus.java diff --git a/testing/src/main/java/org/aspectj/testing/run/RunValidator.java b/testing/src/test/java/org/aspectj/testing/run/RunValidator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/RunValidator.java rename to testing/src/test/java/org/aspectj/testing/run/RunValidator.java diff --git a/testing/src/main/java/org/aspectj/testing/run/Runner.java b/testing/src/test/java/org/aspectj/testing/run/Runner.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/Runner.java rename to testing/src/test/java/org/aspectj/testing/run/Runner.java diff --git a/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java b/testing/src/test/java/org/aspectj/testing/run/WrappedRunIterator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java rename to testing/src/test/java/org/aspectj/testing/run/WrappedRunIterator.java diff --git a/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java rename to testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java diff --git a/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java b/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java deleted file mode 100644 index 5a86f8558..000000000 --- a/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java +++ /dev/null @@ -1,29 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 2003 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 - * - * Contributors: - * Wes Isberg initial implementation - * ******************************************************************/ - -package org.aspectj.testing.taskdefs; - -import junit.framework.*; - -public class TaskdefTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(TaskdefTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(AjcTaskCompileCommandTest.class); - //$JUnit-END$ - return suite; - } - - public TaskdefTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java rename to testing/src/test/java/org/aspectj/testing/util/AccumulatingFileFilter.java diff --git a/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java rename to testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java diff --git a/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/CollectorFileFilter.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java rename to testing/src/test/java/org/aspectj/testing/util/CollectorFileFilter.java diff --git a/testing/src/main/java/org/aspectj/testing/util/Diffs.java b/testing/src/test/java/org/aspectj/testing/util/Diffs.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/Diffs.java rename to testing/src/test/java/org/aspectj/testing/util/Diffs.java diff --git a/testing/src/main/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/FileUtil.java rename to testing/src/test/java/org/aspectj/testing/util/FileUtil.java diff --git a/testing/src/main/java/org/aspectj/testing/util/IntRange.java b/testing/src/test/java/org/aspectj/testing/util/IntRange.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/IntRange.java rename to testing/src/test/java/org/aspectj/testing/util/IntRange.java diff --git a/testing/src/main/java/org/aspectj/testing/util/IntValidator.java b/testing/src/test/java/org/aspectj/testing/util/IntValidator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/IntValidator.java rename to testing/src/test/java/org/aspectj/testing/util/IntValidator.java diff --git a/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapper.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java rename to testing/src/test/java/org/aspectj/testing/util/IteratorWrapper.java diff --git a/testing/src/main/java/org/aspectj/testing/util/LangUtil.java b/testing/src/test/java/org/aspectj/testing/util/LangUtil.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/LangUtil.java rename to testing/src/test/java/org/aspectj/testing/util/LangUtil.java diff --git a/testing/src/main/java/org/aspectj/testing/util/LineReader.java b/testing/src/test/java/org/aspectj/testing/util/LineReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/LineReader.java rename to testing/src/test/java/org/aspectj/testing/util/LineReader.java diff --git a/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/LinkCheck.java rename to testing/src/test/java/org/aspectj/testing/util/LinkCheck.java diff --git a/testing/src/main/java/org/aspectj/testing/util/Node.java b/testing/src/test/java/org/aspectj/testing/util/Node.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/Node.java rename to testing/src/test/java/org/aspectj/testing/util/Node.java diff --git a/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java b/testing/src/test/java/org/aspectj/testing/util/NullPrintStream.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java rename to testing/src/test/java/org/aspectj/testing/util/NullPrintStream.java diff --git a/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java b/testing/src/test/java/org/aspectj/testing/util/ObjectChecker.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java rename to testing/src/test/java/org/aspectj/testing/util/ObjectChecker.java diff --git a/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java b/testing/src/test/java/org/aspectj/testing/util/ProxyPrintStream.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java rename to testing/src/test/java/org/aspectj/testing/util/ProxyPrintStream.java diff --git a/testing/src/main/java/org/aspectj/testing/util/RunUtils.java b/testing/src/test/java/org/aspectj/testing/util/RunUtils.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/RunUtils.java rename to testing/src/test/java/org/aspectj/testing/util/RunUtils.java diff --git a/testing/src/main/java/org/aspectj/testing/util/SFileReader.java b/testing/src/test/java/org/aspectj/testing/util/SFileReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/SFileReader.java rename to testing/src/test/java/org/aspectj/testing/util/SFileReader.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java b/testing/src/test/java/org/aspectj/testing/util/StandardObjectChecker.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java rename to testing/src/test/java/org/aspectj/testing/util/StandardObjectChecker.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java b/testing/src/test/java/org/aspectj/testing/util/StreamSniffer.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java rename to testing/src/test/java/org/aspectj/testing/util/StreamSniffer.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java b/testing/src/test/java/org/aspectj/testing/util/StreamsHandler.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java rename to testing/src/test/java/org/aspectj/testing/util/StreamsHandler.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java b/testing/src/test/java/org/aspectj/testing/util/StringAccumulator.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java rename to testing/src/test/java/org/aspectj/testing/util/StringAccumulator.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java b/testing/src/test/java/org/aspectj/testing/util/StringVisitor.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StringVisitor.java rename to testing/src/test/java/org/aspectj/testing/util/StringVisitor.java diff --git a/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java rename to testing/src/test/java/org/aspectj/testing/util/StructureModelUtil.java diff --git a/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java b/testing/src/test/java/org/aspectj/testing/util/TestClassLoader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java rename to testing/src/test/java/org/aspectj/testing/util/TestClassLoader.java diff --git a/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java b/testing/src/test/java/org/aspectj/testing/util/TestDiffs.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/TestDiffs.java rename to testing/src/test/java/org/aspectj/testing/util/TestDiffs.java diff --git a/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java rename to testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java diff --git a/testing/src/test/java/org/aspectj/testing/util/UtilTests.java b/testing/src/test/java/org/aspectj/testing/util/UtilTests.java deleted file mode 100644 index f5583725d..000000000 --- a/testing/src/test/java/org/aspectj/testing/util/UtilTests.java +++ /dev/null @@ -1,39 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * 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 - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.testing.util; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class UtilTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(UtilTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(BridgeUtilTest.class); - suite.addTestSuite(FileUtilTest.class); - suite.addTestSuite(IteratorWrapperTest.class); - suite.addTestSuite(LangUtilTest.class); - suite.addTestSuite(MessageUtilTest.class); - suite.addTestSuite(StreamGrabberTest.class); - suite.addTestSuite(StructureModelUtilTest.class); - //$JUnit-END$ - return suite; - } - - public UtilTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java b/testing/src/test/java/org/aspectj/testing/util/ValidFileFilter.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java rename to testing/src/test/java/org/aspectj/testing/util/ValidFileFilter.java diff --git a/testing/src/main/java/org/aspectj/testing/util/WebInstall.java b/testing/src/test/java/org/aspectj/testing/util/WebInstall.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/WebInstall.java rename to testing/src/test/java/org/aspectj/testing/util/WebInstall.java diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Option.java b/testing/src/test/java/org/aspectj/testing/util/options/Option.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/options/Option.java rename to testing/src/test/java/org/aspectj/testing/util/options/Option.java diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Options.java b/testing/src/test/java/org/aspectj/testing/util/options/Options.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/options/Options.java rename to testing/src/test/java/org/aspectj/testing/util/options/Options.java diff --git a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java deleted file mode 100644 index 0b82c7dc9..000000000 --- a/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java +++ /dev/null @@ -1,30 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 2003 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 - * - * Contributors: - * Wes Isberg initial implementation - * ******************************************************************/ - - -package org.aspectj.testing.util.options; - -import junit.framework.*; - -public class OptionsTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(OptionsTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(OptionsTest.class); - //$JUnit-END$ - return suite; - } - - public OptionsTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/util/options/Values.java b/testing/src/test/java/org/aspectj/testing/util/options/Values.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/util/options/Values.java rename to testing/src/test/java/org/aspectj/testing/util/options/Values.java diff --git a/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java rename to testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReader.java diff --git a/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java b/testing/src/test/java/org/aspectj/testing/xml/IXmlWritable.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java rename to testing/src/test/java/org/aspectj/testing/xml/IXmlWritable.java diff --git a/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java rename to testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java diff --git a/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java rename to testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java diff --git a/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/test/java/org/aspectj/testing/xml/SoftSourceLocation.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java rename to testing/src/test/java/org/aspectj/testing/xml/SoftSourceLocation.java diff --git a/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java b/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java deleted file mode 100644 index ff8093c32..000000000 --- a/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java +++ /dev/null @@ -1,35 +0,0 @@ -/* ******************************************************************* - * Copyright (c) 1999-2001 Xerox Corporation, - * 2002 Palo Alto Research Center, Incorporated (PARC). - * 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 - * - * Contributors: - * Xerox/PARC initial implementation - * ******************************************************************/ - - -package org.aspectj.testing.xml; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class TestingXmlTests extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(TestingXmlTests.class.getName()); - //$JUnit-BEGIN$ - suite.addTestSuite(AjcSpecXmlReaderTest.class); - suite.addTestSuite(MessageListXmlReaderTest.class); - suite.addTestSuite(XMLWriterTest.class); - //$JUnit-END$ - return suite; - } - - public TestingXmlTests(String name) { super(name); } - -} diff --git a/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java b/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java similarity index 100% rename from testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java rename to testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java -- 2.39.5