diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/BasicFileSystemTestBase.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java similarity index 98% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/BasicFileSystemTestBase.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java index 5516c8fee..2102122f5 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/BasicFileSystemTestBase.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractFileSystemTest.java @@ -26,9 +26,9 @@ import org.apache.aut.vfs.impl.DefaultFileSystemManager; * Works from a base folder, and assumes a particular structure under * that base folder. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class BasicFileSystemTestBase extends TestCase +public abstract class AbstractFileSystemTest extends TestCase { protected FileObject m_baseFolder; protected DefaultFileSystemManager m_manager; @@ -36,7 +36,7 @@ public abstract class BasicFileSystemTestBase extends TestCase // Contents of "file1.txt" private String m_charContent; - public BasicFileSystemTestBase( String name ) + public AbstractFileSystemTest( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java similarity index 66% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java index 9cd87e0a6..18f02c9d2 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java @@ -11,11 +11,11 @@ package org.apache.aut.vfs; * File system tests which check that a read-only file system cannot be * changed. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class ReadOnlyFileSystemTestBase extends BasicFileSystemTestBase +public abstract class AbstractReadOnlyFileSystemTest extends AbstractFileSystemTest { - public ReadOnlyFileSystemTestBase( String name ) + public AbstractReadOnlyFileSystemTest( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/WritableFileSystemTestBase.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java similarity index 97% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/WritableFileSystemTestBase.java rename to proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java index 65bc254f5..da0ad75bd 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/WritableFileSystemTestBase.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/AbstractWritableFileSystemTest.java @@ -15,11 +15,11 @@ import java.util.Set; /** * File system test that check that a file system can be modified. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class WritableFileSystemTestBase extends BasicFileSystemTestBase +public abstract class AbstractWritableFileSystemTest extends AbstractFileSystemTest { - public WritableFileSystemTestBase( String name ) + public AbstractWritableFileSystemTest( 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/FtpFileSystemTest.java index c0ad5e886..dc12a0009 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/FtpFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/FtpFileSystemTest.java @@ -10,9 +10,9 @@ package org.apache.aut.vfs; /** * Tests for FTP file systems. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class FtpFileSystemTest extends WritableFileSystemTestBase +public class FtpFileSystemTest extends AbstractWritableFileSystemTest { public FtpFileSystemTest( String name ) { diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java index 5a0a1ea2a..4e53b92ea 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/LocalFileSystemTest.java @@ -12,9 +12,9 @@ import java.io.File; /** * Tests for the local file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class LocalFileSystemTest extends WritableFileSystemTestBase +public class LocalFileSystemTest extends AbstractWritableFileSystemTest { private File m_baseDir; diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java index 2e09a77e0..308d92c65 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/SmbFileSystemTest.java @@ -10,9 +10,9 @@ package org.apache.aut.vfs; /** * Tests for the SMB file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class SmbFileSystemTest extends WritableFileSystemTestBase +public class SmbFileSystemTest extends AbstractWritableFileSystemTest { public SmbFileSystemTest( String name ) { diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java b/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java index f9723d7ea..1d4e9ff9a 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java +++ b/proposal/myrmidon/src/test/org/apache/aut/vfs/ZipFileSystemTest.java @@ -12,9 +12,9 @@ import java.io.File; /** * Tests for the Zip file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class ZipFileSystemTest extends ReadOnlyFileSystemTestBase +public class ZipFileSystemTest extends AbstractReadOnlyFileSystemTest { public ZipFileSystemTest( String name ) { diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/BasicFileSystemTestBase.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java similarity index 98% rename from proposal/myrmidon/src/testcases/org/apache/aut/vfs/BasicFileSystemTestBase.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java index 5516c8fee..2102122f5 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/BasicFileSystemTestBase.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractFileSystemTest.java @@ -26,9 +26,9 @@ import org.apache.aut.vfs.impl.DefaultFileSystemManager; * Works from a base folder, and assumes a particular structure under * that base folder. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class BasicFileSystemTestBase extends TestCase +public abstract class AbstractFileSystemTest extends TestCase { protected FileObject m_baseFolder; protected DefaultFileSystemManager m_manager; @@ -36,7 +36,7 @@ public abstract class BasicFileSystemTestBase extends TestCase // Contents of "file1.txt" private String m_charContent; - public BasicFileSystemTestBase( String name ) + public AbstractFileSystemTest( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java similarity index 66% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java index 9cd87e0a6..18f02c9d2 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/ReadOnlyFileSystemTestBase.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractReadOnlyFileSystemTest.java @@ -11,11 +11,11 @@ package org.apache.aut.vfs; * File system tests which check that a read-only file system cannot be * changed. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class ReadOnlyFileSystemTestBase extends BasicFileSystemTestBase +public abstract class AbstractReadOnlyFileSystemTest extends AbstractFileSystemTest { - public ReadOnlyFileSystemTestBase( String name ) + public AbstractReadOnlyFileSystemTest( String name ) { super( name ); } diff --git a/proposal/myrmidon/src/test/org/apache/aut/vfs/WritableFileSystemTestBase.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java similarity index 97% rename from proposal/myrmidon/src/test/org/apache/aut/vfs/WritableFileSystemTestBase.java rename to proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java index 65bc254f5..da0ad75bd 100644 --- a/proposal/myrmidon/src/test/org/apache/aut/vfs/WritableFileSystemTestBase.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/AbstractWritableFileSystemTest.java @@ -15,11 +15,11 @@ import java.util.Set; /** * File system test that check that a file system can be modified. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public abstract class WritableFileSystemTestBase extends BasicFileSystemTestBase +public abstract class AbstractWritableFileSystemTest extends AbstractFileSystemTest { - public WritableFileSystemTestBase( String name ) + public AbstractWritableFileSystemTest( 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/FtpFileSystemTest.java index c0ad5e886..dc12a0009 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/FtpFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/FtpFileSystemTest.java @@ -10,9 +10,9 @@ package org.apache.aut.vfs; /** * Tests for FTP file systems. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class FtpFileSystemTest extends WritableFileSystemTestBase +public class FtpFileSystemTest extends AbstractWritableFileSystemTest { public FtpFileSystemTest( String name ) { diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java index 5a0a1ea2a..4e53b92ea 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/LocalFileSystemTest.java @@ -12,9 +12,9 @@ import java.io.File; /** * Tests for the local file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class LocalFileSystemTest extends WritableFileSystemTestBase +public class LocalFileSystemTest extends AbstractWritableFileSystemTest { private File m_baseDir; diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java index 2e09a77e0..308d92c65 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/SmbFileSystemTest.java @@ -10,9 +10,9 @@ package org.apache.aut.vfs; /** * Tests for the SMB file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class SmbFileSystemTest extends WritableFileSystemTestBase +public class SmbFileSystemTest extends AbstractWritableFileSystemTest { public SmbFileSystemTest( String name ) { diff --git a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java index f9723d7ea..1d4e9ff9a 100644 --- a/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java +++ b/proposal/myrmidon/src/testcases/org/apache/aut/vfs/ZipFileSystemTest.java @@ -12,9 +12,9 @@ import java.io.File; /** * Tests for the Zip file system. * - * @author Adam Murdoch + * @author Adam Murdoch */ -public class ZipFileSystemTest extends ReadOnlyFileSystemTestBase +public class ZipFileSystemTest extends AbstractReadOnlyFileSystemTest { public ZipFileSystemTest( String name ) {