diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/IfTest.java b/proposal/myrmidon/src/test/org/apache/antlib/core/test/IfTestCase.java similarity index 92% rename from proposal/myrmidon/src/test/org/apache/antlib/core/IfTest.java rename to proposal/myrmidon/src/test/org/apache/antlib/core/test/IfTestCase.java index 932fc89d9..b71d5fd4d 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/core/IfTest.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/IfTestCase.java @@ -5,10 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import java.io.File; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractProjectTest; import org.apache.myrmidon.LogMessageTracker; @@ -19,13 +18,12 @@ import org.apache.myrmidon.LogMessageTracker; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class IfTest +public class IfTestCase extends AbstractProjectTest { - private final static Resources REZ = - ResourceManager.getPackageResources( IfTest.class ); + private final static Resources REZ = getResourcesForTested( IfTestCase.class ); - public IfTest( String name ) + public IfTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestCase.java similarity index 91% rename from proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java rename to proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestCase.java index b53426441..b4f43f075 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTest.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import java.io.File; import org.apache.avalon.excalibur.i18n.ResourceManager; @@ -20,13 +20,12 @@ import org.apache.myrmidon.components.workspace.DefaultTaskContext; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class PropertyTest +public class PropertyTestCase extends AbstractProjectTest { - private final static Resources REZ - = ResourceManager.getPackageResources( PropertyTest.class ); + private final static Resources REZ = getResourcesForTested( PropertyTestCase.class ); - public PropertyTest( final String name ) + public PropertyTestCase( final String name ) { super( name ); } @@ -66,10 +65,10 @@ public class PropertyTest // Missing name String[] messages = - { - null, - REZ.getString( "property.no-name.error" ) - }; + { + null, + REZ.getString( "property.no-name.error" ) + }; executeTargetExpectError( projectFile, "missing-name", messages ); // Missing value diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTestType.java b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java similarity index 95% rename from proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTestType.java rename to proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java index bc7fa37d1..c146a77df 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTestType.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/PropertyTestType.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import org.apache.myrmidon.framework.DataType; diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/test/if.ant b/proposal/myrmidon/src/test/org/apache/antlib/core/test/if.ant new file mode 100644 index 000000000..b3caca2af --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/if.ant @@ -0,0 +1,63 @@ + + + + + test-prop is set + + + test-prop is not set + + + + + + + test-prop is set + + + test-prop is not set + + + + + + test-prop is set + + + test-prop is not set + + + + + + + test-prop is set + + + test-prop is not set + + + + + + + task 1 + task 2 + task 3 + task 4 + + + + + + no go + + + + + + no go + + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/test/property.ant b/proposal/myrmidon/src/test/org/apache/antlib/core/test/property.ant new file mode 100644 index 000000000..03cad74a0 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/antlib/core/test/property.ant @@ -0,0 +1,65 @@ + + + + + + test-prop = [${test-prop}] + + + + + some value + test-prop2 = [${test-prop2}] + + + + + + + + test-prop3 = [${test-prop3}] + + + + + + + + + + + + + + + another value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java similarity index 86% rename from proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java rename to proposal/myrmidon/src/test/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java index 5be210545..ad84a0219 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/CopyFilesTaskTest.java +++ b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.vfile; +package org.apache.antlib.vfile.test; import java.io.File; import org.apache.myrmidon.AbstractProjectTest; @@ -16,10 +16,10 @@ import org.apache.myrmidon.AbstractProjectTest; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class CopyFilesTaskTest +public class CopyFilesTaskTestCase extends AbstractProjectTest { - public CopyFilesTaskTest( String name ) + public CopyFilesTaskTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/copy.ant b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/copy.ant new file mode 100644 index 000000000..18ea5067c --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/copy.ant @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/emptyFile.txt b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/emptyFile.txt new file mode 100644 index 000000000..e69de29bb diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/file1.txt b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/file1.txt new file mode 100644 index 000000000..9ad7b1b57 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/file1.txt @@ -0,0 +1 @@ +A test file. \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/subdir1/someFile.html b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/subdir1/someFile.html new file mode 100644 index 000000000..c769030c0 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/antlib/vfile/test/src/subdir1/someFile.html @@ -0,0 +1,5 @@ + + +

Yo!

+ + diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/BzipTest.java b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/BzipTestCase.java similarity index 95% rename from proposal/myrmidon/src/testcases/org/apache/aut/bzip2/BzipTest.java rename to proposal/myrmidon/src/test/org/apache/aut/bzip2/test/BzipTestCase.java index 3820e79fa..2bd65da42 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/BzipTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/BzipTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.bzip2; +package org.apache.aut.bzip2.test; import java.io.File; import java.io.FileInputStream; @@ -16,6 +16,8 @@ import java.io.OutputStream; import junit.framework.TestCase; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.aut.bzip2.CBZip2OutputStream; +import org.apache.aut.bzip2.CBZip2InputStream; /** * A test the stress tested the BZip implementation to verify @@ -24,12 +26,12 @@ import org.apache.avalon.excalibur.io.IOUtil; * @author Peter Donald * @version $Revision$ $Date$ */ -public class BzipTest +public class BzipTestCase extends TestCase { private final static byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'}; - public BzipTest( final String name ) + public BzipTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar new file mode 100644 index 000000000..3f9260978 Binary files /dev/null and b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar differ diff --git a/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 new file mode 100644 index 000000000..7c2d2154a Binary files /dev/null and b/proposal/myrmidon/src/test/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 differ diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java similarity index 98% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java index a8e69346c..61dc091ff 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -16,6 +16,12 @@ import java.util.List; import java.util.Map; import org.apache.aut.vfs.impl.DefaultFileSystemManager; import org.apache.aut.vfs.provider.AbstractFileObject; +import org.apache.aut.vfs.FileObject; +import org.apache.aut.vfs.FileType; +import org.apache.aut.vfs.FileSystemException; +import org.apache.aut.vfs.FileName; +import org.apache.aut.vfs.NameScope; +import org.apache.aut.vfs.FileContent; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -29,7 +35,7 @@ import org.apache.myrmidon.AbstractMyrmidonTest; * * @author Adam Murdoch */ -public abstract class AbstractFileSystemTest +public abstract class AbstractFileSystemTestCase extends AbstractMyrmidonTest { private final static Resources REZ @@ -41,7 +47,7 @@ public abstract class AbstractFileSystemTest // Contents of "file1.txt" private String m_charContent; - public AbstractFileSystemTest( String name ) + public AbstractFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java similarity index 65% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java index 18f02c9d2..b415a6565 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; + +import org.apache.aut.vfs.test.AbstractFileSystemTestCase; /** * File system tests which check that a read-only file system cannot be @@ -13,9 +15,9 @@ package org.apache.aut.vfs; * * @author Adam Murdoch */ -public abstract class AbstractReadOnlyFileSystemTest extends AbstractFileSystemTest +public abstract class AbstractReadOnlyFileSystemTestCase extends AbstractFileSystemTestCase { - public AbstractReadOnlyFileSystemTest( String name ) + public AbstractReadOnlyFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java similarity index 95% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java index ad57831aa..06a73c132 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java @@ -5,21 +5,25 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.OutputStream; import java.util.HashSet; import java.util.Set; +import org.apache.aut.vfs.test.AbstractFileSystemTestCase; +import org.apache.aut.vfs.FileObject; +import org.apache.aut.vfs.FileType; +import org.apache.aut.vfs.FileSystemException; /** * File system test that check that a file system can be modified. * * @author Adam Murdoch */ -public abstract class AbstractWritableFileSystemTest - extends AbstractFileSystemTest +public abstract class AbstractWritableFileSystemTestCase + extends AbstractFileSystemTestCase { - public AbstractWritableFileSystemTest( String name ) + public AbstractWritableFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/FtpFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/FtpFileSystemTestCase.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/FtpFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/FtpFileSystemTestCase.java index 56a344802..0788c6eed 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/FtpFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/FtpFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.ftp.FtpFileSystemProvider; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for FTP file systems. * * @author Adam Murdoch */ -public class FtpFileSystemTest - extends AbstractWritableFileSystemTest +public class FtpFileSystemTestCase + extends AbstractWritableFileSystemTestCase { - public FtpFileSystemTest( String name ) + public FtpFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/LocalFileSystemTestCase.java similarity index 84% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/LocalFileSystemTestCase.java index e0218041e..540ec36f6 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/LocalFileSystemTestCase.java @@ -5,18 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.File; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the local file system. * * @author Adam Murdoch */ -public class LocalFileSystemTest extends AbstractWritableFileSystemTest +public class LocalFileSystemTestCase extends AbstractWritableFileSystemTestCase { - public LocalFileSystemTest( String name ) + public LocalFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/NestedZipFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/NestedZipFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java index b5523a688..652dcf5b9 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/NestedZipFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; +import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the Zip file system, using a zip file nested inside another zip file. * * @author Adam Murdoch */ -public class NestedZipFileSystemTest - extends AbstractReadOnlyFileSystemTest +public class NestedZipFileSystemTestCase + extends AbstractReadOnlyFileSystemTestCase { - public NestedZipFileSystemTest( String name ) + public NestedZipFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/SmbFileSystemTestCase.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/SmbFileSystemTestCase.java index c3ff819e7..bf0402376 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/SmbFileSystemTestCase.java @@ -5,18 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.smb.SmbFileSystemProvider; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the SMB file system. * * @author Adam Murdoch */ -public class SmbFileSystemTest extends AbstractWritableFileSystemTest +public class SmbFileSystemTestCase extends AbstractWritableFileSystemTestCase { - public SmbFileSystemTest( String name ) + public SmbFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/ZipFileSystemTestCase.java similarity index 76% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/test/ZipFileSystemTestCase.java index 4c8b4af38..ded939ef6 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/test/ZipFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.File; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; +import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the Zip file system. * * @author Adam Murdoch */ -public class ZipFileSystemTest extends AbstractReadOnlyFileSystemTest +public class ZipFileSystemTestCase extends AbstractReadOnlyFileSystemTestCase { - public ZipFileSystemTest( String name ) + public ZipFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/AsiExtraFieldTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java similarity index 96% rename from proposal/myrmidon/src/test/org/apache/aut/zip/AsiExtraFieldTest.java rename to proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java index 246ca1b76..2337f3feb 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/AsiExtraFieldTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/test/AsiExtraFieldTestCase.java @@ -5,21 +5,23 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import java.util.zip.ZipException; import junit.framework.TestCase; +import org.apache.aut.zip.UnixStat; +import org.apache.aut.zip.AsiExtraField; /** * JUnit testcases AsiExtraField. * * @author Stefan Bodewig */ -public class AsiExtraFieldTest +public class AsiExtraFieldTestCase extends TestCase implements UnixStat { - public AsiExtraFieldTest( final String name ) + public AsiExtraFieldTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/ExtraFieldUtilsTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java similarity index 91% rename from proposal/myrmidon/src/test/org/apache/aut/zip/ExtraFieldUtilsTest.java rename to proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java index 6e2be5d4d..7f4a73e6c 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/ExtraFieldUtilsTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java @@ -5,16 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.UnixStat; +import org.apache.aut.zip.AsiExtraField; +import org.apache.aut.zip.UnrecognizedExtraField; +import org.apache.aut.zip.ZipShort; +import org.apache.aut.zip.ZipExtraField; +import org.apache.aut.zip.ExtraFieldUtils; /** * JUnit testcases ExtraFieldUtils. * * @author Stefan Bodewig */ -public class ExtraFieldUtilsTest +public class ExtraFieldUtilsTestCase extends TestCase implements UnixStat { @@ -23,7 +29,7 @@ public class ExtraFieldUtilsTest private byte[] m_data; private byte[] m_local; - public ExtraFieldUtilsTest( final String name ) + public ExtraFieldUtilsTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java similarity index 90% rename from proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java rename to proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java index 24e919ee0..df87812f4 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipEntryTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipEntryTestCase.java @@ -5,20 +5,25 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import java.util.NoSuchElementException; import junit.framework.TestCase; +import org.apache.aut.zip.AsiExtraField; +import org.apache.aut.zip.UnrecognizedExtraField; +import org.apache.aut.zip.ZipEntry; +import org.apache.aut.zip.ZipExtraField; +import org.apache.aut.zip.ZipShort; /** * JUnit testcases ZipEntry. * * @author Stefan Bodewig */ -public class ZipEntryTest +public class ZipEntryTestCase extends TestCase { - public ZipEntryTest( final String name ) + public ZipEntryTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipLongTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java similarity index 94% rename from proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipLongTest.java rename to proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java index e73f02d53..501b5f491 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipLongTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipLongTestCase.java @@ -5,20 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.ZipLong; /** * JUnit 3 testcases for org.apache.tools.zip.ZipLong. * * @author Stefan Bodewig */ -public class ZipLongTest +public class ZipLongTestCase extends TestCase { - public ZipLongTest( final String name ) + public ZipLongTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipShortTest.java b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/aut/zip/ZipShortTest.java rename to proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java index ba9c459fb..7e45b1d48 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipShortTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/zip/test/ZipShortTestCase.java @@ -5,19 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.ZipShort; /** * JUnit 3 testcases for org.apache.tools.zip.ZipShort. * * @author Stefan Bodewig */ -public class ZipShortTest +public class ZipShortTestCase extends TestCase { - public ZipShortTest( String name ) + public ZipShortTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java index b9b0d3689..fbef96e5a 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/AbstractMyrmidonTest.java @@ -10,6 +10,8 @@ package org.apache.myrmidon; import java.io.File; import java.io.IOException; import junit.framework.TestCase; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.logger.Logger; import org.apache.myrmidon.frontends.BasicLogger; @@ -27,6 +29,36 @@ public abstract class AbstractMyrmidonTest private final File m_baseDir; private Logger m_logger; + protected static final Resources getResourcesForTested( final Class clazz ) + { + final Package pkg = clazz.getPackage(); + + String baseName; + if( null == pkg ) + { + final String name = clazz.getName(); + if( -1 == name.lastIndexOf( "." ) ) + { + baseName = ""; + } + else + { + baseName = name.substring( 0, name.lastIndexOf( "." ) ); + } + } + else + { + baseName = pkg.getName(); + } + + if( baseName.endsWith( ".test" ) ) + { + baseName = baseName.substring( 0, baseName.length() - 5 ); + } + + return ResourceManager.getBaseResources( baseName + ".Resources", AbstractMyrmidonTest.class.getClassLoader() ); + } + public AbstractMyrmidonTest( String name ) { super( name ); @@ -162,7 +194,7 @@ public abstract class AbstractMyrmidonTest */ protected void assertSameMessage( final String message, final Throwable throwable ) { - assertSameMessage( new String[] { message }, throwable ); + assertSameMessage( new String[]{message}, throwable ); } /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java similarity index 95% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java index 00c706cca..af901c97d 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.builder; +package org.apache.myrmidon.components.builder.test; import java.io.File; import java.util.Arrays; @@ -13,24 +13,25 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.builder.DefaultProjectBuilder; +import org.apache.myrmidon.components.builder.DefaultProject; import org.apache.myrmidon.interfaces.builder.ProjectException; import org.apache.myrmidon.interfaces.model.Project; /** - * Test cases for {@link DefaultProjectBuilder}. + * Test cases for {@link org.apache.myrmidon.components.builder.DefaultProjectBuilder}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultProjectBuilderTest +public class DefaultProjectBuilderTestCase extends AbstractMyrmidonTest { - private final static Resources REZ - = ResourceManager.getPackageResources( DefaultProjectBuilderTest.class ); + private final static Resources REZ = getResourcesForTested( DefaultProjectBuilderTestCase.class ); private DefaultProjectBuilder m_builder; - public DefaultProjectBuilderTest( String name ) + public DefaultProjectBuilderTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-project-name.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-project-name.ant new file mode 100644 index 000000000..7b0ed6f75 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-project-name.ant @@ -0,0 +1,4 @@ + + + + diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-target-name.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-target-name.ant new file mode 100644 index 000000000..8c7186956 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-target-name.ant @@ -0,0 +1,5 @@ + + + + + diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-version.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-version.ant new file mode 100644 index 000000000..922f14aee --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-xml.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-xml.ant new file mode 100644 index 000000000..91717fd16 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/bad-xml.ant @@ -0,0 +1 @@ +this ain't xml. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/defaults.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/defaults.ant new file mode 100644 index 000000000..b36a5c7ce --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/defaults.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/mismatched-version.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/mismatched-version.ant new file mode 100644 index 000000000..b9176c9c0 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/mismatched-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/no-version.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/no-version.ant new file mode 100644 index 000000000..d1979fedf --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/no-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-base-dir.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-base-dir.ant new file mode 100644 index 000000000..56fe72aa4 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-base-dir.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-default-target.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-default-target.ant new file mode 100644 index 000000000..f83f3bbeb --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-default-target.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-project-name.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-project-name.ant new file mode 100644 index 000000000..a8ae1a941 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/builder/test/set-project-name.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java similarity index 87% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java index 9f3898fde..4a1d5d628 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java @@ -5,14 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; /** - * Simple class to test {@link Configurable}. + * Simple class to test {@link org.apache.avalon.framework.configuration.Configurable}. * * @author Peter Donald * @version $Revision$ $Date$ diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java similarity index 92% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java index fedc0cde3..d814cda09 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java @@ -5,40 +5,39 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import java.io.File; import org.apache.antlib.core.StringToIntegerConverter; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.components.AbstractComponentTest; -import org.apache.myrmidon.components.configurer.data.ConfigTestAttributeConvert; -import org.apache.myrmidon.components.configurer.data.ConfigTestConfigAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestContent; -import org.apache.myrmidon.components.configurer.data.ConfigTestEmpty; -import org.apache.myrmidon.components.configurer.data.ConfigTestIdResolve; -import org.apache.myrmidon.components.configurer.data.ConfigTestIgnoreStringMethods; -import org.apache.myrmidon.components.configurer.data.ConfigTestInterfaceAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestMismatchedRefType; -import org.apache.myrmidon.components.configurer.data.ConfigTestMultipleTypedAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestNestedErrors; -import org.apache.myrmidon.components.configurer.data.ConfigTestNonInterfaceAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestPropResolution; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceAttribute; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceConversion; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceElement; -import org.apache.myrmidon.components.configurer.data.ConfigTestSetAttribute; -import org.apache.myrmidon.components.configurer.data.ConfigTestSetElement; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderConversion; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderReference; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderRole; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedConfigAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestUnknownReference; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestAttributeConvert; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestConfigAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestContent; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestEmpty; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestIdResolve; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestIgnoreStringMethods; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestInterfaceAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestMismatchedRefType; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestMultipleTypedAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestNestedErrors; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestNonInterfaceAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestPropResolution; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceAttribute; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceConversion; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceElement; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestSetAttribute; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestSetElement; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderConversion; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderReference; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderRole; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedConfigAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestUnknownReference; import org.apache.myrmidon.components.workspace.DefaultTaskContext; import org.apache.myrmidon.framework.DataType; import org.apache.myrmidon.interfaces.configurer.Configurer; @@ -49,16 +48,16 @@ import org.apache.myrmidon.interfaces.role.RoleInfo; * * @author Adam Murdoch */ -public class DefaultConfigurerTest +public class DefaultConfigurerTestCase extends AbstractComponentTest { private final static Resources REZ = - ResourceManager.getPackageResources( DefaultConfigurerTest.class ); + getResourcesForTested( DefaultConfigurerTestCase.class ); private Configurer m_configurer; private DefaultTaskContext m_context; - public DefaultConfigurerTest( String name ) + public DefaultConfigurerTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1.java similarity index 90% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1.java index f62943b3c..c7dc8ae9e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.myrmidon.framework.DataType; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java similarity index 87% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java index a683499d3..4c8f448d7 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java @@ -5,9 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Adapts an Object to MyRole diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole2.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole2.java similarity index 88% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole2.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole2.java index 0b061d8b4..e21a3ee95 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole2.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyRole2.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; /** * A basic interface to test configurer. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType1.java similarity index 82% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType1.java index ee40c9eae..a0b6b7b70 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType1.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; + +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A basic implementation of MyRole1 to test configurer. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType2.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType2.java similarity index 82% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType2.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType2.java index c573feff1..a605ddeed 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyType2.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/MyType2.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; + +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A basic implementation of MyRole1 to test configurer. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java similarity index 81% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java index 34934097c..06d74ea6e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java @@ -5,10 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; +import org.apache.myrmidon.components.configurer.test.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1Adaptor; /** * Converts from Object to MyRole1. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java similarity index 94% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java index 6830561d2..840e6d43c 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import org.apache.myrmidon.components.AbstractComponentTest; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java index 54136d96f..1568b4f28 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java index 1d28ef88f..0ab4e74c8 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. @@ -25,7 +25,7 @@ public class ConfigTestContent public boolean equals( final Object obj ) { final ConfigTestContent test = (ConfigTestContent)obj; - if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) + if( !DefaultConfigurerTestCase.equals( m_content, test.m_content ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java similarity index 89% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java index 00c5f2a8f..b39612392 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java index 0de5265df..22fe5d770 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. @@ -25,7 +25,7 @@ public class ConfigTestIdResolve public boolean equals( final Object obj ) { final ConfigTestIdResolve test = (ConfigTestIdResolve)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java similarity index 86% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java index a8afb0a49..369649b7c 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import junit.framework.AssertionFailedError; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A test class with multiple setters/adders/creators for a property. @@ -24,7 +24,7 @@ public class ConfigTestIgnoreStringMethods public boolean equals( Object obj ) { ConfigTestIgnoreStringMethods test = (ConfigTestIgnoreStringMethods)obj; - if( !DefaultConfigurerTest.equals( m_prop1, test.m_prop1 ) ) + if( !DefaultConfigurerTestCase.equals( m_prop1, test.m_prop1 ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java similarity index 86% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java index 48c15109e..e622b15af 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A test class with an interface property. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java index a00b94df8..940465036 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java similarity index 75% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java index c70b8e479..256aed403 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; -import org.apache.myrmidon.components.configurer.MyRole1; -import org.apache.myrmidon.components.configurer.MyRole2; +import org.apache.myrmidon.components.configurer.test.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole2; /** * Simple class with more than one typed adder method. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java similarity index 87% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java index ce1c04bac..e6f14a6d4 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; /** * A simple test class. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java similarity index 91% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java index 45535c961..432dd4e82 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java index 6a9e44c56..48c729af0 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -24,7 +24,7 @@ public class ConfigTestPropResolution public boolean equals( final Object obj ) { final ConfigTestPropResolution test = (ConfigTestPropResolution)obj; - if( !DefaultConfigurerTest.equals( m_prop, test.m_prop ) ) + if( !DefaultConfigurerTestCase.equals( m_prop, test.m_prop ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java index 9ec47f727..5946cdcd7 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -24,7 +24,7 @@ public class ConfigTestReferenceAttribute public boolean equals( final Object obj ) { final ConfigTestReferenceAttribute test = (ConfigTestReferenceAttribute)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java similarity index 85% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java index 5d1055d9a..4862d3d78 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A simple test class. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java similarity index 76% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java index 4bbb9f893..d6d1cd007 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class. @@ -23,7 +23,7 @@ public class ConfigTestReferenceElement public boolean equals( Object obj ) { ConfigTestReferenceElement test = (ConfigTestReferenceElement)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java similarity index 83% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java index cf44c852f..0a76b998a 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -25,7 +25,7 @@ public class ConfigTestSetAttribute public boolean equals( final Object obj ) { final ConfigTestSetAttribute test = (ConfigTestSetAttribute)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java index bc7b503fc..704248b46 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class. @@ -25,7 +25,7 @@ public class ConfigTestSetElement public boolean equals( Object obj ) { ConfigTestSetElement test = (ConfigTestSetElement)obj; - if( !DefaultConfigurerTest.equals( m_prop, test.m_prop ) ) + if( !DefaultConfigurerTestCase.equals( m_prop, test.m_prop ) ) { return false; } @@ -33,7 +33,7 @@ public class ConfigTestSetElement { return false; } - else if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + else if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java similarity index 87% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java index 7e1a75333..4beafcdd6 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test adder for Configurations. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java similarity index 88% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java index b6a0cb9e8..0aeb29d9b 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; import org.apache.myrmidon.framework.DataType; /** diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java similarity index 86% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java index 20a9c403f..6ce6bc078 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java similarity index 86% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java index ed950288a..d8ac8d59e 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java index 790687fb8..2d7bcf02d 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java index 32d17784b..b27b04a8c 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java similarity index 97% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java index 485cd7da6..b47b5eb53 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import java.io.File; import org.apache.aut.converter.Converter; @@ -24,7 +24,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory; * * @author Adam Murdoch */ -public class DefaultDeployerTest +public class DefaultDeployerTestCase extends AbstractComponentTest { private static final String TEST_TYPE1_NAME = "test-type1"; @@ -32,7 +32,7 @@ public class DefaultDeployerTest private Deployer m_deployer; private Converter m_converter; - public DefaultDeployerTest( final String name ) + public DefaultDeployerTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestConverter1.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestConverter1.java index fc9abe6c3..af61edaa2 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestConverter1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import org.apache.aut.converter.Converter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestRole1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestRole1.java similarity index 89% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestRole1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestRole1.java index 93dc94f6d..60fc79166 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestRole1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestRole1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; /** * A test role interface. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestType1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestType1.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestType1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestType1.java index 444ea9e62..7cf53f163 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestType1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/TestType1.java @@ -5,9 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import org.apache.myrmidon.framework.DataType; +import org.apache.myrmidon.components.deployer.test.TestRole1; /** * A test data-type. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml new file mode 100644 index 000000000..43d07cd67 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-roles.xml b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-roles.xml new file mode 100644 index 000000000..86e6070ec --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/test/ant-roles.xml @@ -0,0 +1,4 @@ + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java similarity index 98% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java index 91289c5d1..20d971643 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.embeddor; +package org.apache.myrmidon.components.embeddor.test; import java.io.File; import org.apache.avalon.framework.parameters.Parameters; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/project-builder.ant b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/project-builder.ant new file mode 100644 index 000000000..7f52d2702 --- /dev/null +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/test/project-builder.ant @@ -0,0 +1,6 @@ + + + + A log message + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java index 9e79a0d2b..21aba6d3d 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java @@ -5,11 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import java.io.File; import java.util.Date; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -23,16 +22,15 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public abstract class AbstractPropertyResolverTest +public abstract class AbstractPropertyResolverTestCase extends AbstractMyrmidonTest { - protected final static Resources REZ - = ResourceManager.getPackageResources( AbstractPropertyResolverTest.class ); + protected final static Resources REZ = getResourcesForTested( AbstractPropertyResolverTestCase.class ); protected PropertyResolver m_resolver; protected DefaultTaskContext m_context; - public AbstractPropertyResolverTest( String name ) + public AbstractPropertyResolverTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java similarity index 66% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java index a0779291f..12eef075a 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java @@ -5,20 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; +import org.apache.myrmidon.components.property.ClassicPropertyResolver; /** - * A test for {@link ClassicPropertyResolver}. + * A test for {@link org.apache.myrmidon.components.property.ClassicPropertyResolver}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class ClassicPropertyResolverTest - extends AbstractPropertyResolverTest +public class ClassicPropertyResolverTestCase + extends AbstractPropertyResolverTestCase { - public ClassicPropertyResolverTest( String name ) + public ClassicPropertyResolverTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java similarity index 70% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java index 4d1f2198d..0183adea8 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java @@ -5,20 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; /** - * Functional tests for {@link DefaultPropertyResolver}. + * Functional tests for {@link org.apache.myrmidon.components.property.DefaultPropertyResolver}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultPropertyResolverTest - extends AbstractPropertyResolverTest +public class DefaultPropertyResolverTestCase + extends AbstractPropertyResolverTestCase { - public DefaultPropertyResolverTest( String name ) + public DefaultPropertyResolverTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java similarity index 94% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java index e2332b1ae..ba68eb68c 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java @@ -5,11 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.role; +package org.apache.myrmidon.components.role.test; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.role.DefaultRoleManager; import org.apache.myrmidon.api.Task; import org.apache.myrmidon.interfaces.role.RoleException; import org.apache.myrmidon.interfaces.role.RoleInfo; @@ -21,15 +22,14 @@ import org.apache.myrmidon.interfaces.role.RoleManager; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultRoleManagerTest +public class DefaultRoleManagerTestCase extends AbstractMyrmidonTest { - private final static Resources REZ - = ResourceManager.getPackageResources( DefaultRoleManagerTest.class ); + private final static Resources REZ = getResourcesForTested( DefaultRoleManagerTestCase.class ); private RoleManager m_roleManager; - public DefaultRoleManagerTest( String name ) + public DefaultRoleManagerTestCase( String name ) { super( name ); } @@ -70,7 +70,7 @@ public class DefaultRoleManagerTest assertNull( unknownRole ); // Lookup an unknown role - unknownRole = m_roleManager.getRoleByType( DefaultRoleManagerTest.class ); + unknownRole = m_roleManager.getRoleByType( DefaultRoleManagerTestCase.class ); assertNull( unknownRole ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java index 5f6464835..932978376 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java @@ -5,13 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.myrmidon.components.AbstractComponentTest; +import org.apache.myrmidon.components.service.InstantiatingServiceManager; import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.service.ServiceFactory; @@ -24,16 +25,15 @@ import org.apache.myrmidon.interfaces.type.TypeManager; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class InstantiatingServiceManagerTest +public class InstantiatingServiceManagerTestCase extends AbstractComponentTest { - private final static Resources REZ - = ResourceManager.getPackageResources( InstantiatingServiceManagerTest.class ); + private final static Resources REZ = getResourcesForTested( InstantiatingServiceManagerTestCase.class ); private InstantiatingServiceManager m_serviceManager; private Parameters m_parameters = new Parameters(); - public InstantiatingServiceManagerTest( final String name ) + public InstantiatingServiceManagerTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/LifecycleValidator.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java similarity index 97% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/LifecycleValidator.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java index 916f268cd..b95ac5ffe 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/LifecycleValidator.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/LifecycleValidator.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import junit.framework.Assert; import org.apache.avalon.framework.activity.Initializable; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestService.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestService.java similarity index 89% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestService.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestService.java index 4c0485a52..302c2a5b3 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestService.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestService.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; /** * A service interface. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory1.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory1.java index bccf1dd98..10e0f69bc 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.myrmidon.interfaces.service.AntServiceException; import org.apache.myrmidon.interfaces.service.ServiceFactory; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory2.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory2.java similarity index 88% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory2.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory2.java index 8cae19da6..524d3cc04 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceFactory2.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceFactory2.java @@ -5,10 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.myrmidon.interfaces.service.AntServiceException; import org.apache.myrmidon.interfaces.service.ServiceFactory; +import org.apache.myrmidon.components.service.test.LifecycleValidator; /** * A test service factory, which asserts that the factory has been properly diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl1.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl1.java index 69c393ab1..c22e4d0a7 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl1.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; + +import org.apache.myrmidon.components.service.test.TestService; /** * A test service implementation. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl2.java b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl2.java similarity index 75% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl2.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl2.java index d715cf6dc..933d76383 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl2.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/test/TestServiceImpl2.java @@ -5,7 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; + +import org.apache.myrmidon.components.service.test.LifecycleValidator; +import org.apache.myrmidon.components.service.test.TestService; /** * A test service that asserts it has been set-up correctly. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java similarity index 90% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java index 51d9710ec..ff3368e19 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java @@ -5,22 +5,23 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.model; +package org.apache.myrmidon.interfaces.model.test; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.interfaces.model.DefaultNameValidator; /** - * TestCases for {@link DefaultNameValidator}. + * TestCases for {@link org.apache.myrmidon.interfaces.model.DefaultNameValidator}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultNameValidatorTest +public class DefaultNameValidatorTestCase extends AbstractMyrmidonTest { private DefaultNameValidator m_validator = new DefaultNameValidator(); - public DefaultNameValidatorTest( String name ) + public DefaultNameValidatorTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType1.java b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType1.java similarity index 91% rename from proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType1.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType1.java index e64a7914c..226b9a3bb 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType1.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; /** * A basic implementation of a type to test the type factory. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType2.java b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType2.java similarity index 91% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType2.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType2.java index b652f6b84..a9418f1ae 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType2.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/MyType2.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; /** * A basic implementation of a type to test the type factory. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java similarity index 89% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java rename to proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java index a73626251..62ed33a88 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java +++ b/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java @@ -5,11 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; import java.io.File; import java.net.URL; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; +import org.apache.myrmidon.interfaces.type.ReloadingTypeFactory; +import org.apache.myrmidon.interfaces.type.TypeException; /** * These are unit tests that test the basic operation of TypeFactories. @@ -17,7 +20,7 @@ import org.apache.myrmidon.AbstractMyrmidonTest; * @author Peter Donald * @version $Revision$ $Date$ */ -public class TypeFactoryTest +public class TypeFactoryTestCase extends AbstractMyrmidonTest { private final static String TYPE_NAME1 = "my-type1"; @@ -27,7 +30,7 @@ public class TypeFactoryTest private final static String TYPE_CLASSNAME1 = TYPE_CLASS1.getName(); private final static String TYPE_CLASSNAME2 = TYPE_CLASS2.getName(); - public TypeFactoryTest( final String name ) + public TypeFactoryTestCase( final String name ) { super( name ); } @@ -62,7 +65,6 @@ public class TypeFactoryTest throws Exception { final File file = getTestResource( "types.jar" ); - final URL[] classpath = new URL[]{file.toURL()}; final ReloadingTypeFactory factory = new ReloadingTypeFactory( classpath, null ); factory.addNameClassMapping( TYPE_NAME1, TYPE_CLASSNAME1 ); diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/IfTest.java b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/IfTestCase.java similarity index 92% rename from proposal/myrmidon/src/testcases/org/apache/antlib/core/IfTest.java rename to proposal/myrmidon/src/testcases/org/apache/antlib/core/test/IfTestCase.java index 932fc89d9..b71d5fd4d 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/core/IfTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/IfTestCase.java @@ -5,10 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import java.io.File; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractProjectTest; import org.apache.myrmidon.LogMessageTracker; @@ -19,13 +18,12 @@ import org.apache.myrmidon.LogMessageTracker; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class IfTest +public class IfTestCase extends AbstractProjectTest { - private final static Resources REZ = - ResourceManager.getPackageResources( IfTest.class ); + private final static Resources REZ = getResourcesForTested( IfTestCase.class ); - public IfTest( String name ) + public IfTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestCase.java similarity index 91% rename from proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java rename to proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestCase.java index b53426441..b4f43f075 100644 --- a/proposal/myrmidon/src/testcases/org/apache/antlib/core/PropertyTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import java.io.File; import org.apache.avalon.excalibur.i18n.ResourceManager; @@ -20,13 +20,12 @@ import org.apache.myrmidon.components.workspace.DefaultTaskContext; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class PropertyTest +public class PropertyTestCase extends AbstractProjectTest { - private final static Resources REZ - = ResourceManager.getPackageResources( PropertyTest.class ); + private final static Resources REZ = getResourcesForTested( PropertyTestCase.class ); - public PropertyTest( final String name ) + public PropertyTestCase( final String name ) { super( name ); } @@ -66,10 +65,10 @@ public class PropertyTest // Missing name String[] messages = - { - null, - REZ.getString( "property.no-name.error" ) - }; + { + null, + REZ.getString( "property.no-name.error" ) + }; executeTargetExpectError( projectFile, "missing-name", messages ); // Missing value diff --git a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTestType.java b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestType.java similarity index 95% rename from proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTestType.java rename to proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestType.java index bc7fa37d1..c146a77df 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/core/PropertyTestType.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/PropertyTestType.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.core; +package org.apache.antlib.core.test; import org.apache.myrmidon.framework.DataType; diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/if.ant b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/if.ant new file mode 100644 index 000000000..b3caca2af --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/if.ant @@ -0,0 +1,63 @@ + + + + + test-prop is set + + + test-prop is not set + + + + + + + test-prop is set + + + test-prop is not set + + + + + + test-prop is set + + + test-prop is not set + + + + + + + test-prop is set + + + test-prop is not set + + + + + + + task 1 + task 2 + task 3 + task 4 + + + + + + no go + + + + + + no go + + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/property.ant b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/property.ant new file mode 100644 index 000000000..03cad74a0 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/core/test/property.ant @@ -0,0 +1,65 @@ + + + + + + test-prop = [${test-prop}] + + + + + some value + test-prop2 = [${test-prop2}] + + + + + + + + test-prop3 = [${test-prop3}] + + + + + + + + + + + + + + + another value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java similarity index 86% rename from proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java rename to proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java index 5be210545..ad84a0219 100644 --- a/proposal/myrmidon/src/test/org/apache/antlib/vfile/CopyFilesTaskTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/CopyFilesTaskTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.antlib.vfile; +package org.apache.antlib.vfile.test; import java.io.File; import org.apache.myrmidon.AbstractProjectTest; @@ -16,10 +16,10 @@ import org.apache.myrmidon.AbstractProjectTest; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class CopyFilesTaskTest +public class CopyFilesTaskTestCase extends AbstractProjectTest { - public CopyFilesTaskTest( String name ) + public CopyFilesTaskTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/copy.ant b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/copy.ant new file mode 100644 index 000000000..18ea5067c --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/copy.ant @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/emptyFile.txt b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/emptyFile.txt new file mode 100644 index 000000000..e69de29bb diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/file1.txt b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/file1.txt new file mode 100644 index 000000000..9ad7b1b57 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/file1.txt @@ -0,0 +1 @@ +A test file. \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/subdir1/someFile.html b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/subdir1/someFile.html new file mode 100644 index 000000000..c769030c0 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/antlib/vfile/test/src/subdir1/someFile.html @@ -0,0 +1,5 @@ + + +

Yo!

+ + diff --git a/proposal/myrmidon/src/test/org/apache/aut/bzip2/BzipTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/BzipTestCase.java similarity index 95% rename from proposal/myrmidon/src/test/org/apache/aut/bzip2/BzipTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/BzipTestCase.java index 3820e79fa..2bd65da42 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/bzip2/BzipTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/BzipTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.bzip2; +package org.apache.aut.bzip2.test; import java.io.File; import java.io.FileInputStream; @@ -16,6 +16,8 @@ import java.io.OutputStream; import junit.framework.TestCase; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.aut.bzip2.CBZip2OutputStream; +import org.apache.aut.bzip2.CBZip2InputStream; /** * A test the stress tested the BZip implementation to verify @@ -24,12 +26,12 @@ import org.apache.avalon.excalibur.io.IOUtil; * @author Peter Donald * @version $Revision$ $Date$ */ -public class BzipTest +public class BzipTestCase extends TestCase { private final static byte[] HEADER = new byte[]{(byte)'B', (byte)'Z'}; - public BzipTest( final String name ) + public BzipTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar new file mode 100644 index 000000000..3f9260978 Binary files /dev/null and b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar differ diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 new file mode 100644 index 000000000..7c2d2154a Binary files /dev/null and b/proposal/myrmidon/src/testcases/org/apache/aut/bzip2/test/asf-logo-huge.tar.bz2 differ diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java similarity index 98% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java index a8e69346c..61dc091ff 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractFileSystemTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -16,6 +16,12 @@ import java.util.List; import java.util.Map; import org.apache.aut.vfs.impl.DefaultFileSystemManager; import org.apache.aut.vfs.provider.AbstractFileObject; +import org.apache.aut.vfs.FileObject; +import org.apache.aut.vfs.FileType; +import org.apache.aut.vfs.FileSystemException; +import org.apache.aut.vfs.FileName; +import org.apache.aut.vfs.NameScope; +import org.apache.aut.vfs.FileContent; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -29,7 +35,7 @@ import org.apache.myrmidon.AbstractMyrmidonTest; * * @author Adam Murdoch */ -public abstract class AbstractFileSystemTest +public abstract class AbstractFileSystemTestCase extends AbstractMyrmidonTest { private final static Resources REZ @@ -41,7 +47,7 @@ public abstract class AbstractFileSystemTest // Contents of "file1.txt" private String m_charContent; - public AbstractFileSystemTest( String name ) + public AbstractFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java similarity index 65% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java index 18f02c9d2..b415a6565 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractReadOnlyFileSystemTestCase.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; + +import org.apache.aut.vfs.test.AbstractFileSystemTestCase; /** * File system tests which check that a read-only file system cannot be @@ -13,9 +15,9 @@ package org.apache.aut.vfs; * * @author Adam Murdoch */ -public abstract class AbstractReadOnlyFileSystemTest extends AbstractFileSystemTest +public abstract class AbstractReadOnlyFileSystemTestCase extends AbstractFileSystemTestCase { - public AbstractReadOnlyFileSystemTest( String name ) + public AbstractReadOnlyFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java similarity index 95% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java index ad57831aa..06a73c132 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/AbstractWritableFileSystemTestCase.java @@ -5,21 +5,25 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.OutputStream; import java.util.HashSet; import java.util.Set; +import org.apache.aut.vfs.test.AbstractFileSystemTestCase; +import org.apache.aut.vfs.FileObject; +import org.apache.aut.vfs.FileType; +import org.apache.aut.vfs.FileSystemException; /** * File system test that check that a file system can be modified. * * @author Adam Murdoch */ -public abstract class AbstractWritableFileSystemTest - extends AbstractFileSystemTest +public abstract class AbstractWritableFileSystemTestCase + extends AbstractFileSystemTestCase { - public AbstractWritableFileSystemTest( String name ) + public AbstractWritableFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/FtpFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/FtpFileSystemTestCase.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/FtpFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/FtpFileSystemTestCase.java index 56a344802..0788c6eed 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/FtpFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/FtpFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.ftp.FtpFileSystemProvider; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for FTP file systems. * * @author Adam Murdoch */ -public class FtpFileSystemTest - extends AbstractWritableFileSystemTest +public class FtpFileSystemTestCase + extends AbstractWritableFileSystemTestCase { - public FtpFileSystemTest( String name ) + public FtpFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/LocalFileSystemTestCase.java similarity index 84% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/LocalFileSystemTestCase.java index e0218041e..540ec36f6 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/LocalFileSystemTestCase.java @@ -5,18 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.File; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the local file system. * * @author Adam Murdoch */ -public class LocalFileSystemTest extends AbstractWritableFileSystemTest +public class LocalFileSystemTestCase extends AbstractWritableFileSystemTestCase { - public LocalFileSystemTest( String name ) + public LocalFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/NestedZipFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/NestedZipFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java index b5523a688..652dcf5b9 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/NestedZipFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/NestedZipFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; +import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the Zip file system, using a zip file nested inside another zip file. * * @author Adam Murdoch */ -public class NestedZipFileSystemTest - extends AbstractReadOnlyFileSystemTest +public class NestedZipFileSystemTestCase + extends AbstractReadOnlyFileSystemTestCase { - public NestedZipFileSystemTest( String name ) + public NestedZipFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/SmbFileSystemTestCase.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/SmbFileSystemTestCase.java index c3ff819e7..bf0402376 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/SmbFileSystemTestCase.java @@ -5,18 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import org.apache.aut.vfs.provider.smb.SmbFileSystemProvider; +import org.apache.aut.vfs.test.AbstractWritableFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the SMB file system. * * @author Adam Murdoch */ -public class SmbFileSystemTest extends AbstractWritableFileSystemTest +public class SmbFileSystemTestCase extends AbstractWritableFileSystemTestCase { - public SmbFileSystemTest( String name ) + public SmbFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/ZipFileSystemTestCase.java similarity index 76% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/ZipFileSystemTestCase.java index 4c8b4af38..ded939ef6 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/test/ZipFileSystemTestCase.java @@ -5,19 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.vfs; +package org.apache.aut.vfs.test; import java.io.File; import org.apache.aut.vfs.provider.zip.ZipFileSystemProvider; +import org.apache.aut.vfs.test.AbstractReadOnlyFileSystemTestCase; +import org.apache.aut.vfs.FileObject; /** * Tests for the Zip file system. * * @author Adam Murdoch */ -public class ZipFileSystemTest extends AbstractReadOnlyFileSystemTest +public class ZipFileSystemTestCase extends AbstractReadOnlyFileSystemTestCase { - public ZipFileSystemTest( String name ) + public ZipFileSystemTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/AsiExtraFieldTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java similarity index 96% rename from proposal/myrmidon/src/testcases/org/apache/aut/zip/AsiExtraFieldTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java index 246ca1b76..2337f3feb 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/AsiExtraFieldTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/AsiExtraFieldTestCase.java @@ -5,21 +5,23 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import java.util.zip.ZipException; import junit.framework.TestCase; +import org.apache.aut.zip.UnixStat; +import org.apache.aut.zip.AsiExtraField; /** * JUnit testcases AsiExtraField. * * @author Stefan Bodewig */ -public class AsiExtraFieldTest +public class AsiExtraFieldTestCase extends TestCase implements UnixStat { - public AsiExtraFieldTest( final String name ) + public AsiExtraFieldTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ExtraFieldUtilsTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java similarity index 91% rename from proposal/myrmidon/src/testcases/org/apache/aut/zip/ExtraFieldUtilsTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java index 6e2be5d4d..7f4a73e6c 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ExtraFieldUtilsTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ExtraFieldUtilsTestCase.java @@ -5,16 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.UnixStat; +import org.apache.aut.zip.AsiExtraField; +import org.apache.aut.zip.UnrecognizedExtraField; +import org.apache.aut.zip.ZipShort; +import org.apache.aut.zip.ZipExtraField; +import org.apache.aut.zip.ExtraFieldUtils; /** * JUnit testcases ExtraFieldUtils. * * @author Stefan Bodewig */ -public class ExtraFieldUtilsTest +public class ExtraFieldUtilsTestCase extends TestCase implements UnixStat { @@ -23,7 +29,7 @@ public class ExtraFieldUtilsTest private byte[] m_data; private byte[] m_local; - public ExtraFieldUtilsTest( final String name ) + public ExtraFieldUtilsTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java similarity index 90% rename from proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java index 24e919ee0..df87812f4 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipEntryTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipEntryTestCase.java @@ -5,20 +5,25 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import java.util.NoSuchElementException; import junit.framework.TestCase; +import org.apache.aut.zip.AsiExtraField; +import org.apache.aut.zip.UnrecognizedExtraField; +import org.apache.aut.zip.ZipEntry; +import org.apache.aut.zip.ZipExtraField; +import org.apache.aut.zip.ZipShort; /** * JUnit testcases ZipEntry. * * @author Stefan Bodewig */ -public class ZipEntryTest +public class ZipEntryTestCase extends TestCase { - public ZipEntryTest( final String name ) + public ZipEntryTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipLongTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java similarity index 94% rename from proposal/myrmidon/src/test/org/apache/aut/zip/ZipLongTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java index e73f02d53..501b5f491 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/zip/ZipLongTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipLongTestCase.java @@ -5,20 +5,21 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.ZipLong; /** * JUnit 3 testcases for org.apache.tools.zip.ZipLong. * * @author Stefan Bodewig */ -public class ZipLongTest +public class ZipLongTestCase extends TestCase { - public ZipLongTest( final String name ) + public ZipLongTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipShortTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipShortTest.java rename to proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java index ba9c459fb..7e45b1d48 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/zip/ZipShortTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/zip/test/ZipShortTestCase.java @@ -5,19 +5,20 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.aut.zip; +package org.apache.aut.zip.test; import junit.framework.TestCase; +import org.apache.aut.zip.ZipShort; /** * JUnit 3 testcases for org.apache.tools.zip.ZipShort. * * @author Stefan Bodewig */ -public class ZipShortTest +public class ZipShortTestCase extends TestCase { - public ZipShortTest( String name ) + public ZipShortTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java index b9b0d3689..fbef96e5a 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/AbstractMyrmidonTest.java @@ -10,6 +10,8 @@ package org.apache.myrmidon; import java.io.File; import java.io.IOException; import junit.framework.TestCase; +import org.apache.avalon.excalibur.i18n.Resources; +import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.logger.Logger; import org.apache.myrmidon.frontends.BasicLogger; @@ -27,6 +29,36 @@ public abstract class AbstractMyrmidonTest private final File m_baseDir; private Logger m_logger; + protected static final Resources getResourcesForTested( final Class clazz ) + { + final Package pkg = clazz.getPackage(); + + String baseName; + if( null == pkg ) + { + final String name = clazz.getName(); + if( -1 == name.lastIndexOf( "." ) ) + { + baseName = ""; + } + else + { + baseName = name.substring( 0, name.lastIndexOf( "." ) ); + } + } + else + { + baseName = pkg.getName(); + } + + if( baseName.endsWith( ".test" ) ) + { + baseName = baseName.substring( 0, baseName.length() - 5 ); + } + + return ResourceManager.getBaseResources( baseName + ".Resources", AbstractMyrmidonTest.class.getClassLoader() ); + } + public AbstractMyrmidonTest( String name ) { super( name ); @@ -162,7 +194,7 @@ public abstract class AbstractMyrmidonTest */ protected void assertSameMessage( final String message, final Throwable throwable ) { - assertSameMessage( new String[] { message }, throwable ); + assertSameMessage( new String[]{message}, throwable ); } /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java similarity index 95% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java index 00c706cca..af901c97d 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/DefaultProjectBuilderTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/DefaultProjectBuilderTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.builder; +package org.apache.myrmidon.components.builder.test; import java.io.File; import java.util.Arrays; @@ -13,24 +13,25 @@ import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.excalibur.io.FileUtil; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.builder.DefaultProjectBuilder; +import org.apache.myrmidon.components.builder.DefaultProject; import org.apache.myrmidon.interfaces.builder.ProjectException; import org.apache.myrmidon.interfaces.model.Project; /** - * Test cases for {@link DefaultProjectBuilder}. + * Test cases for {@link org.apache.myrmidon.components.builder.DefaultProjectBuilder}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultProjectBuilderTest +public class DefaultProjectBuilderTestCase extends AbstractMyrmidonTest { - private final static Resources REZ - = ResourceManager.getPackageResources( DefaultProjectBuilderTest.class ); + private final static Resources REZ = getResourcesForTested( DefaultProjectBuilderTestCase.class ); private DefaultProjectBuilder m_builder; - public DefaultProjectBuilderTest( String name ) + public DefaultProjectBuilderTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-project-name.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-project-name.ant new file mode 100644 index 000000000..7b0ed6f75 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-project-name.ant @@ -0,0 +1,4 @@ + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-target-name.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-target-name.ant new file mode 100644 index 000000000..8c7186956 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-target-name.ant @@ -0,0 +1,5 @@ + + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-version.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-version.ant new file mode 100644 index 000000000..922f14aee --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-xml.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-xml.ant new file mode 100644 index 000000000..91717fd16 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/bad-xml.ant @@ -0,0 +1 @@ +this ain't xml. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/defaults.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/defaults.ant new file mode 100644 index 000000000..b36a5c7ce --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/defaults.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/mismatched-version.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/mismatched-version.ant new file mode 100644 index 000000000..b9176c9c0 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/mismatched-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/no-version.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/no-version.ant new file mode 100644 index 000000000..d1979fedf --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/no-version.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-base-dir.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-base-dir.ant new file mode 100644 index 000000000..56fe72aa4 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-base-dir.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-default-target.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-default-target.ant new file mode 100644 index 000000000..f83f3bbeb --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-default-target.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-project-name.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-project-name.ant new file mode 100644 index 000000000..a8ae1a941 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/builder/test/set-project-name.ant @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java similarity index 87% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java index 9f3898fde..4a1d5d628 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ConfigTestConfigurable.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ConfigTestConfigurable.java @@ -5,14 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; import org.apache.avalon.framework.configuration.ConfigurationException; /** - * Simple class to test {@link Configurable}. + * Simple class to test {@link org.apache.avalon.framework.configuration.Configurable}. * * @author Peter Donald * @version $Revision$ $Date$ diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java similarity index 92% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java index fedc0cde3..d814cda09 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/DefaultConfigurerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/DefaultConfigurerTestCase.java @@ -5,40 +5,39 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import java.io.File; import org.apache.antlib.core.StringToIntegerConverter; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.ExceptionUtil; import org.apache.avalon.framework.configuration.ConfigurationException; import org.apache.avalon.framework.configuration.DefaultConfiguration; import org.apache.myrmidon.api.TaskContext; import org.apache.myrmidon.components.AbstractComponentTest; -import org.apache.myrmidon.components.configurer.data.ConfigTestAttributeConvert; -import org.apache.myrmidon.components.configurer.data.ConfigTestConfigAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestContent; -import org.apache.myrmidon.components.configurer.data.ConfigTestEmpty; -import org.apache.myrmidon.components.configurer.data.ConfigTestIdResolve; -import org.apache.myrmidon.components.configurer.data.ConfigTestIgnoreStringMethods; -import org.apache.myrmidon.components.configurer.data.ConfigTestInterfaceAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestMismatchedRefType; -import org.apache.myrmidon.components.configurer.data.ConfigTestMultipleTypedAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestNestedErrors; -import org.apache.myrmidon.components.configurer.data.ConfigTestNonInterfaceAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestPropResolution; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceAttribute; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceConversion; -import org.apache.myrmidon.components.configurer.data.ConfigTestReferenceElement; -import org.apache.myrmidon.components.configurer.data.ConfigTestSetAttribute; -import org.apache.myrmidon.components.configurer.data.ConfigTestSetElement; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderConversion; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderReference; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedAdderRole; -import org.apache.myrmidon.components.configurer.data.ConfigTestTypedConfigAdder; -import org.apache.myrmidon.components.configurer.data.ConfigTestUnknownReference; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestAttributeConvert; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestConfigAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestContent; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestEmpty; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestIdResolve; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestIgnoreStringMethods; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestInterfaceAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestMismatchedRefType; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestMultipleTypedAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestNestedErrors; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestNonInterfaceAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestPropResolution; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceAttribute; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceConversion; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestReferenceElement; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestSetAttribute; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestSetElement; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderConversion; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderReference; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedAdderRole; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestTypedConfigAdder; +import org.apache.myrmidon.components.configurer.test.data.ConfigTestUnknownReference; import org.apache.myrmidon.components.workspace.DefaultTaskContext; import org.apache.myrmidon.framework.DataType; import org.apache.myrmidon.interfaces.configurer.Configurer; @@ -49,16 +48,16 @@ import org.apache.myrmidon.interfaces.role.RoleInfo; * * @author Adam Murdoch */ -public class DefaultConfigurerTest +public class DefaultConfigurerTestCase extends AbstractComponentTest { private final static Resources REZ = - ResourceManager.getPackageResources( DefaultConfigurerTest.class ); + getResourcesForTested( DefaultConfigurerTestCase.class ); private Configurer m_configurer; private DefaultTaskContext m_context; - public DefaultConfigurerTest( String name ) + public DefaultConfigurerTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1.java similarity index 90% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1.java index f62943b3c..c7dc8ae9e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.myrmidon.framework.DataType; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java similarity index 87% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java index a683499d3..4c8f448d7 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyRole1Adaptor.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole1Adaptor.java @@ -5,9 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Adapts an Object to MyRole diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole2.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole2.java similarity index 88% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole2.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole2.java index 0b061d8b4..e21a3ee95 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/MyRole2.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyRole2.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; /** * A basic interface to test configurer. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType1.java similarity index 82% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType1.java index ee40c9eae..a0b6b7b70 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType1.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; + +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A basic implementation of MyRole1 to test configurer. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType2.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType2.java similarity index 82% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType2.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType2.java index c573feff1..a605ddeed 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/MyType2.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/MyType2.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; + +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A basic implementation of MyRole1 to test configurer. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java similarity index 81% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java index 34934097c..06d74ea6e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/ObjectToMyRole1Converter.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/ObjectToMyRole1Converter.java @@ -5,10 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer; +package org.apache.myrmidon.components.configurer.test; import org.apache.aut.converter.AbstractConverter; import org.apache.aut.converter.ConverterException; +import org.apache.myrmidon.components.configurer.test.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1Adaptor; /** * Converts from Object to MyRole1. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java similarity index 94% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java index 6830561d2..840e6d43c 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestAttributeConvert.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestAttributeConvert.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import org.apache.myrmidon.components.AbstractComponentTest; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java index 54136d96f..1568b4f28 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestConfigAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestConfigAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java index 1d28ef88f..0ab4e74c8 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestContent.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestContent.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. @@ -25,7 +25,7 @@ public class ConfigTestContent public boolean equals( final Object obj ) { final ConfigTestContent test = (ConfigTestContent)obj; - if( !DefaultConfigurerTest.equals( m_content, test.m_content ) ) + if( !DefaultConfigurerTestCase.equals( m_content, test.m_content ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java similarity index 89% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java index 00c5f2a8f..b39612392 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestEmpty.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestEmpty.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java index 0de5265df..22fe5d770 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIdResolve.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIdResolve.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. @@ -25,7 +25,7 @@ public class ConfigTestIdResolve public boolean equals( final Object obj ) { final ConfigTestIdResolve test = (ConfigTestIdResolve)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java similarity index 86% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java index a8afb0a49..369649b7c 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestIgnoreStringMethods.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestIgnoreStringMethods.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import junit.framework.AssertionFailedError; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A test class with multiple setters/adders/creators for a property. @@ -24,7 +24,7 @@ public class ConfigTestIgnoreStringMethods public boolean equals( Object obj ) { ConfigTestIgnoreStringMethods test = (ConfigTestIgnoreStringMethods)obj; - if( !DefaultConfigurerTest.equals( m_prop1, test.m_prop1 ) ) + if( !DefaultConfigurerTestCase.equals( m_prop1, test.m_prop1 ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java similarity index 86% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java index 48c15109e..e622b15af 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestInterfaceAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestInterfaceAdder.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A test class with an interface property. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java index a00b94df8..940465036 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestMismatchedRefType.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMismatchedRefType.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java similarity index 75% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java index c70b8e479..256aed403 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestMultipleTypedAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestMultipleTypedAdder.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; -import org.apache.myrmidon.components.configurer.MyRole1; -import org.apache.myrmidon.components.configurer.MyRole2; +import org.apache.myrmidon.components.configurer.test.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole2; /** * Simple class with more than one typed adder method. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java similarity index 87% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java index ce1c04bac..e6f14a6d4 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestNestedErrors.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNestedErrors.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; /** * A simple test class. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java similarity index 91% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java index 45535c961..432dd4e82 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestNonInterfaceAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestNonInterfaceAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java similarity index 79% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java index 6a9e44c56..48c729af0 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestPropResolution.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestPropResolution.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -24,7 +24,7 @@ public class ConfigTestPropResolution public boolean equals( final Object obj ) { final ConfigTestPropResolution test = (ConfigTestPropResolution)obj; - if( !DefaultConfigurerTest.equals( m_prop, test.m_prop ) ) + if( !DefaultConfigurerTestCase.equals( m_prop, test.m_prop ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java index 9ec47f727..5946cdcd7 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceAttribute.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceAttribute.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -24,7 +24,7 @@ public class ConfigTestReferenceAttribute public boolean equals( final Object obj ) { final ConfigTestReferenceAttribute test = (ConfigTestReferenceAttribute)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java similarity index 85% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java index 5d1055d9a..4862d3d78 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceConversion.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceConversion.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * A simple test class. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java similarity index 76% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java index 4bbb9f893..d6d1cd007 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestReferenceElement.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestReferenceElement.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class. @@ -23,7 +23,7 @@ public class ConfigTestReferenceElement public boolean equals( Object obj ) { ConfigTestReferenceElement test = (ConfigTestReferenceElement)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java similarity index 83% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java index cf44c852f..0a76b998a 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetAttribute.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetAttribute.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.List; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * Simple class to test typed adder. @@ -25,7 +25,7 @@ public class ConfigTestSetAttribute public boolean equals( final Object obj ) { final ConfigTestSetAttribute test = (ConfigTestSetAttribute)obj; - if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java similarity index 79% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java index bc7b503fc..704248b46 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestSetElement.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestSetElement.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class. @@ -25,7 +25,7 @@ public class ConfigTestSetElement public boolean equals( Object obj ) { ConfigTestSetElement test = (ConfigTestSetElement)obj; - if( !DefaultConfigurerTest.equals( m_prop, test.m_prop ) ) + if( !DefaultConfigurerTestCase.equals( m_prop, test.m_prop ) ) { return false; } @@ -33,7 +33,7 @@ public class ConfigTestSetElement { return false; } - else if( !DefaultConfigurerTest.equals( m_someProp, test.m_someProp ) ) + else if( !DefaultConfigurerTestCase.equals( m_someProp, test.m_someProp ) ) { return false; } diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java similarity index 87% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java index 7e1a75333..4beafcdd6 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdder.java @@ -5,11 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test adder for Configurations. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java similarity index 88% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java index b6a0cb9e8..0aeb29d9b 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderConversion.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderConversion.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; import org.apache.myrmidon.framework.DataType; /** diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java similarity index 86% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java index 20a9c403f..6ce6bc078 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderReference.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderReference.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java similarity index 86% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java index ed950288a..d8ac8d59e 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedAdderRole.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedAdderRole.java @@ -5,10 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; -import org.apache.myrmidon.components.configurer.MyRole1; +import org.apache.myrmidon.components.configurer.test.MyRole1; /** * Simple class to test typed adder. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java index 790687fb8..2d7bcf02d 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestTypedConfigAdder.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestTypedConfigAdder.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import org.apache.avalon.framework.configuration.Configuration; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java similarity index 80% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java index 32d17784b..b27b04a8c 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/data/ConfigTestUnknownReference.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/configurer/test/data/ConfigTestUnknownReference.java @@ -5,12 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.configurer.data; +package org.apache.myrmidon.components.configurer.test.data; import java.util.ArrayList; import java.util.List; import org.apache.myrmidon.framework.DataType; -import org.apache.myrmidon.components.configurer.DefaultConfigurerTest; +import org.apache.myrmidon.components.configurer.test.DefaultConfigurerTestCase; /** * A simple test class with string properties. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java similarity index 97% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java index 485cd7da6..b47b5eb53 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/DefaultDeployerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/DefaultDeployerTestCase.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import java.io.File; import org.apache.aut.converter.Converter; @@ -24,7 +24,7 @@ import org.apache.myrmidon.interfaces.type.TypeFactory; * * @author Adam Murdoch */ -public class DefaultDeployerTest +public class DefaultDeployerTestCase extends AbstractComponentTest { private static final String TEST_TYPE1_NAME = "test-type1"; @@ -32,7 +32,7 @@ public class DefaultDeployerTest private Deployer m_deployer; private Converter m_converter; - public DefaultDeployerTest( final String name ) + public DefaultDeployerTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestConverter1.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestConverter1.java index fc9abe6c3..af61edaa2 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestConverter1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestConverter1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import org.apache.aut.converter.Converter; import org.apache.aut.converter.ConverterException; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestRole1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestRole1.java similarity index 89% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestRole1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestRole1.java index 93dc94f6d..60fc79166 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/TestRole1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestRole1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; /** * A test role interface. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestType1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestType1.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestType1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestType1.java index 444ea9e62..7cf53f163 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/deployer/TestType1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/TestType1.java @@ -5,9 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.deployer; +package org.apache.myrmidon.components.deployer.test; import org.apache.myrmidon.framework.DataType; +import org.apache.myrmidon.components.deployer.test.TestRole1; /** * A test data-type. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml new file mode 100644 index 000000000..43d07cd67 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-descriptor.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-roles.xml b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-roles.xml new file mode 100644 index 000000000..86e6070ec --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/deployer/test/ant-roles.xml @@ -0,0 +1,4 @@ + + + + diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java similarity index 98% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java index 91289c5d1..20d971643 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/embeddor/DefaultEmbeddorTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.embeddor; +package org.apache.myrmidon.components.embeddor.test; import java.io.File; import org.apache.avalon.framework.parameters.Parameters; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/project-builder.ant b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/project-builder.ant new file mode 100644 index 000000000..7f52d2702 --- /dev/null +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/embeddor/test/project-builder.ant @@ -0,0 +1,6 @@ + + + + A log message + + \ No newline at end of file diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java similarity index 93% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java index 9e79a0d2b..21aba6d3d 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/property/AbstractPropertyResolverTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/AbstractPropertyResolverTestCase.java @@ -5,11 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import java.io.File; import java.util.Date; -import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.context.Context; import org.apache.myrmidon.AbstractMyrmidonTest; @@ -23,16 +22,15 @@ import org.apache.myrmidon.interfaces.property.PropertyResolver; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public abstract class AbstractPropertyResolverTest +public abstract class AbstractPropertyResolverTestCase extends AbstractMyrmidonTest { - protected final static Resources REZ - = ResourceManager.getPackageResources( AbstractPropertyResolverTest.class ); + protected final static Resources REZ = getResourcesForTested( AbstractPropertyResolverTestCase.class ); protected PropertyResolver m_resolver; protected DefaultTaskContext m_context; - public AbstractPropertyResolverTest( String name ) + public AbstractPropertyResolverTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java similarity index 66% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java index a0779291f..12eef075a 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/ClassicPropertyResolverTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/ClassicPropertyResolverTestCase.java @@ -5,20 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; +import org.apache.myrmidon.components.property.ClassicPropertyResolver; /** - * A test for {@link ClassicPropertyResolver}. + * A test for {@link org.apache.myrmidon.components.property.ClassicPropertyResolver}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class ClassicPropertyResolverTest - extends AbstractPropertyResolverTest +public class ClassicPropertyResolverTestCase + extends AbstractPropertyResolverTestCase { - public ClassicPropertyResolverTest( String name ) + public ClassicPropertyResolverTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java similarity index 70% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java index 4d1f2198d..0183adea8 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/DefaultPropertyResolverTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/property/test/DefaultPropertyResolverTestCase.java @@ -5,20 +5,22 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.property; +package org.apache.myrmidon.components.property.test; import org.apache.myrmidon.interfaces.property.PropertyResolver; +import org.apache.myrmidon.components.property.test.AbstractPropertyResolverTestCase; +import org.apache.myrmidon.components.property.DefaultPropertyResolver; /** - * Functional tests for {@link DefaultPropertyResolver}. + * Functional tests for {@link org.apache.myrmidon.components.property.DefaultPropertyResolver}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultPropertyResolverTest - extends AbstractPropertyResolverTest +public class DefaultPropertyResolverTestCase + extends AbstractPropertyResolverTestCase { - public DefaultPropertyResolverTest( String name ) + public DefaultPropertyResolverTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java similarity index 94% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java index e2332b1ae..ba68eb68c 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/DefaultRoleManagerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/role/test/DefaultRoleManagerTestCase.java @@ -5,11 +5,12 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.role; +package org.apache.myrmidon.components.role.test; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.components.role.DefaultRoleManager; import org.apache.myrmidon.api.Task; import org.apache.myrmidon.interfaces.role.RoleException; import org.apache.myrmidon.interfaces.role.RoleInfo; @@ -21,15 +22,14 @@ import org.apache.myrmidon.interfaces.role.RoleManager; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class DefaultRoleManagerTest +public class DefaultRoleManagerTestCase extends AbstractMyrmidonTest { - private final static Resources REZ - = ResourceManager.getPackageResources( DefaultRoleManagerTest.class ); + private final static Resources REZ = getResourcesForTested( DefaultRoleManagerTestCase.class ); private RoleManager m_roleManager; - public DefaultRoleManagerTest( String name ) + public DefaultRoleManagerTestCase( String name ) { super( name ); } @@ -70,7 +70,7 @@ public class DefaultRoleManagerTest assertNull( unknownRole ); // Lookup an unknown role - unknownRole = m_roleManager.getRoleByType( DefaultRoleManagerTest.class ); + unknownRole = m_roleManager.getRoleByType( DefaultRoleManagerTestCase.class ); assertNull( unknownRole ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java index 5f6464835..932978376 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/InstantiatingServiceManagerTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/InstantiatingServiceManagerTestCase.java @@ -5,13 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.avalon.excalibur.i18n.ResourceManager; import org.apache.avalon.excalibur.i18n.Resources; import org.apache.avalon.framework.parameters.Parameters; import org.apache.avalon.framework.service.ServiceException; import org.apache.myrmidon.components.AbstractComponentTest; +import org.apache.myrmidon.components.service.InstantiatingServiceManager; import org.apache.myrmidon.interfaces.role.RoleInfo; import org.apache.myrmidon.interfaces.role.RoleManager; import org.apache.myrmidon.interfaces.service.ServiceFactory; @@ -24,16 +25,15 @@ import org.apache.myrmidon.interfaces.type.TypeManager; * @author Adam Murdoch * @version $Revision$ $Date$ */ -public class InstantiatingServiceManagerTest +public class InstantiatingServiceManagerTestCase extends AbstractComponentTest { - private final static Resources REZ - = ResourceManager.getPackageResources( InstantiatingServiceManagerTest.class ); + private final static Resources REZ = getResourcesForTested( InstantiatingServiceManagerTestCase.class ); private InstantiatingServiceManager m_serviceManager; private Parameters m_parameters = new Parameters(); - public InstantiatingServiceManagerTest( final String name ) + public InstantiatingServiceManagerTestCase( final String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/LifecycleValidator.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/LifecycleValidator.java similarity index 97% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/LifecycleValidator.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/LifecycleValidator.java index 916f268cd..b95ac5ffe 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/LifecycleValidator.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/LifecycleValidator.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import junit.framework.Assert; import org.apache.avalon.framework.activity.Initializable; diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestService.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestService.java similarity index 89% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestService.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestService.java index 4c0485a52..302c2a5b3 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestService.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestService.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; /** * A service interface. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory1.java similarity index 93% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory1.java index bccf1dd98..10e0f69bc 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.myrmidon.interfaces.service.AntServiceException; import org.apache.myrmidon.interfaces.service.ServiceFactory; diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory2.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory2.java similarity index 88% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory2.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory2.java index 8cae19da6..524d3cc04 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceFactory2.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceFactory2.java @@ -5,10 +5,11 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; import org.apache.myrmidon.interfaces.service.AntServiceException; import org.apache.myrmidon.interfaces.service.ServiceFactory; +import org.apache.myrmidon.components.service.test.LifecycleValidator; /** * A test service factory, which asserts that the factory has been properly diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl1.java similarity index 80% rename from proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl1.java index 69c393ab1..c22e4d0a7 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/components/service/TestServiceImpl1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl1.java @@ -5,7 +5,9 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; + +import org.apache.myrmidon.components.service.test.TestService; /** * A test service implementation. diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl2.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl2.java similarity index 75% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl2.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl2.java index d715cf6dc..933d76383 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/TestServiceImpl2.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/components/service/test/TestServiceImpl2.java @@ -5,7 +5,10 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.components.service; +package org.apache.myrmidon.components.service.test; + +import org.apache.myrmidon.components.service.test.LifecycleValidator; +import org.apache.myrmidon.components.service.test.TestService; /** * A test service that asserts it has been set-up correctly. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java similarity index 90% rename from proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java index 51d9710ec..ff3368e19 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/model/DefaultNameValidatorTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/model/test/DefaultNameValidatorTestCase.java @@ -5,22 +5,23 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.model; +package org.apache.myrmidon.interfaces.model.test; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.interfaces.model.DefaultNameValidator; /** - * TestCases for {@link DefaultNameValidator}. + * TestCases for {@link org.apache.myrmidon.interfaces.model.DefaultNameValidator}. * * @author Darrell DeBoer * @version $Revision$ $Date$ */ -public class DefaultNameValidatorTest +public class DefaultNameValidatorTestCase extends AbstractMyrmidonTest { private DefaultNameValidator m_validator = new DefaultNameValidator(); - public DefaultNameValidatorTest( String name ) + public DefaultNameValidatorTestCase( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType1.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType1.java similarity index 91% rename from proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType1.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType1.java index e64a7914c..226b9a3bb 100644 --- a/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/MyType1.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType1.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; /** * A basic implementation of a type to test the type factory. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType2.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType2.java similarity index 91% rename from proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType2.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType2.java index b652f6b84..a9418f1ae 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/MyType2.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/MyType2.java @@ -5,7 +5,7 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; /** * A basic implementation of a type to test the type factory. diff --git a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java similarity index 89% rename from proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java rename to proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java index a73626251..62ed33a88 100644 --- a/proposal/myrmidon/src/test/org/apache/myrmidon/interfaces/type/TypeFactoryTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/myrmidon/interfaces/type/test/TypeFactoryTestCase.java @@ -5,11 +5,14 @@ * version 1.1, a copy of which has been included with this distribution in * the LICENSE.txt file. */ -package org.apache.myrmidon.interfaces.type; +package org.apache.myrmidon.interfaces.type.test; import java.io.File; import java.net.URL; import org.apache.myrmidon.AbstractMyrmidonTest; +import org.apache.myrmidon.interfaces.type.DefaultTypeFactory; +import org.apache.myrmidon.interfaces.type.ReloadingTypeFactory; +import org.apache.myrmidon.interfaces.type.TypeException; /** * These are unit tests that test the basic operation of TypeFactories. @@ -17,7 +20,7 @@ import org.apache.myrmidon.AbstractMyrmidonTest; * @author Peter Donald * @version $Revision$ $Date$ */ -public class TypeFactoryTest +public class TypeFactoryTestCase extends AbstractMyrmidonTest { private final static String TYPE_NAME1 = "my-type1"; @@ -27,7 +30,7 @@ public class TypeFactoryTest private final static String TYPE_CLASSNAME1 = TYPE_CLASS1.getName(); private final static String TYPE_CLASSNAME2 = TYPE_CLASS2.getName(); - public TypeFactoryTest( final String name ) + public TypeFactoryTestCase( final String name ) { super( name ); } @@ -62,7 +65,6 @@ public class TypeFactoryTest throws Exception { final File file = getTestResource( "types.jar" ); - final URL[] classpath = new URL[]{file.toURL()}; final ReloadingTypeFactory factory = new ReloadingTypeFactory( classpath, null ); factory.addNameClassMapping( TYPE_NAME1, TYPE_CLASSNAME1 );