From cda73a6a5864b76e252ed0d3b69ff4b55a6def4b Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 30 Jan 2019 13:02:20 -0800 Subject: [PATCH] mavenizing testing - wip --- testing/.classpath | 28 ---- testing/.cvsignore | 2 - testing/.isJava5 | 1 - testing/.project | 25 --- testing/build.xml | 6 - testing/figures-coverage/.cvsignore | 1 + testing/figures-coverage/all.lst | 8 + .../figures-coverage/bin/figures/Checks.class | Bin 0 -> 3232 bytes .../figures-coverage/bin/figures/Debug.class | Bin 0 -> 1656 bytes .../bin/figures/Element.class | Bin 0 -> 109 bytes .../figures-coverage/bin/figures/Figure.class | Bin 0 -> 13444 bytes .../bin/figures/FigureElement.class | Bin 0 -> 398 bytes .../bin/figures/Main$TestGUI.class | Bin 0 -> 425 bytes .../figures-coverage/bin/figures/Main.class | Bin 0 -> 1045 bytes .../figures-coverage/bin/figures/Test.class | Bin 0 -> 4129 bytes .../bin/figures/composites/BoundedLine.class | Bin 0 -> 296 bytes .../bin/figures/composites/Line.class | Bin 0 -> 275 bytes .../bin/figures/composites/Square.class | Bin 0 -> 353 bytes .../primitives/planar/BoundedPoint.class | Bin 0 -> 420 bytes .../bin/figures/primitives/planar/Point.class | Bin 0 -> 5094 bytes .../planar/PointBoundsException.class | Bin 0 -> 325 bytes .../planar/StrictlyBoundedPoint.class | Bin 0 -> 443 bytes .../figures/primitives/solid/SolidPoint.class | Bin 0 -> 1573 bytes testing/figures-coverage/editor/Editor.java | 4 + testing/figures-coverage/figures/.cvsignore | 8 + testing/figures-coverage/figures/Debug.java | 7 + testing/figures-coverage/figures/Figure.java | 92 +++++++++++ .../figures/FigureElement.java | 9 ++ testing/figures-coverage/figures/Main.java | 56 +++++++ .../figures/composites/.cvsignore | 3 + .../figures/composites/Line.java | 6 + .../figures/composites/Square.java | 6 + .../figures/primitives/planar/.cvsignore | 4 + .../figures/primitives/planar/Point.java | 73 +++++++++ .../figures/primitives/solid/.cvsignore | 1 + .../figures/primitives/solid/SolidPoint.java | 24 +++ testing/pom.xml | 143 ++++++++++++++++++ .../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 .../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 .../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 .../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/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 .../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 .../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 .../org/aspectj/testing/xml/XMLWriter.java | 0 .../aspectj/testing/TestingModuleTests.java | 0 .../harness/bridge/AbstractRunSpecTest.java | 0 .../testing/harness/bridge/AjcSpecTest.java | 0 .../harness/bridge/CompilerRunSpecTest.java | 0 .../harness/bridge/CompilerRunTest.java | 0 .../harness/bridge/DirChangesTest.java | 0 .../testing/harness/bridge/ParseTestCase.java | 0 .../harness/bridge/TestingBridgeTests.java | 0 .../taskdefs/AjcTaskCompileCommandTest.java | 0 .../testing/taskdefs/TaskdefTests.java | 0 .../aspectj/testing/util/BridgeUtilTest.java | 0 .../aspectj/testing/util/FileUtilTest.java | 0 .../testing/util/IteratorWrapperTest.java | 0 .../aspectj/testing/util/LangUtilTest.java | 0 .../aspectj/testing/util/MessageUtilTest.java | 0 .../testing/util/StreamGrabberTest.java | 0 .../testing/util/StructureModelUtilTest.java | 0 .../aspectj/testing/util/TestDiffsTest.java | 0 .../org/aspectj/testing/util/UtilTests.java | 0 .../testing/util/options/OptionChecker.java | 0 .../testing/util/options/OptionsTest.java | 0 .../testing/util/options/OptionsTests.java | 0 .../testing/util/options/ValuesTest.java | 0 .../testing/xml/AjcSpecXmlReaderTest.java | 0 .../testing/xml/MessageListXmlReaderTest.java | 0 .../aspectj/testing/xml/TestingXmlTests.java | 0 .../aspectj/testing/xml/XMLWriterTest.java | 0 147 files changed, 445 insertions(+), 62 deletions(-) delete mode 100644 testing/.classpath delete mode 100644 testing/.cvsignore delete mode 100644 testing/.isJava5 delete mode 100644 testing/.project delete mode 100644 testing/build.xml create mode 100644 testing/figures-coverage/.cvsignore create mode 100644 testing/figures-coverage/all.lst create mode 100644 testing/figures-coverage/bin/figures/Checks.class create mode 100644 testing/figures-coverage/bin/figures/Debug.class create mode 100644 testing/figures-coverage/bin/figures/Element.class create mode 100644 testing/figures-coverage/bin/figures/Figure.class create mode 100644 testing/figures-coverage/bin/figures/FigureElement.class create mode 100644 testing/figures-coverage/bin/figures/Main$TestGUI.class create mode 100644 testing/figures-coverage/bin/figures/Main.class create mode 100644 testing/figures-coverage/bin/figures/Test.class create mode 100644 testing/figures-coverage/bin/figures/composites/BoundedLine.class create mode 100644 testing/figures-coverage/bin/figures/composites/Line.class create mode 100644 testing/figures-coverage/bin/figures/composites/Square.class create mode 100644 testing/figures-coverage/bin/figures/primitives/planar/BoundedPoint.class create mode 100644 testing/figures-coverage/bin/figures/primitives/planar/Point.class create mode 100644 testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class create mode 100644 testing/figures-coverage/bin/figures/primitives/planar/StrictlyBoundedPoint.class create mode 100644 testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class create mode 100644 testing/figures-coverage/editor/Editor.java create mode 100644 testing/figures-coverage/figures/.cvsignore create mode 100644 testing/figures-coverage/figures/Debug.java create mode 100644 testing/figures-coverage/figures/Figure.java create mode 100644 testing/figures-coverage/figures/FigureElement.java create mode 100644 testing/figures-coverage/figures/Main.java create mode 100644 testing/figures-coverage/figures/composites/.cvsignore create mode 100644 testing/figures-coverage/figures/composites/Line.java create mode 100644 testing/figures-coverage/figures/composites/Square.java create mode 100644 testing/figures-coverage/figures/primitives/planar/.cvsignore create mode 100644 testing/figures-coverage/figures/primitives/planar/Point.java create mode 100644 testing/figures-coverage/figures/primitives/solid/.cvsignore create mode 100644 testing/figures-coverage/figures/primitives/solid/SolidPoint.java create mode 100644 testing/pom.xml rename testing/src/{ => main/java}/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java (100%) rename testing/src/{ => main/java}/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/AjcTest.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/AntSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/CompileSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/ExpectedMessageSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/FileSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/ITestStep.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/MakeTestClass.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/OutputLine.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/OutputSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/RunSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/WeaveSpec.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/XMLBasedAjcTestCase.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java (100%) rename testing/{newsrc => src/main/java}/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/ajde/CompileCommand.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/AbstractRunSpec.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/AjcMessageHandler.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/AjcTest.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/CompilerRun.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/DirChanges.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/FlatSuiteReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/Globals.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/IAjcRun.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/IRunSpec.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/IncCompilerRun.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/JavaRun.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/RunSpecIterator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/Sandbox.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/harness/bridge/Validator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/IRun.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/IRunIterator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/IRunListener.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/IRunStatus.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/IRunValidator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/RunIterator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/RunListener.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/RunListeners.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/RunStatus.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/RunValidator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/Runner.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/run/WrappedRunIterator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/AccumulatingFileFilter.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/BridgeUtil.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/CollectorFileFilter.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/Diffs.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/FileUtil.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/IntRange.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/IntValidator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/IteratorWrapper.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/LangUtil.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/LineReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/LinkCheck.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/Node.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/NullPrintStream.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/ObjectChecker.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/ProxyPrintStream.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/RunUtils.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/SFileReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StandardObjectChecker.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StreamSniffer.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StreamsHandler.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StringAccumulator.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StringVisitor.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/StructureModelUtil.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/TestClassLoader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/TestDiffs.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/UtilLineReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/ValidFileFilter.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/WebInstall.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/options/Option.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/options/Options.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/util/options/Values.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/AjcSpecXmlReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/IXmlWritable.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/MessageListXmlReader.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/SoftMessage.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/SoftSourceLocation.java (100%) rename testing/src/{ => main/java}/org/aspectj/testing/xml/XMLWriter.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/TestingModuleTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/AjcSpecTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/CompilerRunTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/DirChangesTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/ParseTestCase.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/harness/bridge/TestingBridgeTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/taskdefs/TaskdefTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/BridgeUtilTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/FileUtilTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/IteratorWrapperTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/LangUtilTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/MessageUtilTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/StreamGrabberTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/StructureModelUtilTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/TestDiffsTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/UtilTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/options/OptionChecker.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/options/OptionsTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/options/OptionsTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/util/options/ValuesTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/xml/MessageListXmlReaderTest.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/xml/TestingXmlTests.java (100%) rename testing/{testsrc => src/test/java}/org/aspectj/testing/xml/XMLWriterTest.java (100%) diff --git a/testing/.classpath b/testing/.classpath deleted file mode 100644 index 55bc2144b..000000000 --- a/testing/.classpath +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testing/.cvsignore b/testing/.cvsignore deleted file mode 100644 index 38972d828..000000000 --- a/testing/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -bin -bintest diff --git a/testing/.isJava5 b/testing/.isJava5 deleted file mode 100644 index c18a7b867..000000000 --- a/testing/.isJava5 +++ /dev/null @@ -1 +0,0 @@ -.isJava5 \ No newline at end of file diff --git a/testing/.project b/testing/.project deleted file mode 100644 index 1f079f0eb..000000000 --- a/testing/.project +++ /dev/null @@ -1,25 +0,0 @@ - - - testing - - - ajde - asm - bridge - taskdefs - testing-client - testing-util - util - weaver - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/testing/build.xml b/testing/build.xml deleted file mode 100644 index 4a7a25ae3..000000000 --- a/testing/build.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/testing/figures-coverage/.cvsignore b/testing/figures-coverage/.cvsignore new file mode 100644 index 000000000..c6495af69 --- /dev/null +++ b/testing/figures-coverage/.cvsignore @@ -0,0 +1 @@ +all.ajsym diff --git a/testing/figures-coverage/all.lst b/testing/figures-coverage/all.lst new file mode 100644 index 000000000..3879af0b1 --- /dev/null +++ b/testing/figures-coverage/all.lst @@ -0,0 +1,8 @@ +figures/Debug.java +figures/Figure.java +figures/FigureElement.java +figures/Main.java +figures/composites/Line.java +figures/composites/Square.java +figures/primitives/planar/Point.java +figures/primitives/solid/SolidPoint.java diff --git a/testing/figures-coverage/bin/figures/Checks.class b/testing/figures-coverage/bin/figures/Checks.class new file mode 100644 index 0000000000000000000000000000000000000000..729d06c428765ff29f09becb9513a42a71d6ab00 GIT binary patch literal 3232 zcmeHITTdHD6#m9G*lS$kKvGCTf07p=#T z{+7O0?Moh-@Ici_=}Xi~ed@32TiSlJ>tK^?Dm9h*#9C)}=FFUPzH{|&fBy6gKpEH4 zNC@;kaB9s!Hq1(0+Fv!&ND1UOtZmD5Ew5%St!+qK2^_OF>`}*a)U4&WykD`J4JmMZ zzJ2v}J@9v|HCIjv7}c*mRhP=K1qQX~mJF(nS97KEy*aO;EYGHRe*U0!N@k{QSKGNR zkSva`2&5|hy3B$|b2x$?enWkJLsi0y29J*B(1q?a`UU!900|tKcRab+++35vZ4FVN zZ{D{pcf|@Ey>BtQr$f_OBr%x7yV_bx)tv?{Xrt@WcCA3JN`Gf{QlRVywX)UNVt_Wv zJJQ;gL3u%{y1#xiyl5%M_u7U9&cq1Z*ysq=YgR5XAd!Wo2gF<)e>Gs*`?EP@V5IS$ zz!)ucf6?|?Fjh^zWS9p+6jv*eJ5^;ViL(rHl6{;&R@Xjv zY3=|+*TViT&0Q8f+~;_9fnULI?nk`yJu`aPf++3`KK7U*EjkE`8}NfnXDgpl<06Y!kHk~ zz&J_=RFy*4fGp*HL09Tg^3fZmvwE~KpHU9ma3-ixKRr(&?(Jb>7lrsx>1!D#Si`%> z;SPNF`gA21$UCkpYnHnxcUW*Uu3}b2LYES{_+{lWBg69lZRRDfoHmt#4^c~t3YbIO8ELoxq6@c=B;MVW$M(0@}`;7*-gt~*GCoqkF%#eC?b)A da|k$`Jz>oM$JvuUoIRd8oIPVKga0^t{stgU1UjoXfqLd;X7bY$sCRimgHn1pSaARJFM?1|hLuOt9e~}v& z0t<{J>Pi#b_>0v0W(w2Bs)=#sB(HDoefQpT?zwMz{_Wj+00rDlA;!?NZB-kd@Qp{J z(x|48V93__9ye_6RE@PtU6_(#kk`!_%dzANw`>Y8@`f)MhDuTBdd+k9dBqls44LvP zN7jV2OokDax+}c0&s#gn4zOS9Z7VhFu*X-fsewm9I@KisR(afF=Xg3xhA(axMwN5>Finxpf$uX zqT{MUOURn#6D{uVk`8Oz1eTloiS>l*RSRKAy|6F%p709G^-B#D#|a&2WKx)7n5Af= z86B#;>MjTMAG!@^>+yjpcBSPyY21j$^D-EZhDppQYPT5jxfb!u(j$2nTRhP?l#H1g z_d|?8*cVFC5eBX7Hat_TSV|KufG8*h8Kye4^gQTnLwG*1V;Joaa)Hq)J;W-yjuZ!U zrAo##pGq0rw8f5aq*1k`Z?x1jr0^wmWi&6zg6Wd5yecjn;gxL??lgmta9MIGFijoD z>E6ensoO$UiYy?b=5lEz$8JSFpppP-|sE%%9wyjh?fCV(l`-EiTFn;*UY)yS;q*SO*L}#8Vs;B!5 zZ1WVk6O4y_MG{05l9&qs@|dSx4~wzd8pghos6>%{Z$4NcbCCXx5CruR(_UIJS_Z(* r%XFX~_EFifFMl=1dsOXrb8OWyajD}U<{9-JrnJxY|C(pwAI$Ryc786| literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/Element.class b/testing/figures-coverage/bin/figures/Element.class new file mode 100644 index 0000000000000000000000000000000000000000..ef4f449fab66d328268557cb1a2b8f54e0c741a0 GIT binary patch literal 109 zcmX^0Z`VEs1_nI_c6J6PMh5=0%=FTt)M97Dfhvti-ZJ{hY+SbbbG% xtkmQZMh33n{L-T2RJY8WR7M6NH?StC7Cn$^HUeS{5$<_=JgvM&vhaPb?X@jS_O5Q(mMv_{78aI|SVFc8L3!GJl2)vC#qN`@ zBm}~Z6B5E1jsQPWsY>x97-Bn+f-0(jibIYc6!{fW_?ct(n&|)7{h4-P6``qnt+xpZ^&HO_Bf61F2%67J z$MsxKDl?qcjcleXlQ*TuwVXB}RXeGUD z-sq4MLl~MBrT_(1x>C@U9s&uf=uTzyy%S@Ddajp66jarnO=#&pEtlf&0y4N+vMwhd z%@5OD=H@p>Qh7n0=Kc*mw?{WdvdL&c@Bve8_UCvmHI_0`NA&!_I25Sm2KHxD86!HZ z8+)}e@NKTP_w3A#n{(rGZrfUyQhSUX)CRq*%I1b+T7Dd-F&aCnYe)24Z0FDrKEbRf zHJs559E+gk7bP!9wWXO|?a8dlOM;k(1g0`}=!vwJ(~ML$X zxKwxS?A&&3ckjRkI4&{{4ytueZxext6nG&KsUsqO~bc)<fWzm?=xRZW+9Rf>B8e=*X>I~>Ae&hi86DpgDW@IO#o_B3kgqOv<+Xh?sGIhx zw8so97vE2q_R)SpVZ;qrs9B2OQKAleyp6>;5T+jL6%^FQ$MsB7&^os~=H=oM@63%# z3VmTZ$nIKZWKAWMQ$Jm&(qSvq7i%s|*Ymbjgqnvp~OBT=ZFNYDHYzH7j-5g z_Flkpx>4Gyo`cOegu~_Uv1Y4s?Ez#W4 zxB(gvP{d7w0_~CG*$Xb(5Y=_8Y1Zq(l3h3{uNZw`T+2bD`2paUdPRUySK{HhumPrI z`tQCWWC1YYp`rw+jq{1)VJf4LN?(SRlvw!Q>^6A~Z_iF-k~@zj^l^5*GWx2MOck<% zaymg@V@JG2hK|YZ+~#skCwb!d92(K`CKH(j9p;N;zM%4+>_jf1ccwUjnPHkljH$vk zyD}L)*OAupc|EVv-LS?I!ENhiN_MOgw8TS^y~oG(JrkK>Jtt^S{Mx*p%g42ZY0vTD zl#!3S7R3!cZy-&H7gPx=MtY(R>lUJrTozVmM*=rtB}~qmOcv1KTyre~NRN&*5Ux?kUJC;gMkP>ZF`YvtY>5nm~qiiQngsGKrg1+bNBc=w~0CZZ8X+FFL6e{No8eb~Dh(c`t_SbBD zmD3D-hcUJetw0+-OEZ5!WxH#hr^@Ff#s>;j=*`9`(;}=RPNUK1m2tF;4b+^WdC#Gv z&>Z{@n@Cy!mQ=JjLsM-A?4YGeDw-grCQNmAHG+-U2x3C*dQ}#be}q2=D~p+khtlJOeHH zMrFscgB23PI&KCqPvNL@u0&A5;xI;=AdcH`SKzA+#$?LfE<~V2?6ctT;v}&dhu5|5 z1;8sH>-(YXSVBc5hJ~sHuyMMCGA+jv%CXESCT^xJ1yNQBSoutM(w7Gr^1TH(5B2%r z5x(=b!L61U=GaSqx$DKJsQo3{(O=bhhIZBdgmw!$O2-sBWZnmL!1Rfi!onmmQ03qr|XIU2IcT=}ThU1hy?;o3V~t zS)~MgIQa`6bKno)`A5JzfOmsJ@MhWhvjyi5{0jpg0Fks1A7L+56ij6jxkLS=V5q4u z6oe9jbKQsqKrCX4I7FrtMEnc9k9LU%t6&`l8nGO~Q672_ks;Vl{=9A+BH^aH6$9G~ zbmg)RAmFmW9bR+~V&JfwF4P{>CEfmFy2BWN;Y)~**yboXk z;;kt!%kwbcIN%Wg%grt81+COOw>WD4roe0HJZc;L28k*0=Jz1YsGb4-MK{@>0`Z!Md#i6?;Aa+DUUm*}3h;9PljoMj=ayBD zR+N;EzC;K4rk> zB!*@HUL`qwJzq`c^wNaBFx`AtV2wiG0Nov>e_4_2Cg+Voq4+RRlnROKKp??sjr;Bu z2vcI%74yU>5NTcvP02NIRM7{>SVU#mK+WQE++E@rINf0f4@m2C3wIYr?{OnoEBCn( z_XC0J%@m)BJqSQ5EpXq-Z9GH>A4t-qA&8NEwD{MoTjl#x=+;Vnr%Z@0o-K)AfcGx} zuLFMN3ULuBCXnX=?_wKPG#7sY;(hxMI=mlqM?CQ#fZqcC>7r!iT?(8_Q9;SN@01V_ zi#_iS>weDH;%H!CA5MYN7>~OmlcE%rQ4#*%k}^e z_msU}bTtel-E@b5$a(~3`Zf;pGXrT#Wp*CZQEx*L z4NFl!!H@fd-@@nH0rK-q5&<5DBPfhUey5xR{7&*1o`Oe3&aB4m(lW_3s&%+e%1Sxo zb&3Gwn>7=>?~^R>6#*cR@y!PyXO}bTB(p7^%<$(0>+u5?rHnxWxvFoFzJ*<^=cs16 zkNO^X{#oW6C?`lySCO`r!545la$B;bYz6SE z4!|046_BMKBTu6&x4Q@8qkn~6Fqb7vuM?TQj1Wy{WNA4l@CEa6%8OiwVRM|Syy(8R z%Vfz-VZkn3W}J-)Rz-3S`sU+0P{?OK<1(YeEbJ-?S|!KJP-et4iOY;mfuRCE9l<6E zl>)QC5Ulap1w}``3YUCAoH+bqx}bOqVg&*)`H&<1QMq2bx+cEinGq3W|=9X3@|Qva}rW zKUYw6HfNR(ofv3s?y?jV9kyoq(2MPKLD5RSvW0v?RtBdFil4fm=vbdwG`z4!PZt#B z{{xK`*NCSJitgtE9&Z1?1x0ojt7z!Bij^`T-66BMI9*W0Ye~jz`rHbNS4qO4_17ZhFbUYRZ^K7+VFT~L(&uh6Mvq7pD&P{bAZi3^JV0YuMz@Bjb+ literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/FigureElement.class b/testing/figures-coverage/bin/figures/FigureElement.class new file mode 100644 index 0000000000000000000000000000000000000000..c7704559258cc208a9ca40d941bb07afdcaba1b6 GIT binary patch literal 398 zcma)2!AiqG5Pef^Qft*BcoXrcm(9hSS1lB(6@pcd+c>5PX(F4X{!>4}gCF3@FA|^8 z9s~s!hS`~&_vXEQeSdxdV6g3@CD?mN;@W8$44QnN>0I;5$GV`O+Jy}=o5#U;nrg(Z zC)im5zDEUKl1J|LPS8FY4v!}SQ@GgJ@{y3#JgHr%GZ$LTiu*H-GV5%W6!|F0^|GE% z)d{*`QM*V7Nv49`A4<%p2*Kemls66YL|sWb!NH#+VPz|&bio>5WA1T=M`mN}zhR5ltFURHKU)35m)KLbPa4efUwdeo2=4g+B6D0p literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/Main$TestGUI.class b/testing/figures-coverage/bin/figures/Main$TestGUI.class new file mode 100644 index 0000000000000000000000000000000000000000..94fdfabaf667ec4b209ef4430ee7350c6fe0b140 GIT binary patch literal 425 zcmZut%TB^T6g@*Lg<3%o(WMEPD2ws|7&jOU2Hc43hcd!onVOjb{+1g}T=)Tgl<`g> z(S?iqI``b?*Z0RKfDk7hatzf+IbCXDS_3XsV<=2|^U(9)GF0Y##a~)xE!DJj+tqv_ z81k1=$@GfBIlmY&go&Pp+&qgYori0|S3-vakp51V@u(oEWyLaaFIo-X#|NQ&~z{N8QDFJ6&*V{&gX4s=%$YJK5w^pUYc@pWKp2!x%PFmB+ylw+Z0GI z2Q_7*3%w33WCR8(+E=gJ%`Ig%SH@ja(N0iXQC>qD8R@`3qmacg3KsGgv{yfc zk!m`)iV?~P+EkwJWYa-;ov9)wRI<64!I(hbQZcC!8Mv-%V;mC}t_ut${4U;bFo~jo z#q#-4gF5o1%VgLPn07FOSyrGa_f+*<6J|7W}uHcFVcFefl}Rskn>7P0(02t=QwlF_NWK<}SE*&wqz~KqCc*@17)Rp^vuHIe>l)(92>F zS9mH%JHyq>b(lZ}jHc*Ke#201^a$5}VCoPzz93UsIKr(sdYjRM1g@VTrQ>8{39mlF z4KPWb&;>ptn80X4pwNNk4_YRC4r$!QJ)&geNuZwljK=W}p>b;XoDiB$GSL-Z`R%;0 Yi3B$$o5F+S{Sc41#{>45>nSpS0R}1M1poj5 literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/Test.class b/testing/figures-coverage/bin/figures/Test.class new file mode 100644 index 0000000000000000000000000000000000000000..04768405a2d11939a5c1626acebb2dac3b2c9a2b GIT binary patch literal 4129 zcmeHJ-&0dZ6#fG{f?!3d2vR91R4^88YcI(rT)fnM$YbQR?ZoB6&rZ8F9bj80@yFGzlu8oO*6VFujf~nq`jaV z6lj^TlA4jwY+daO!nzBt=^$!xB!olCn$KC*a{?X8=#orZwu}@!zN^rR^hf$r1ARm3 zrG9}E(NZ*7TVK^3eT|@I38QAm=PccHMy6Cqt(KkX)pA+ly3%`JYHQN&9ZRk03J@_R zaD3Ni1bVByaZNhQR%${f4b9dZ-7?EjH{dur1L)Y6+W7}LN3Mnt!3m-*ZM&3C-HOlI z^mpE|rM5Z}z$t-4Wn?L4Dlg~LX=&FZ#%rTtQ{E4+X+~a#t#o)jtmn>$gE)z9g<}sj zq7{YW-5-f1f~>*50OA72igmC9av}8N49iO8AtRm0xE&!bXCbrMPkbAqNja%2j%c{1>1MCOO5kLbfZUc& z=ADX;69`vPyyfrG;R+nBa-FTXMu#$zr7KwY)l7JPk6WfA*U8q?@tZlC zi)%?ks=UTCx|54nyd8I#DAsqpkhs%Hi!`KVWKj^W2)?Bv!ISQ{VkCrFWY{RhynEsR z^dMHS%;u~@n4V7LOeEE}B!|vvLm?PwR2NpOSB!_-yrVgi{KZ7^qg8{TB75!v+yM=$ zib}fxcR@6AAL3aLXTdr29DBY){dCteG(T}AwS1w4s{=e$Zz)|U#^+kyjB{2}f7d1s zKjESV2l+ST3DHWE*mhaqEws_WcFKPe{#q_~r*Y~6zAp;nbIxD-MO}@O^0RytUWmT0 zdGL^ew~K;rD0qaL^>qlJQYI3v(j(4aaeV88sO6``_15^mf;P&)6T^PE^OdZ8K|&# zu>ceh!xg%(5RGAyk=3~11vvwKh?3j|-ow=bfS-vfF!%?UjtW!PU7) zF@x}r7Ez!L_^)!za*T7#aVQPW@VB~)V)V*Lt6KuobVj+?)b;X1UB_j`|-cU)<-1d8U4cpW?=EXx_rYVoTyFnm6&` z3yPRDs+Y@?Ur<+~3jPj0+V&IyP%k0KdoSVlJ+6K1>Q=iQRR2WLIj?!j?sU7s0F7G^ zi<|iP8E$xyR(m9XPh10c@hRttSO1HnjHRRqChH^}KnT}Azkge@ey|NGgrIILofR7S$Q7AO$%$zy% zdOUA;0DaUQScKL_ZL?S=gFqioI#DTy6P-n&41ELx3d3IdOcq!Hg?r8Wr5QmkBmC3)No$gdZX#0N_{TwqSxC@=dft)Eb xt7NA4_u?$j2H(JMff;5uv%}GV`K|P>C|+2w;4+%B!7^jzV_>dwMyN4b@LqgiLTdm3 literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/composites/Line.class b/testing/figures-coverage/bin/figures/composites/Line.class new file mode 100644 index 0000000000000000000000000000000000000000..ceb1b35dd1aa51da5233a1e0c656291a50b26a1f GIT binary patch literal 275 zcmZ`!yAA8zkvRuFusMGKW*Aduha->qqYQ5-Usq zW(ZCtN=XRgzo*1#Rpm><=u%b6tO)k`#hRtp^@H?a!w=wMJjO0d2KNaFdjWPZ;vTC? z-nL~b^}R@o-n`C4u@+i&_?L9dlWGX3@xPHdftS>+&g6~iZ2aNYqDzW1zG(B$308Nu xpU}l(X2R%-dE)NRKj6*7;2qO9h8AXAr~Rq}hgUtW`^*J{93c)E5e|Fx(GUL*lA@9(x{-FK(@U9T!U(H$9;;m5mWzor z1ph*(GQ=9f78+<0+JD^#G07yM6YE4|V_}rbe~Z4Ise;gpSMT`$o&kZLStHg9A-vb6 zN#wP1|A+N4(OgslT@df$9)oTncnCOKXAJ>=QM)T<92J}%9KK=Wm92+Oj!hnNV2fk- Z2f-G$Ib#@Y?9}}LyX-vn9j<%W`v#l2Vs!uj literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/primitives/planar/Point.class b/testing/figures-coverage/bin/figures/primitives/planar/Point.class new file mode 100644 index 0000000000000000000000000000000000000000..c14c89149c7420c3278bb7d3295f33c51703eebc GIT binary patch literal 5094 zcmeHKOKcn06+J`oCwd}Fvgw-o*s?^&GHZ#JWYMzZIQ2(rmB?0F`J1FQN5hdg4n-a@ECD9}yUEsAc_WearC^xQYYAytc(gKkTL zyzhH|@4kD_`{Lif`VD|#yc0n{!`>x(dCjrP=~c&Gu`BkvGz&)2aMG`o>|!N?poaEq z#=4Q_=yG~~@tS3FG^`EJm2@NfS2QPBt=~B*W1%>K}AR5ItH0&51I%890 z*)A20LZ4DsmLzoOcuvFiIlE|`TU%MQob$$FLCGzdM&Y92*wXg~!^b^Ip~2Z%ku_X$ zmWPeBeBCnEEob%3#=Lw^MOH0)GXtySy--Bh-mb&;Z@ z2c4o;QpYw#rS-gynA;lE(TXU|tK{vnhJAB2mo_;Kx+%77RZiFZN$1edK@MGZ$rX~a z+Z$BINRNYIyJ$L>uf!<*h>jr~l2%4X8i%Ddp)(-V*rbjT9OfbBczA&vPcLNVE%OZu zp01kKs@PtR;9DAc>t}exG(1T?lY?72PW+^{&>ym8|JGZS|7JuC?}6pGA&~S; zy6OhK->o0mRrmT_Rf>y-=Tyv(Z!PfPlh;DW%b3&9R&%5)HG*?7%;PMtmd}6Z;3nH? z^O@j>}+}>WzaDycWajcvVBcD86Vdl^n}gShgiclVf8?M{?GY!#aK-q5L|oGQBi# zckNRA4bg)MW?&O;p7|q5%QQ!iEg3p;!fqZ6!Tt3>_d|8IDBiP;g8i1|Ogm1=iD21d zZ7eZbd_6tRnL2EA3hQeO+~%r`CUb`ut;~eMTUu~8tUPtYk>ruXM#em9 z9nsKL4>ni6mz<{#@2r?8#u9*+a!}-QVI2<?A-MUcHcqb?4jQx|30FJK1cpB zxb7j|IP}=1_sJd1zazNGRu|iy2=c!bJNZ3`JV^O^{~eVcF50iO596n;^}`BeJ6>6P1amH$j?>N4et;+9q2$L#q?54Q2=N3x03X ztZo|6r<{9_Ca2h=LF(|tIrr4@1(b98J@cbH!d|o^g9PKc3wiY8T@2s@B)Q|8IMm>* z=NSRJ)DezzR5)&E65T3MyDQcG0*&r*4~Hb%!!x_@Tfd9DxypC{ zF3C>l z%uXW6P#?d8_DKn68Cpw()Lm0;$c)6Z^s0%lKU0P9I@*)XL?$JA6O39X5tZmZCVM1q zWo(U+D>qlQ6}Onzt0rRpOcnQec`sp!`Ti#9E&P}?hTV*Cp`#f8uXw-hJN!1L7~2w^ zw{e^;H{RRS;bky~qm1nd&c8tCwD^hO7@hNuI)Vl6kb~~%zKuxFhuHROoV@ZGPCu@D z-@RfTzQ_(=WJiO@n2LlcUasRfL55-WU&P7wR(u=ZVS9#SP$GM&jwl>TeF_!#ZUS?! zjm8bLcxl6iJ?u%Cg;U*L@NL*ZX5Yp4_%G>Jg4$*N2(Nt1fyP@Jdg7K!Y@AW6rg4K* z-VFR``FZsGk+~b;KQ9Q6b{~XzFd;x8TZ3?69YDGKzobb8h|V!+-sqspwUN){VlNRbAD%R98#w(y+kb;Lu0YZO{Gfs}^W; z2(B8Hd}XsYRCTq2v*`;_*hkFj+UURtkM`AvJHb3eW^nUUd zFpWHxn;rOAVJSu(u~d}b{|!kA7ONwuDRrTVwgL(<)ew@KpcZ*yKU-++QZEeh@^Xro|^f-DN2uvHgT0}?@IidN>jHUfzq1QNRmBzg%X`UxcJ zuw=l`nFBs78Sr39bGT7YVLs5Pm(v4^y$d>O>8v@>Xk_I%qva8YNK z-jr1{a51TZt1+LuRm-gaBZ`*`EW*A6!=3}1gNY4X8;;E7I<^JZCg1_DF-9ax;vRS) zT<}UiOMN{qY6UmOg1eIiw;ls=--NhdH{)L2td-@4dinKBw46d?@vVz~TFKUGW$!;> C>IldH literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class b/testing/figures-coverage/bin/figures/primitives/planar/PointBoundsException.class new file mode 100644 index 0000000000000000000000000000000000000000..d62ce0f177b6143a407c63ae75ba92d8e96ffa45 GIT binary patch literal 325 zcmb7v-7T9<@wGe&9(({FN}R3I zyO;l;`DYlu`TG9&1W;g@At4k`yllN`)Y|ik18-tkYpcDwcWlGhwRX|mzE)-(*x3vz zVf3OmTFKH0~BzX*zvtD6!e%LKk_e z(mPGL4d4qLEbsZt3e?XiCwneXJB;I_0Z-Fr6v_EaC3X@$Dp@KM-6%WO>6J<{X{05c z_b6Al#dN5QfPbk|6=DTp12xnIn!nY1In0zmtEUs04WuC#|0I1orn$gLZ~3bKop&lA zp4eixg+SQXg-KMG+?=rbfM_C1i8ci9Hbytn^?wP%(d i*4fv&$$<^_?QaAd*yM;|G_h6H18lSMShqOuVdo3nVr+f@ literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class b/testing/figures-coverage/bin/figures/primitives/solid/SolidPoint.class new file mode 100644 index 0000000000000000000000000000000000000000..f95982af827100cae7455225920e08289b00bc8d GIT binary patch literal 1573 zcmbtUT~8B16g^Y6EtG{K<r@^8K8?)M(o(i4kaNAQ zoL$?KC4VRPO4dw$p1Ch8xq)({&Rtj zOqK;1HSHJ~T};HOmb_Vk#|^C3YP_XkLd@;QDkDsVw(EdJEio7+;lyeuE)F# zV$!o|St`xl-n30z!KjMADv)j;KbJ1gY{>ar_Pj2a`hGb%ugZwU9;W)upNn6ZZkH_eZ)$pKBLW6|8Z?e@ zZP56H-uJu<;T)e9aTtewB)BVUfapS7gS0~0QW-nYN4rJn;TTFd~*^lUbM>j}o23Pg83OGpG$8!!q3t&G1S2W-QrdBP8TgiKbOtF~MiCTvE z8m}9*#C4~H<{iNI6P`2I0zW|bLk+)HhfnC9B`tCuORlHZk1*bB*Mw$}XrxF`m;gF~ zOSD2QO;YU}V&pL2nbei1F~?o~DftuIt4RIAby`0Q`T%{W=a+XMIKmKb|8W3bFsBmM zJRX2XqfU$1O%a=eU^Xf<8-rltco6i*gUIbg&+|@+9<~~Cw~DJ01=5G>iQ3D3hs{)a nMy%us^2bUltU&QdgLI^>_`zlamFn-x^K-(u5Ym4D`wiyg literal 0 HcmV?d00001 diff --git a/testing/figures-coverage/editor/Editor.java b/testing/figures-coverage/editor/Editor.java new file mode 100644 index 000000000..99e2b5d5b --- /dev/null +++ b/testing/figures-coverage/editor/Editor.java @@ -0,0 +1,4 @@ + +package editor; + +class Editor { } diff --git a/testing/figures-coverage/figures/.cvsignore b/testing/figures-coverage/figures/.cvsignore new file mode 100644 index 000000000..9a2b438e3 --- /dev/null +++ b/testing/figures-coverage/figures/.cvsignore @@ -0,0 +1,8 @@ +Checks.class +Debug.class +Element.class +Figure.class +FigureElement.class +Main.class +Main$TestGUI.class +Test.class diff --git a/testing/figures-coverage/figures/Debug.java b/testing/figures-coverage/figures/Debug.java new file mode 100644 index 000000000..01e895abc --- /dev/null +++ b/testing/figures-coverage/figures/Debug.java @@ -0,0 +1,7 @@ + +package figures; + +aspect Debug { + +} + diff --git a/testing/figures-coverage/figures/Figure.java b/testing/figures-coverage/figures/Figure.java new file mode 100644 index 000000000..b5e0e246a --- /dev/null +++ b/testing/figures-coverage/figures/Figure.java @@ -0,0 +1,92 @@ + +package figures; + +import figures.primitives.planar.Point; + +import java.awt.Canvas; + +aspect Figure { + //pointcut sendSuccess(): cflow(setX()) && !handler(Exception); + + public String Point.getName() { + return Point.name; + } + + public int figures.primitives.planar.Point.DEFAULT_X = 0; + + public pointcut constructions(): call(Point.new(int, int)) || call(SolidPoint.new(int, int, int)); + + public pointcut moves(FigureElement fe): target(fe) && + (call(String Point.getName()) || + call(void FigureElement.incrXY(int, int)) || + call(void Point.setX(int)) || + call(void Point.setY(int)) || + call(void SolidPoint.setZ(int))); + + pointcut mainExecution(): + execution(int main(*)); + + pointcut runtimeHandlers(): mainExecution() + || handler(RuntimeException); + + public pointcut mumble(): runtimeHandlers(); + + before(int newValue): set(int *.*) && args(newValue) { } + + before(): get(int *.*) { } + + before(): constructions() { + System.out.println("> before construction, jp: " + thisJoinPoint.getSignature()); + } + + before(FigureElement fe): moves(fe) { + System.out.println("> about to move FigureElement at X-coord: "); + } + + after(): initialization(Point.new(..)) || staticinitialization(Point) { + System.out.println("> Point initialized"); + } + + // should be around + after(): mumble() { + System.err.println(">> in after advice..."); + //proceed(); + } + + after(FigureElement fe): target(fe) && + (call(void FigureElement.incrXY(int, int)) || + call(void Point.setX(int)) || + call(void Point.setY(int)) || + call(void SolidPoint.setZ(int))) { + System.out.println("> yo."); + } + + after(FigureElement fe): + target(fe) && + (call(void FigureElement.incrXY(int, int)) || + call(void Line.setP1(Point)) || + call(void Line.setP2(Point)) || + call(void Point.setX(int)) || + call(void Point.setY(int))) { } + + declare parents: Point extends java.io.Serializable; + + declare parents: Point implements java.util.Observable; + + // AMC - this next line doesn't make sense!! Can these tests ever + // have been run??? + //declare soft: Point: call(* *(..)); +} + +aspect Checks { + pointcut illegalNewFigElt(): call(FigureElement+.new(..)) && + !withincode(* Main.main(..)); + +// pointcut illegalNewFigElt(): execution(FigureElement+.new(..)); + + declare error: illegalNewFigElt(): + "Illegal figure element constructor call."; + + declare warning: illegalNewFigElt(): + "Illegal figure element constructor call."; +} diff --git a/testing/figures-coverage/figures/FigureElement.java b/testing/figures-coverage/figures/FigureElement.java new file mode 100644 index 000000000..d2ce9eb82 --- /dev/null +++ b/testing/figures-coverage/figures/FigureElement.java @@ -0,0 +1,9 @@ + +package figures; + +public interface FigureElement extends Element { + + public void incrXY(int dx, int dy); +} + +interface Element { } diff --git a/testing/figures-coverage/figures/Main.java b/testing/figures-coverage/figures/Main.java new file mode 100644 index 000000000..189f05cee --- /dev/null +++ b/testing/figures-coverage/figures/Main.java @@ -0,0 +1,56 @@ + +package figures; + +import figures.primitives.planar.Point; +import figures.primitives.solid.SolidPoint; + +class Main { + + private static Point startPoint; + + public static void main(String[] args) { + try { + System.out.println("> starting..."); + + startPoint = makeStartPoint(); + //startPoint.setX(3); new Point(0, 0); +// SolidPoint sp1 = new SolidPoint(1, 3, 3); + +// sp1.setZ(1); +// p1.incrXY(3, 3); + } catch (RuntimeException re) { + re.printStackTrace(); + } + System.out.println("> finished."); + } + + /** @deprecated use something else */ + public static Point makeStartPoint() { + //return new Point(1, 2); + return null; + } + + /** This should produce a deprecation warning with JDK > 1.2 */ + static class TestGUI extends javax.swing.JFrame { + TestGUI() { + this.disable(); + } + } + + /** This should produce a porting-deprecation warning. */ + //static pointcut mainExecution(): execution(void main(*)); +} + +privileged aspect Test { + pointcut testptct(): call(* *.*(..)); + + before(Point p, int newval): target(p) && set(int Point.xx) && args(newval) { + System.err.println("> new value of x is: " + p.x + ", setting to: " + newval); + } + + before(int newValue): set(int Point.*) && args(newValue) { + if (newValue < 0) { + throw new IllegalArgumentException("too small"); + } + } +} diff --git a/testing/figures-coverage/figures/composites/.cvsignore b/testing/figures-coverage/figures/composites/.cvsignore new file mode 100644 index 000000000..d9011a888 --- /dev/null +++ b/testing/figures-coverage/figures/composites/.cvsignore @@ -0,0 +1,3 @@ +BoundedLine.class +Line.class +Square.class diff --git a/testing/figures-coverage/figures/composites/Line.java b/testing/figures-coverage/figures/composites/Line.java new file mode 100644 index 000000000..1f7ee5dc8 --- /dev/null +++ b/testing/figures-coverage/figures/composites/Line.java @@ -0,0 +1,6 @@ + +package figures.composites; + +class Line { } + +class BoundedLine extends Line { } diff --git a/testing/figures-coverage/figures/composites/Square.java b/testing/figures-coverage/figures/composites/Square.java new file mode 100644 index 000000000..8ba3825d6 --- /dev/null +++ b/testing/figures-coverage/figures/composites/Square.java @@ -0,0 +1,6 @@ + +package figures.composites; + +class Square { + private String name = "Square"; +} diff --git a/testing/figures-coverage/figures/primitives/planar/.cvsignore b/testing/figures-coverage/figures/primitives/planar/.cvsignore new file mode 100644 index 000000000..1dd78c3c0 --- /dev/null +++ b/testing/figures-coverage/figures/primitives/planar/.cvsignore @@ -0,0 +1,4 @@ +StrictlyBoundedPoint.class +PointBoundsException.class +Point.class +BoundedPoint.class diff --git a/testing/figures-coverage/figures/primitives/planar/Point.java b/testing/figures-coverage/figures/primitives/planar/Point.java new file mode 100644 index 000000000..d389be386 --- /dev/null +++ b/testing/figures-coverage/figures/primitives/planar/Point.java @@ -0,0 +1,73 @@ + +package figures.primitives.planar; + +import figures.*; +import java.util.Collection; + +public class Point implements FigureElement { + + static int xx = -1; + private int x; + private int y; + transient int currVal = 0; + public static String name; + + { + y = -1; + } + + static { + xx = -10; + } + + int c; int b; int a; + { + x = 0; + y = 0; + } + + static { + Point.name = "2-Dimensional Point"; + } + + public Point(int x, int y) { + this.x = x; + this.y = y; + } + + int getCurrVal() { + return currVal; + } + + /** + * @see Figure#moves + */ + public int getX() { return x; } + + public int getY() { return y; } + + public void setX(int x) { this.x = x; } + + public void setY(int x) { this.y = x; } + + public void incrXY(int dx, int dy) { + setX(getX() + dx); + setY(getY() + dy); + } + public void check(int dx, int dy) + throws ArithmeticException, PointBoundsException { + if (dx < 0 || dy < 0) throw new PointBoundsException(); + } +} + +class PointBoundsException extends Exception { } + +class BoundedPoint extends Point { + public BoundedPoint(int x, int y) { super(x, y); } +} + +class StrictlyBoundedPoint extends BoundedPoint { + public StrictlyBoundedPoint(int x, int y) { super(x, y); } +} + + diff --git a/testing/figures-coverage/figures/primitives/solid/.cvsignore b/testing/figures-coverage/figures/primitives/solid/.cvsignore new file mode 100644 index 000000000..fd0572c5e --- /dev/null +++ b/testing/figures-coverage/figures/primitives/solid/.cvsignore @@ -0,0 +1 @@ +SolidPoint.class diff --git a/testing/figures-coverage/figures/primitives/solid/SolidPoint.java b/testing/figures-coverage/figures/primitives/solid/SolidPoint.java new file mode 100644 index 000000000..80c1fc1ca --- /dev/null +++ b/testing/figures-coverage/figures/primitives/solid/SolidPoint.java @@ -0,0 +1,24 @@ + +package figures.primitives.solid; + +import java.util.Collection; +import java.lang.String; +import figures.primitives.planar.*; + +public class SolidPoint extends Point { + private int z; + + public SolidPoint(int x, int y, int z) { + super(x, y); + this.z = z; + } + + public int getZ() { return z; } + + public void setZ(int z) { this.z = z; } + + public void incrXY(int dx, int dy) { + super.incrXY(dx, dy); + setZ(getZ() + dx + dy); + } +} diff --git a/testing/pom.xml b/testing/pom.xml new file mode 100644 index 000000000..310d20acf --- /dev/null +++ b/testing/pom.xml @@ -0,0 +1,143 @@ + + 4.0.0 + + + org.aspectj + aspectj-parent + 1.9.3.BUILD-SNAPSHOT + .. + + + testing + jar + testing + + + + org.aspectj + util + ${project.version} + + + org.aspectj + bridge + ${project.version} + + + org.aspectj + ajde + ${project.version} + + + org.aspectj + asm + ${project.version} + + + org.aspectj + org.aspectj.matcher + ${project.version} + + + org.aspectj + ajde.core + ${project.version} + + + org.aspectj + bcel-builder + ${project.version} + + + org.aspectj + testing-client + ${project.version} + + + org.aspectj + org.aspectj.ajdt.core + ${project.version} + + + org.aspectj + testing-util + ${project.version} + + + org.aspectj + taskdefs + ${project.version} + + + org.aspectj + weaver + ${project.version} + + + org.aspectj + loadtime + ${project.version} + + + jdiff + jdiff + 1.0 + system + ${project.basedir}/../lib/jdiff/jdiff.jar + + + ant + ant + 1.0 + system + ${project.basedir}/../lib/ant/lib/ant.jar + + + jakarta-regexp + jakarta-regexp + 1.0 + system + ${project.basedir}/../lib/regexp/jakarta-regexp-1.2.jar + + + org.aspectj + ajde.core + ${project.version} + test-jar + + + org.aspectj + org.aspectj.ajdt.core + ${project.version} + test-jar + + + xercesImpl + xercesImpl + 1.0 + system + ${project.basedir}/../lib/ant/lib/xercesImpl.jar + + + xml-apis + xml-apis + 1.0 + system + ${project.basedir}/../lib/ant/lib/xml-apis.jar + + + junit + junit + 3.8.1 + + + commons + commons + 1.0 + system + ${project.basedir}/../lib/commons/commons.jar + + + diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java similarity index 100% rename from testing/src/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java rename to testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java diff --git a/testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java b/testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java similarity index 100% rename from testing/src/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java rename to testing/src/main/java/org/aspectj/internal/tools/ant/taskdefs/MainWrapper.java diff --git a/testing/newsrc/org/aspectj/testing/AjcTest.java b/testing/src/main/java/org/aspectj/testing/AjcTest.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/AjcTest.java rename to testing/src/main/java/org/aspectj/testing/AjcTest.java diff --git a/testing/newsrc/org/aspectj/testing/AntSpec.java b/testing/src/main/java/org/aspectj/testing/AntSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/AntSpec.java rename to testing/src/main/java/org/aspectj/testing/AntSpec.java diff --git a/testing/newsrc/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java b/testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java rename to testing/src/main/java/org/aspectj/testing/AutowiredXMLBasedAjcTestCase.java diff --git a/testing/newsrc/org/aspectj/testing/CompileSpec.java b/testing/src/main/java/org/aspectj/testing/CompileSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/CompileSpec.java rename to testing/src/main/java/org/aspectj/testing/CompileSpec.java diff --git a/testing/newsrc/org/aspectj/testing/ExpectedMessageSpec.java b/testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/ExpectedMessageSpec.java rename to testing/src/main/java/org/aspectj/testing/ExpectedMessageSpec.java diff --git a/testing/newsrc/org/aspectj/testing/FileSpec.java b/testing/src/main/java/org/aspectj/testing/FileSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/FileSpec.java rename to testing/src/main/java/org/aspectj/testing/FileSpec.java diff --git a/testing/newsrc/org/aspectj/testing/ITestStep.java b/testing/src/main/java/org/aspectj/testing/ITestStep.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/ITestStep.java rename to testing/src/main/java/org/aspectj/testing/ITestStep.java diff --git a/testing/newsrc/org/aspectj/testing/MakeTestClass.java b/testing/src/main/java/org/aspectj/testing/MakeTestClass.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/MakeTestClass.java rename to testing/src/main/java/org/aspectj/testing/MakeTestClass.java diff --git a/testing/newsrc/org/aspectj/testing/OutputLine.java b/testing/src/main/java/org/aspectj/testing/OutputLine.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/OutputLine.java rename to testing/src/main/java/org/aspectj/testing/OutputLine.java diff --git a/testing/newsrc/org/aspectj/testing/OutputSpec.java b/testing/src/main/java/org/aspectj/testing/OutputSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/OutputSpec.java rename to testing/src/main/java/org/aspectj/testing/OutputSpec.java diff --git a/testing/newsrc/org/aspectj/testing/RunSpec.java b/testing/src/main/java/org/aspectj/testing/RunSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/RunSpec.java rename to testing/src/main/java/org/aspectj/testing/RunSpec.java diff --git a/testing/newsrc/org/aspectj/testing/WeaveSpec.java b/testing/src/main/java/org/aspectj/testing/WeaveSpec.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/WeaveSpec.java rename to testing/src/main/java/org/aspectj/testing/WeaveSpec.java diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCase.java rename to testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCase.java diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java rename to testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava10OrLater.java diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java rename to testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava11OrLater.java diff --git a/testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java b/testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java similarity index 100% rename from testing/newsrc/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java rename to testing/src/main/java/org/aspectj/testing/XMLBasedAjcTestCaseForJava9OrLater.java diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java similarity index 100% rename from testing/src/org/aspectj/testing/ajde/CompileCommand.java rename to testing/src/main/java/org/aspectj/testing/ajde/CompileCommand.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/AbstractRunSpec.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/AbstractRunSpec.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/AjcMessageHandler.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/AjcMessageHandler.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/AjcTest.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/AjcTest.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/AjcTest.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/CompilerRun.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/DirChanges.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/DirChanges.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/DirChanges.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/FlatSuiteReader.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/FlatSuiteReader.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/Globals.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/Globals.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/IAjcRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/IAjcRun.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/IAjcRun.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/IRunSpec.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/IRunSpec.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/IRunSpec.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/IncCompilerRun.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/IncCompilerRun.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/JavaRun.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/JavaRun.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/JavaRun.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/RunSpecIterator.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/RunSpecIterator.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/Sandbox.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/Sandbox.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/Sandbox.java diff --git a/testing/src/org/aspectj/testing/harness/bridge/Validator.java b/testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java similarity index 100% rename from testing/src/org/aspectj/testing/harness/bridge/Validator.java rename to testing/src/main/java/org/aspectj/testing/harness/bridge/Validator.java diff --git a/testing/src/org/aspectj/testing/run/IRun.java b/testing/src/main/java/org/aspectj/testing/run/IRun.java similarity index 100% rename from testing/src/org/aspectj/testing/run/IRun.java rename to testing/src/main/java/org/aspectj/testing/run/IRun.java diff --git a/testing/src/org/aspectj/testing/run/IRunIterator.java b/testing/src/main/java/org/aspectj/testing/run/IRunIterator.java similarity index 100% rename from testing/src/org/aspectj/testing/run/IRunIterator.java rename to testing/src/main/java/org/aspectj/testing/run/IRunIterator.java diff --git a/testing/src/org/aspectj/testing/run/IRunListener.java b/testing/src/main/java/org/aspectj/testing/run/IRunListener.java similarity index 100% rename from testing/src/org/aspectj/testing/run/IRunListener.java rename to testing/src/main/java/org/aspectj/testing/run/IRunListener.java diff --git a/testing/src/org/aspectj/testing/run/IRunStatus.java b/testing/src/main/java/org/aspectj/testing/run/IRunStatus.java similarity index 100% rename from testing/src/org/aspectj/testing/run/IRunStatus.java rename to testing/src/main/java/org/aspectj/testing/run/IRunStatus.java diff --git a/testing/src/org/aspectj/testing/run/IRunValidator.java b/testing/src/main/java/org/aspectj/testing/run/IRunValidator.java similarity index 100% rename from testing/src/org/aspectj/testing/run/IRunValidator.java rename to testing/src/main/java/org/aspectj/testing/run/IRunValidator.java diff --git a/testing/src/org/aspectj/testing/run/RunIterator.java b/testing/src/main/java/org/aspectj/testing/run/RunIterator.java similarity index 100% rename from testing/src/org/aspectj/testing/run/RunIterator.java rename to testing/src/main/java/org/aspectj/testing/run/RunIterator.java diff --git a/testing/src/org/aspectj/testing/run/RunListener.java b/testing/src/main/java/org/aspectj/testing/run/RunListener.java similarity index 100% rename from testing/src/org/aspectj/testing/run/RunListener.java rename to testing/src/main/java/org/aspectj/testing/run/RunListener.java diff --git a/testing/src/org/aspectj/testing/run/RunListeners.java b/testing/src/main/java/org/aspectj/testing/run/RunListeners.java similarity index 100% rename from testing/src/org/aspectj/testing/run/RunListeners.java rename to testing/src/main/java/org/aspectj/testing/run/RunListeners.java diff --git a/testing/src/org/aspectj/testing/run/RunStatus.java b/testing/src/main/java/org/aspectj/testing/run/RunStatus.java similarity index 100% rename from testing/src/org/aspectj/testing/run/RunStatus.java rename to testing/src/main/java/org/aspectj/testing/run/RunStatus.java diff --git a/testing/src/org/aspectj/testing/run/RunValidator.java b/testing/src/main/java/org/aspectj/testing/run/RunValidator.java similarity index 100% rename from testing/src/org/aspectj/testing/run/RunValidator.java rename to testing/src/main/java/org/aspectj/testing/run/RunValidator.java diff --git a/testing/src/org/aspectj/testing/run/Runner.java b/testing/src/main/java/org/aspectj/testing/run/Runner.java similarity index 100% rename from testing/src/org/aspectj/testing/run/Runner.java rename to testing/src/main/java/org/aspectj/testing/run/Runner.java diff --git a/testing/src/org/aspectj/testing/run/WrappedRunIterator.java b/testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java similarity index 100% rename from testing/src/org/aspectj/testing/run/WrappedRunIterator.java rename to testing/src/main/java/org/aspectj/testing/run/WrappedRunIterator.java diff --git a/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java similarity index 100% rename from testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java rename to testing/src/main/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java diff --git a/testing/src/org/aspectj/testing/util/AccumulatingFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java similarity index 100% rename from testing/src/org/aspectj/testing/util/AccumulatingFileFilter.java rename to testing/src/main/java/org/aspectj/testing/util/AccumulatingFileFilter.java diff --git a/testing/src/org/aspectj/testing/util/BridgeUtil.java b/testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java similarity index 100% rename from testing/src/org/aspectj/testing/util/BridgeUtil.java rename to testing/src/main/java/org/aspectj/testing/util/BridgeUtil.java diff --git a/testing/src/org/aspectj/testing/util/CollectorFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java similarity index 100% rename from testing/src/org/aspectj/testing/util/CollectorFileFilter.java rename to testing/src/main/java/org/aspectj/testing/util/CollectorFileFilter.java diff --git a/testing/src/org/aspectj/testing/util/Diffs.java b/testing/src/main/java/org/aspectj/testing/util/Diffs.java similarity index 100% rename from testing/src/org/aspectj/testing/util/Diffs.java rename to testing/src/main/java/org/aspectj/testing/util/Diffs.java diff --git a/testing/src/org/aspectj/testing/util/FileUtil.java b/testing/src/main/java/org/aspectj/testing/util/FileUtil.java similarity index 100% rename from testing/src/org/aspectj/testing/util/FileUtil.java rename to testing/src/main/java/org/aspectj/testing/util/FileUtil.java diff --git a/testing/src/org/aspectj/testing/util/IntRange.java b/testing/src/main/java/org/aspectj/testing/util/IntRange.java similarity index 100% rename from testing/src/org/aspectj/testing/util/IntRange.java rename to testing/src/main/java/org/aspectj/testing/util/IntRange.java diff --git a/testing/src/org/aspectj/testing/util/IntValidator.java b/testing/src/main/java/org/aspectj/testing/util/IntValidator.java similarity index 100% rename from testing/src/org/aspectj/testing/util/IntValidator.java rename to testing/src/main/java/org/aspectj/testing/util/IntValidator.java diff --git a/testing/src/org/aspectj/testing/util/IteratorWrapper.java b/testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java similarity index 100% rename from testing/src/org/aspectj/testing/util/IteratorWrapper.java rename to testing/src/main/java/org/aspectj/testing/util/IteratorWrapper.java diff --git a/testing/src/org/aspectj/testing/util/LangUtil.java b/testing/src/main/java/org/aspectj/testing/util/LangUtil.java similarity index 100% rename from testing/src/org/aspectj/testing/util/LangUtil.java rename to testing/src/main/java/org/aspectj/testing/util/LangUtil.java diff --git a/testing/src/org/aspectj/testing/util/LineReader.java b/testing/src/main/java/org/aspectj/testing/util/LineReader.java similarity index 100% rename from testing/src/org/aspectj/testing/util/LineReader.java rename to testing/src/main/java/org/aspectj/testing/util/LineReader.java diff --git a/testing/src/org/aspectj/testing/util/LinkCheck.java b/testing/src/main/java/org/aspectj/testing/util/LinkCheck.java similarity index 100% rename from testing/src/org/aspectj/testing/util/LinkCheck.java rename to testing/src/main/java/org/aspectj/testing/util/LinkCheck.java diff --git a/testing/src/org/aspectj/testing/util/Node.java b/testing/src/main/java/org/aspectj/testing/util/Node.java similarity index 100% rename from testing/src/org/aspectj/testing/util/Node.java rename to testing/src/main/java/org/aspectj/testing/util/Node.java diff --git a/testing/src/org/aspectj/testing/util/NullPrintStream.java b/testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java similarity index 100% rename from testing/src/org/aspectj/testing/util/NullPrintStream.java rename to testing/src/main/java/org/aspectj/testing/util/NullPrintStream.java diff --git a/testing/src/org/aspectj/testing/util/ObjectChecker.java b/testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java similarity index 100% rename from testing/src/org/aspectj/testing/util/ObjectChecker.java rename to testing/src/main/java/org/aspectj/testing/util/ObjectChecker.java diff --git a/testing/src/org/aspectj/testing/util/ProxyPrintStream.java b/testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java similarity index 100% rename from testing/src/org/aspectj/testing/util/ProxyPrintStream.java rename to testing/src/main/java/org/aspectj/testing/util/ProxyPrintStream.java diff --git a/testing/src/org/aspectj/testing/util/RunUtils.java b/testing/src/main/java/org/aspectj/testing/util/RunUtils.java similarity index 100% rename from testing/src/org/aspectj/testing/util/RunUtils.java rename to testing/src/main/java/org/aspectj/testing/util/RunUtils.java diff --git a/testing/src/org/aspectj/testing/util/SFileReader.java b/testing/src/main/java/org/aspectj/testing/util/SFileReader.java similarity index 100% rename from testing/src/org/aspectj/testing/util/SFileReader.java rename to testing/src/main/java/org/aspectj/testing/util/SFileReader.java diff --git a/testing/src/org/aspectj/testing/util/StandardObjectChecker.java b/testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StandardObjectChecker.java rename to testing/src/main/java/org/aspectj/testing/util/StandardObjectChecker.java diff --git a/testing/src/org/aspectj/testing/util/StreamSniffer.java b/testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StreamSniffer.java rename to testing/src/main/java/org/aspectj/testing/util/StreamSniffer.java diff --git a/testing/src/org/aspectj/testing/util/StreamsHandler.java b/testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StreamsHandler.java rename to testing/src/main/java/org/aspectj/testing/util/StreamsHandler.java diff --git a/testing/src/org/aspectj/testing/util/StringAccumulator.java b/testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StringAccumulator.java rename to testing/src/main/java/org/aspectj/testing/util/StringAccumulator.java diff --git a/testing/src/org/aspectj/testing/util/StringVisitor.java b/testing/src/main/java/org/aspectj/testing/util/StringVisitor.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StringVisitor.java rename to testing/src/main/java/org/aspectj/testing/util/StringVisitor.java diff --git a/testing/src/org/aspectj/testing/util/StructureModelUtil.java b/testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java similarity index 100% rename from testing/src/org/aspectj/testing/util/StructureModelUtil.java rename to testing/src/main/java/org/aspectj/testing/util/StructureModelUtil.java diff --git a/testing/src/org/aspectj/testing/util/TestClassLoader.java b/testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java similarity index 100% rename from testing/src/org/aspectj/testing/util/TestClassLoader.java rename to testing/src/main/java/org/aspectj/testing/util/TestClassLoader.java diff --git a/testing/src/org/aspectj/testing/util/TestDiffs.java b/testing/src/main/java/org/aspectj/testing/util/TestDiffs.java similarity index 100% rename from testing/src/org/aspectj/testing/util/TestDiffs.java rename to testing/src/main/java/org/aspectj/testing/util/TestDiffs.java diff --git a/testing/src/org/aspectj/testing/util/UtilLineReader.java b/testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java similarity index 100% rename from testing/src/org/aspectj/testing/util/UtilLineReader.java rename to testing/src/main/java/org/aspectj/testing/util/UtilLineReader.java diff --git a/testing/src/org/aspectj/testing/util/ValidFileFilter.java b/testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java similarity index 100% rename from testing/src/org/aspectj/testing/util/ValidFileFilter.java rename to testing/src/main/java/org/aspectj/testing/util/ValidFileFilter.java diff --git a/testing/src/org/aspectj/testing/util/WebInstall.java b/testing/src/main/java/org/aspectj/testing/util/WebInstall.java similarity index 100% rename from testing/src/org/aspectj/testing/util/WebInstall.java rename to testing/src/main/java/org/aspectj/testing/util/WebInstall.java diff --git a/testing/src/org/aspectj/testing/util/options/Option.java b/testing/src/main/java/org/aspectj/testing/util/options/Option.java similarity index 100% rename from testing/src/org/aspectj/testing/util/options/Option.java rename to testing/src/main/java/org/aspectj/testing/util/options/Option.java diff --git a/testing/src/org/aspectj/testing/util/options/Options.java b/testing/src/main/java/org/aspectj/testing/util/options/Options.java similarity index 100% rename from testing/src/org/aspectj/testing/util/options/Options.java rename to testing/src/main/java/org/aspectj/testing/util/options/Options.java diff --git a/testing/src/org/aspectj/testing/util/options/Values.java b/testing/src/main/java/org/aspectj/testing/util/options/Values.java similarity index 100% rename from testing/src/org/aspectj/testing/util/options/Values.java rename to testing/src/main/java/org/aspectj/testing/util/options/Values.java diff --git a/testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java b/testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/AjcSpecXmlReader.java rename to testing/src/main/java/org/aspectj/testing/xml/AjcSpecXmlReader.java diff --git a/testing/src/org/aspectj/testing/xml/IXmlWritable.java b/testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/IXmlWritable.java rename to testing/src/main/java/org/aspectj/testing/xml/IXmlWritable.java diff --git a/testing/src/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/MessageListXmlReader.java rename to testing/src/main/java/org/aspectj/testing/xml/MessageListXmlReader.java diff --git a/testing/src/org/aspectj/testing/xml/SoftMessage.java b/testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/SoftMessage.java rename to testing/src/main/java/org/aspectj/testing/xml/SoftMessage.java diff --git a/testing/src/org/aspectj/testing/xml/SoftSourceLocation.java b/testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/SoftSourceLocation.java rename to testing/src/main/java/org/aspectj/testing/xml/SoftSourceLocation.java diff --git a/testing/src/org/aspectj/testing/xml/XMLWriter.java b/testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java similarity index 100% rename from testing/src/org/aspectj/testing/xml/XMLWriter.java rename to testing/src/main/java/org/aspectj/testing/xml/XMLWriter.java diff --git a/testing/testsrc/org/aspectj/testing/TestingModuleTests.java b/testing/src/test/java/org/aspectj/testing/TestingModuleTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/TestingModuleTests.java rename to testing/src/test/java/org/aspectj/testing/TestingModuleTests.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/AbstractRunSpecTest.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/AjcSpecTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/CompilerRunTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunTest.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/DirChangesTest.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/ParseTestCase.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/ParseTestCase.java diff --git a/testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/harness/bridge/TestingBridgeTests.java rename to testing/src/test/java/org/aspectj/testing/harness/bridge/TestingBridgeTests.java diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java rename to testing/src/test/java/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java b/testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/taskdefs/TaskdefTests.java rename to testing/src/test/java/org/aspectj/testing/taskdefs/TaskdefTests.java diff --git a/testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/BridgeUtilTest.java rename to testing/src/test/java/org/aspectj/testing/util/BridgeUtilTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/FileUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/FileUtilTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/FileUtilTest.java rename to testing/src/test/java/org/aspectj/testing/util/FileUtilTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/IteratorWrapperTest.java b/testing/src/test/java/org/aspectj/testing/util/IteratorWrapperTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/IteratorWrapperTest.java rename to testing/src/test/java/org/aspectj/testing/util/IteratorWrapperTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/LangUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/LangUtilTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/LangUtilTest.java rename to testing/src/test/java/org/aspectj/testing/util/LangUtilTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/MessageUtilTest.java rename to testing/src/test/java/org/aspectj/testing/util/MessageUtilTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/StreamGrabberTest.java b/testing/src/test/java/org/aspectj/testing/util/StreamGrabberTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/StreamGrabberTest.java rename to testing/src/test/java/org/aspectj/testing/util/StreamGrabberTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/StructureModelUtilTest.java b/testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/StructureModelUtilTest.java rename to testing/src/test/java/org/aspectj/testing/util/StructureModelUtilTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java b/testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/TestDiffsTest.java rename to testing/src/test/java/org/aspectj/testing/util/TestDiffsTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/UtilTests.java b/testing/src/test/java/org/aspectj/testing/util/UtilTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/UtilTests.java rename to testing/src/test/java/org/aspectj/testing/util/UtilTests.java diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/options/OptionChecker.java rename to testing/src/test/java/org/aspectj/testing/util/options/OptionChecker.java diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/options/OptionsTest.java rename to testing/src/test/java/org/aspectj/testing/util/options/OptionsTest.java diff --git a/testing/testsrc/org/aspectj/testing/util/options/OptionsTests.java b/testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/options/OptionsTests.java rename to testing/src/test/java/org/aspectj/testing/util/options/OptionsTests.java diff --git a/testing/testsrc/org/aspectj/testing/util/options/ValuesTest.java b/testing/src/test/java/org/aspectj/testing/util/options/ValuesTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/util/options/ValuesTest.java rename to testing/src/test/java/org/aspectj/testing/util/options/ValuesTest.java diff --git a/testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java rename to testing/src/test/java/org/aspectj/testing/xml/AjcSpecXmlReaderTest.java diff --git a/testing/testsrc/org/aspectj/testing/xml/MessageListXmlReaderTest.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/xml/MessageListXmlReaderTest.java rename to testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReaderTest.java diff --git a/testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java b/testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/xml/TestingXmlTests.java rename to testing/src/test/java/org/aspectj/testing/xml/TestingXmlTests.java diff --git a/testing/testsrc/org/aspectj/testing/xml/XMLWriterTest.java b/testing/src/test/java/org/aspectj/testing/xml/XMLWriterTest.java similarity index 100% rename from testing/testsrc/org/aspectj/testing/xml/XMLWriterTest.java rename to testing/src/test/java/org/aspectj/testing/xml/XMLWriterTest.java -- 2.39.5