core/behaviour/src/net/sf/cotta/CottaTestCase.java core/behaviour/src/net/sf/cotta/acceptance/InputFileChannelTestCase.java core/behaviour/src/net/sf/cotta/acceptance/TfsTestCase.java core/behaviour/src/net/sf/cotta/physical/PhysicalFileSystemTestCase.java ftp/behaviour/src/net/sf/cotta/ftp/FtpTestCase.java lib/jsch/jsch-0.1.40.jar lib/jsch/jsch-0.1.40.zip scp/scp.iml testbase/src/net/sf/cotta/test/TestCase.java testbase/test/net/sf/cotta/test/TestCaseTest.java @@ -1,6 +1,6 @@ -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; -public class CottaTest extends TestBase { +public class CottaTest extends TestCase { public void testReportInfoOnMain() throws Exception { Cotta.main(new String[0]); } core/behaviour/src/CottaTest.java @@ -1,12 +1,12 @@ package net.sf.cotta; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; import java.util.ArrayList; import java.util.List; -public class AbstractFileVisitorTest extends TestBase { +public class AbstractFileVisitorTest extends TestCase { public void testVisitAllFiles() throws Exception { TFileFactory factory = new TFileFactory(new InMemoryFileSystem()); TDirectory directory = factory.dir("/one/two"); core/behaviour/src/net/sf/cotta/AbstractFileVisitorTest.java @@ -1,8 +1,8 @@ package net.sf.cotta; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; -public class ByteArrayIndexOutOfBoundsExceptionTest extends TestBase { +public class ByteArrayIndexOutOfBoundsExceptionTest extends TestCase { public void testProvideProperMessage() throws Exception { ByteArrayIndexOutOfBoundsException exception = new ByteArrayIndexOutOfBoundsException(1, 9); ensure.that(exception).message().eq("Position <1> is out of the bound <9>"); core/behaviour/src/net/sf/cotta/ByteArrayIndexOutOfBoundsExceptionTest.java @@ -2,7 +2,7 @@ package net.sf.cotta; import net.sf.cotta.test.assertion.CodeBlock; -public class CatastrophicFileSystemTest extends CottaTestBase { +public class CatastrophicFileSystemTest extends CottaTestCase { public void testThrowExceptionsWhenDiskFull() throws Exception { final CatastrophicFileSystem fileSystem = new CatastrophicFileSystem(); fileSystem.diskFull(); core/behaviour/src/net/sf/cotta/CatastrophicFileSystemTest.java @@ -7,7 +7,7 @@ import org.jmock.Mockery; import java.io.ByteArrayInputStream; import java.io.InputStream; -public class ControlledFileSystemTest extends CottaTestBase { +public class ControlledFileSystemTest extends CottaTestCase { public void testNotAllowUpdateOnNotPermittedDirectories() throws Exception { FileSystem fileSystem = fileSystemForTmp(); fileSystem.createDir(TPath.parse("tmp/sub")); core/behaviour/src/net/sf/cotta/ControlledFileSystemTest.java @@ -1,11 +1,11 @@ package net.sf.cotta; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; // testused to do nothing but boost coverage to deprecated classes @SuppressWarnings({"deprecation"}) -public class CoverageOrientedTest extends TestBase { +public class CoverageOrientedTest extends TestCase { public void testHandleClassPath() throws Exception { TFileFactory factory = new TFileFactory(new InMemoryFileSystem()); new net.sf.cotta.utils.ClassPath(factory.file("one/two.txt")); core/behaviour/src/net/sf/cotta/CoverageOrientedTest.java @@ -3,13 +3,13 @@ package net.sf.cotta; import net.sf.cotta.io.IoFactory; import net.sf.cotta.io.OutputMode; import net.sf.cotta.io.StreamFactory; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; import org.jmock.Expectations; import org.jmock.Mockery; import java.io.*; -public class IoFactoryTest extends TestBase { +public class IoFactoryTest extends TestCase { private Mockery context; public void beforeMethod() throws Exception { core/behaviour/src/net/sf/cotta/IoFactoryTest.java @@ -9,7 +9,7 @@ import org.jmock.Mockery; import java.io.*; -public class IoManagerTest extends CottaTestBase { +public class IoManagerTest extends CottaTestCase { private Mockery context; public void beforeMethod() throws Exception { core/behaviour/src/net/sf/cotta/IoManagerTest.java @@ -1,9 +1,9 @@ package net.sf.cotta; import net.sf.cotta.io.OutputMode; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; -public class OutputModeTest extends TestBase { +public class OutputModeTest extends TestCase { public void testBeAppendingMode() throws Exception { ensure.that(OutputMode.APPEND.isAppend()).eq(true); } core/behaviour/src/net/sf/cotta/OutputModeTest.java @@ -2,7 +2,7 @@ package net.sf.cotta; import net.sf.cotta.io.IoResource; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.physical.PhysicalFileSystemTestBase; +import net.sf.cotta.physical.PhysicalFileSystemTestCase; import net.sf.cotta.test.assertion.CodeBlock; import net.sf.cotta.zip.ZipFileSystem; import org.jmock.Expectations; @@ -11,7 +11,7 @@ import org.jmock.Mockery; import java.io.File; import java.io.IOException; -public class TDirectoryTest extends PhysicalFileSystemTestBase { +public class TDirectoryTest extends PhysicalFileSystemTestCase { public void testExistAfterCreate() throws Exception { //Given TFileFactory factory = factory(); core/behaviour/src/net/sf/cotta/TDirectoryTest.java @@ -1,14 +1,14 @@ package net.sf.cotta; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.physical.PhysicalFileSystemTestBase; +import net.sf.cotta.physical.PhysicalFileSystemTestCase; import net.sf.cotta.test.assertion.CodeBlock; import java.io.File; import java.net.MalformedURLException; import java.net.URL; -public class TFileFactoryTest extends PhysicalFileSystemTestBase { +public class TFileFactoryTest extends PhysicalFileSystemTestCase { public void testEncodingForConstructor() { TFileFactory factory = new TFileFactory(new InMemoryFileSystem()); core/behaviour/src/net/sf/cotta/TFileFactoryTest.java @@ -9,7 +9,7 @@ import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; -public class TFileTest extends CottaTestBase { +public class TFileTest extends CottaTestCase { public void testBeCreatedWithCorrectNameAndNotExists() throws Exception { TFile file = file("name.txt"); core/behaviour/src/net/sf/cotta/TFileTest.java @@ -3,7 +3,7 @@ package net.sf.cotta; import net.sf.cotta.test.assertion.CodeBlock; import net.sf.cotta.test.assertion.ExceptionAssert; -public class TPathTest extends CottaTestBase { +public class TPathTest extends CottaTestCase { public void testNotAllowNullPathString() throws Exception { ExceptionAssert actualException = runAndCatch(IllegalArgumentException.class, new CodeBlock() { public void execute() throws Exception { core/behaviour/src/net/sf/cotta/TPathTest.java @@ -3,7 +3,7 @@ package net.sf.cotta.acceptance; import net.sf.cotta.FileSystem; import net.sf.cotta.memory.InMemoryFileSystem; -public class InMemoryInputFileChannelTest extends InputFileChannelTestBase { +public class InMemoryInputFileChannelTest extends InputFileChannelTestCase { protected FileSystem fileSystem() { return new InMemoryFileSystem(); } core/behaviour/src/net/sf/cotta/acceptance/InMemoryInputFileChannelTest.java @@ -3,7 +3,7 @@ package net.sf.cotta.acceptance; import net.sf.cotta.FileSystem; import net.sf.cotta.memory.InMemoryFileSystem; -public class InMemoryTfsTest extends TfsTestBase { +public class InMemoryTfsTest extends TfsTestCase { protected FileSystem fileSystem() { return new InMemoryFileSystem(); } core/behaviour/src/net/sf/cotta/acceptance/InMemoryTfsTest.java @@ -11,7 +11,7 @@ import java.io.IOException; import java.nio.MappedByteBuffer; import java.nio.channels.FileChannel; -public class PhysicalInputFileChannelTest extends InputFileChannelTestBase { +public class PhysicalInputFileChannelTest extends InputFileChannelTestCase { protected FileSystem fileSystem() { return new PhysicalFileSystem(); } core/behaviour/src/net/sf/cotta/acceptance/PhysicalInputFileChannelTest.java @@ -3,7 +3,7 @@ package net.sf.cotta.acceptance; import net.sf.cotta.*; import net.sf.cotta.physical.PhysicalFileSystem; -public class PhysicalTfsTest extends TfsTestBase { +public class PhysicalTfsTest extends TfsTestCase { public void beforeMethod() throws Exception { super.beforeMethod(); core/behaviour/src/net/sf/cotta/acceptance/PhysicalTfsTest.java @@ -1,13 +1,13 @@ package net.sf.cotta.io; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import org.jmock.Expectations; import org.jmock.Mockery; import java.io.ByteArrayOutputStream; import java.io.IOException; -public class OutputManagerTest extends CottaTestBase { +public class OutputManagerTest extends CottaTestCase { public Mockery context = new Mockery(); public void testDelegateToStreamFactory() throws Exception { core/behaviour/src/net/sf/cotta/io/OutputManagerTest.java @@ -1,11 +1,11 @@ package net.sf.cotta.memory; import net.sf.cotta.ByteArrayIndexOutOfBoundsException; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import java.nio.ByteBuffer; -public class ByteArrayBufferTest extends CottaTestBase { +public class ByteArrayBufferTest extends CottaTestCase { public void testProvideToByteArray() throws Exception { ByteArrayBuffer buffer = new ByteArrayBuffer("test".getBytes()); core/behaviour/src/net/sf/cotta/memory/ByteArrayBufferTest.java @@ -1,6 +1,6 @@ package net.sf.cotta.memory; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import net.sf.cotta.PathSeparator; import net.sf.cotta.TDirectory; import net.sf.cotta.TDirectoryNotFoundException; @@ -20,7 +20,7 @@ import java.util.Date; import java.util.HashSet; import java.util.Set; -public class InMemoryFileSystemTest extends CottaTestBase { +public class InMemoryFileSystemTest extends CottaTestCase { public TFileFactory factory; public InMemoryFileSystem fileSystem; core/behaviour/src/net/sf/cotta/memory/InMemoryFileSystemTest.java @@ -1,6 +1,6 @@ package net.sf.cotta.memory; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import net.sf.cotta.TFile; import net.sf.cotta.TFileFactory; import net.sf.cotta.TIoException; @@ -8,7 +8,7 @@ import net.sf.cotta.TIoException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -public class InMemoryInputFileChannelTest extends CottaTestBase { +public class InMemoryInputFileChannelTest extends CottaTestCase { private InMemoryFileSystem fileSystem; public void beforeMethod() throws Exception { core/behaviour/src/net/sf/cotta/memory/InMemoryInputFileChannelTest.java @@ -1,10 +1,10 @@ package net.sf.cotta.memory; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import java.nio.ByteBuffer; -public class InMemoryOutputFileChannelTest extends CottaTestBase { +public class InMemoryOutputFileChannelTest extends CottaTestCase { public void testWrite() throws Exception { InMemoryOutputFileChannel channel = new InMemoryOutputFileChannel(new ByteArrayBuffer()); ByteBuffer buffer = ByteBuffer.allocate(4); core/behaviour/src/net/sf/cotta/memory/InMemoryOutputFileChannelTest.java @@ -1,13 +1,13 @@ package net.sf.cotta.memory; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import net.sf.cotta.TPath; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class ListingOrderTest extends CottaTestBase { +public class ListingOrderTest extends CottaTestCase { public void testHaveNullDoingNothing() throws Exception { TPath a = TPath.parse("/z/a"); TPath b = TPath.parse("/m/b"); core/behaviour/src/net/sf/cotta/memory/ListingOrderTest.java @@ -11,7 +11,7 @@ import java.io.File; import java.io.OutputStream; import java.util.Date; -public class PhysicalFileSystemTest extends PhysicalFileSystemTestBase { +public class PhysicalFileSystemTest extends PhysicalFileSystemTestCase { public void testCreateAndDeleteDirectory() throws Exception { TPath tmp = TPath.parse("tmp"); core/behaviour/src/net/sf/cotta/physical/PhysicalFileSystemTest.java @@ -1,9 +1,9 @@ package net.sf.cotta.test; import junit.framework.TestSuite; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; -public class TestLoaderTest extends CottaTestBase { +public class TestLoaderTest extends CottaTestCase { public void testLoadingTests() { TestLoader loader = new TestLoader(getClass()); TestSuite suite = loader.loadTests(); core/behaviour/src/net/sf/cotta/test/TestLoaderTest.java @@ -1,11 +1,11 @@ package net.sf.cotta.utils; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import net.sf.cotta.TDirectory; import net.sf.cotta.TFile; import net.sf.cotta.test.assertion.CodeBlock; -public class ClassPathEntryLocatorTest extends CottaTestBase { +public class ClassPathEntryLocatorTest extends CottaTestCase { public void testLocateClassInDirectory() throws Exception { TDirectory directory = new ClassPathEntryLocator(ClassPathEntryLocator.class).locateEntry().openAsDirectory(); TFile file = directory.file("net/sf/cotta/utils/ClassPathEntryLocator.class"); core/behaviour/src/net/sf/cotta/utils/ClassPathEntryLocatorTest.java @@ -4,7 +4,7 @@ import net.sf.cotta.TDirectory; import net.sf.cotta.TFile; import net.sf.cotta.TFileFactory; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; import org.hamcrest.Matchers; import java.io.File; @@ -12,7 +12,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; -public class ClassPathEntryTest extends TestBase { +public class ClassPathEntryTest extends TestCase { private TFileFactory factory = new TFileFactory(new InMemoryFileSystem()); public void testTakeDirectoryOnlyAsDirectory() throws Exception { core/behaviour/src/net/sf/cotta/utils/ClassPathEntryTest.java @@ -1,6 +1,6 @@ package net.sf.cotta.utils; -import net.sf.cotta.CottaTestBase; +import net.sf.cotta.CottaTestCase; import net.sf.cotta.TDirectory; import net.sf.cotta.TIoException; import net.sf.cotta.test.assertion.CodeBlock; @@ -8,7 +8,7 @@ import net.sf.cotta.test.assertion.CodeBlock; import java.io.ByteArrayOutputStream; import java.io.PrintStream; -public class ProductInfoTest extends CottaTestBase { +public class ProductInfoTest extends CottaTestCase { public void testLoadWithThePathPointingToClass() throws Exception { ProductInfo productInfo = ProductInfo.forClass(ProductInfo.class); TDirectory directory = productInfo.loadedPath().openAsDirectory(); core/behaviour/src/net/sf/cotta/utils/ProductInfoTest.java @@ -11,7 +11,7 @@ import net.sf.cotta.utils.ClassPathType; import java.io.*; -public class ZipFileSystemTest extends CottaTestBase { +public class ZipFileSystemTest extends CottaTestCase { private FileSystem zip; private File workingZipFile; private static final String TEST_TXT_CONTENT = "sub"; core/behaviour/src/net/sf/cotta/zip/ZipFileSystemTest.java @@ -6,6 +6,7 @@ <sourceFolder url="file://$MODULE_DIR$/behaviour/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/behaviour/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/bin" /> <excludeFolder url="file://$MODULE_DIR$/build" /> </content> <orderEntry type="inheritedJdk" /> core/core.iml @@ -1,11 +1,22 @@ package net.sf.cotta; public interface TDirectoryFilter { - TDirectoryFilter ALL = new TDirectoryFilter() { + public static final TDirectoryFilter ALL = new TDirectoryFilter() { public boolean accept(TDirectory directory) { return true; } }; + public static final TDirectoryFilter NULL = ALL; + + /** + * A filter that filters all files + */ + public static final TDirectoryFilter NONE = new TDirectoryFilter() { + public boolean accept(TDirectory directory) { + return false; + } + }; + boolean accept(TDirectory directory); } core/src/net/sf/cotta/TDirectoryFilter.java @@ -1,11 +1,29 @@ package net.sf.cotta; public interface TFileFilter { - TFileFilter ALL = new TFileFilter() { + /** + * Null value for TFileFilter that accepts all files + */ + public static final TFileFilter NULL = new TFileFilter() { public boolean accept(TFile file) { return true; } }; + /** + * Accept all files + */ + public static final TFileFilter ALL = NULL; + public static final TFileFilter NONE = new TFileFilter() { + public boolean accept(TFile file) { + return false; + } + }; + + /** + * returns true if the file passes the filter + * @param file file + * @return true if the file passes the filter + */ boolean accept(TFile file); } core/src/net/sf/cotta/TFileFilter.java @@ -66,6 +66,9 @@ <entry name="?*.txt" /> </wildcardResourcePatterns> </component> + <component name="CopyrightManager" default=""> + <module2copyright /> + </component> <component name="DependenciesAnalyzeManager"> <option name="myForwardDirection" value="false" /> </component> @@ -295,11 +298,15 @@ <option name="projectName" value="cotta" /> </component> <component name="ProjectFileVersion" converted="true" /> + <component name="ProjectKey"> + <option name="state" value="project://D:\Work\cotta\cotta.ipr" /> + </component> <component name="ProjectModuleManager"> <modules> <module fileurl="file://$PROJECT_DIR$/core/core.iml" filepath="$PROJECT_DIR$/core/core.iml" /> <module fileurl="file://$PROJECT_DIR$/ftp/ftp.iml" filepath="$PROJECT_DIR$/ftp/ftp.iml" /> <module fileurl="file://$PROJECT_DIR$/lib/lib.iml" filepath="$PROJECT_DIR$/lib/lib.iml" /> + <module fileurl="file://$PROJECT_DIR$/scp/scp.iml" filepath="$PROJECT_DIR$/scp/scp.iml" /> <module fileurl="file://$PROJECT_DIR$/testbase/testbase.iml" filepath="$PROJECT_DIR$/testbase/testbase.iml" /> <module fileurl="file://$PROJECT_DIR$/website/website.iml" filepath="$PROJECT_DIR$/website/website.iml" /> </modules> cotta.ipr @@ -12,7 +12,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -public class FtpFileSystemTest extends FtpTestBase { +public class FtpFileSystemTest extends FtpTestCase { private FileSystem fileSystem; ftp/behaviour/src/net/sf/cotta/ftp/FtpFileSystemTest.java @@ -3,7 +3,7 @@ package net.sf.cotta.ftp; import net.sf.cotta.TDirectory; import net.sf.cotta.TFileFactory; import net.sf.cotta.memory.InMemoryFileSystem; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; import net.sf.cotta.test.TestFixture; import org.apache.commons.net.ftp.FTPClient; @@ -22,17 +22,17 @@ public class FtpFixture implements TestFixture { ftpServer.stop(); } - public void beforeMethod(TestBase testBase) throws IOException { + public void beforeMethod(TestCase testCase) throws IOException { TFileFactory fileFactory = new TFileFactory(new InMemoryFileSystem()); ftpServer.cleanFileSystem(fileFactory); TDirectory rootDir = fileFactory.dir("/"); - testBase.inject(rootDir); + testCase.inject(rootDir); FTPClient ftpClient = new FTPClient(); ftpClient.connect("localhost", 8021); ftpClient.login("anonymous", "test@test.com"); - testBase.inject(ftpClient); + testCase.inject(ftpClient); } - public void afterMethod(TestBase testBase) { + public void afterMethod(TestCase testCase) { } } ftp/behaviour/src/net/sf/cotta/ftp/FtpFixture.java @@ -3,7 +3,6 @@ package net.sf.cotta.ftp; import net.sf.cotta.TDirectory; import net.sf.cotta.TFileFactory; import net.sf.cotta.TFileNotFoundException; -import net.sf.cotta.ftp.client.commonsNet.CommonsNetFtpClient; import net.sf.cotta.test.assertion.CodeBlock; import net.sf.cotta.io.InputManager; import net.sf.cotta.io.InputProcessor; @@ -14,7 +13,7 @@ import org.apache.commons.net.ftp.FTPClient; import java.io.*; -public class TestFtpServerFileSystemTest extends FtpTestBase { +public class TestFtpServerFileSystemTest extends FtpTestCase { public void testBeAtRootAndNoFileInitially() throws InterruptedException, IOException { String workingDirectory = ftpClient.printWorkingDirectory(); ensure.string(workingDirectory).eq("/"); ftp/behaviour/src/net/sf/cotta/ftp/TestFtpServerFileSystemTest.java @@ -2,12 +2,12 @@ package net.sf.cotta.ftp.client.commonsNet; import net.sf.cotta.TFileNotFoundException; import net.sf.cotta.TPath; -import net.sf.cotta.ftp.FtpTestBase; +import net.sf.cotta.ftp.FtpTestCase; import net.sf.cotta.test.assertion.CodeBlock; import java.io.IOException; -public class CommonsNetFtpClientTest extends FtpTestBase { +public class CommonsNetFtpClientTest extends FtpTestCase { public void testRetrieveInputStream() throws IOException { final CommonsNetFtpClient netFtpClient = new CommonsNetFtpClient(ftpClient); ensure.code(new CodeBlock() { ftp/behaviour/src/net/sf/cotta/ftp/client/commonsNet/CommonsNetFtpClientTest.java @@ -6,6 +6,7 @@ <sourceFolder url="file://$MODULE_DIR$/behaviour/resources" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/behaviour/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/bin" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> ftp/ftp.iml @@ -17,8 +17,8 @@ public class FixtureRepository { return instance; } - void register(TestBase testBase) { - for (Annotation annotation : testBase.getClass().getAnnotations()) { + void register(TestCase testCase) { + for (Annotation annotation : testCase.getClass().getAnnotations()) { Fixture fixtureType = annotation.annotationType().getAnnotation(Fixture.class); if (fixtureType != null) { String fixtureAnnotationName = annotation.annotationType().getName(); @@ -27,7 +27,7 @@ public class FixtureRepository { fixtureWrapper = load(annotation.annotationType().getName() + "Fixture"); envFixtureMap.put(fixtureAnnotationName, fixtureWrapper); } - add(testBase, fixtureWrapper); + add(testCase, fixtureWrapper); } } } @@ -53,8 +53,8 @@ public class FixtureRepository { throw new IllegalArgumentException("fixture class does not implement " + TestFixture.class.getName() + ": " + fixtureClassName); } - private void add(TestBase testBase, FixtureWrapper fixtureWrapper) { - String key = testBase.getClass().getName(); + private void add(TestCase testCase, FixtureWrapper fixtureWrapper) { + String key = testCase.getClass().getName(); Set<FixtureWrapper> fixtureWrapperList = classFixtureMap.get(key); if (fixtureWrapperList == null) { fixtureWrapperList = new HashSet<FixtureWrapper>(); @@ -64,35 +64,35 @@ public class FixtureRepository { fixtureWrapper.increaseCount(); } - public void fixtureSetUp(TestBase testBase) throws Exception { - for (FixtureWrapper info : loadFixture(testBase)) { + public void fixtureSetUp(TestCase testCase) throws Exception { + for (FixtureWrapper info : loadFixture(testCase)) { info.setUp(); } } - private Set<FixtureWrapper> loadFixture(TestBase testBase) { - Set<FixtureWrapper> infos = classFixtureMap.get(testBase.getClass().getName()); + private Set<FixtureWrapper> loadFixture(TestCase testCase) { + Set<FixtureWrapper> infos = classFixtureMap.get(testCase.getClass().getName()); if (infos == null) { infos = Collections.emptySet(); } return infos; } - public void fixtureTearDown(TestBase testBase) throws Exception { - for (FixtureWrapper fixture : loadFixture(testBase)) { + public void fixtureTearDown(TestCase testCase) throws Exception { + for (FixtureWrapper fixture : loadFixture(testCase)) { fixture.tearDown(); } } - public void beforeMethod(TestBase testBase) throws Exception { - for (FixtureWrapper fixture : loadFixture(testBase)) { - fixture.beforeMethod(testBase); + public void beforeMethod(TestCase testCase) throws Exception { + for (FixtureWrapper fixture : loadFixture(testCase)) { + fixture.beforeMethod(testCase); } } - public void afterMethod(TestBase testBase) throws Exception { - for (FixtureWrapper fixture : loadFixture(testBase)) { - fixture.afterMethod(testBase); + public void afterMethod(TestCase testCase) throws Exception { + for (FixtureWrapper fixture : loadFixture(testCase)) { + fixture.afterMethod(testCase); } } } testbase/src/net/sf/cotta/test/FixtureRepository.java @@ -29,11 +29,11 @@ class FixtureWrapper { expectedCalls++; } - public void beforeMethod(TestBase testBase) throws Exception { - fixture.beforeMethod(testBase); + public void beforeMethod(TestCase testCase) throws Exception { + fixture.beforeMethod(testCase); } - public void afterMethod(TestBase testBase) throws Exception { - fixture.afterMethod(testBase); + public void afterMethod(TestCase testCase) throws Exception { + fixture.afterMethod(testCase); } } testbase/src/net/sf/cotta/test/FixtureWrapper.java @@ -5,7 +5,7 @@ public interface TestFixture { void tearDown() throws Exception; - void beforeMethod(TestBase testBase) throws Exception; + void beforeMethod(TestCase testCase) throws Exception; - void afterMethod(TestBase testBase) throws Exception; + void afterMethod(TestCase testCase) throws Exception; } testbase/src/net/sf/cotta/test/TestFixture.java @@ -1,12 +1,10 @@ package net.sf.cotta.test; -import junit.framework.TestCase; - import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.InvocationTargetException; -public class AssertionFactoryTest extends TestBase { +public class AssertionFactoryTest extends TestCase { public void testAllMethodsHaveMatchingThatMethod() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException { AssertionFactory factory = new AssertionFactory(); for (Method method : factory.getClass().getDeclaredMethods()) { testbase/test/net/sf/cotta/test/AssertionFactoryTest.java @@ -1,11 +1,9 @@ package net.sf.cotta.test; -import junit.framework.TestCase; - import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -public class FixtureRepositoryTest extends TestCase { +public class FixtureRepositoryTest extends junit.framework.TestCase { private static AssertionFactory ensure = new AssertionFactory(); private FixtureRepository repository; @@ -45,7 +43,7 @@ public class FixtureRepositoryTest extends TestCase { } @Sample - public static class TestDummy extends TestBase { + public static class TestDummy extends TestCase { } @@ -65,16 +63,16 @@ public class FixtureRepositoryTest extends TestCase { count--; } - public void beforeMethod(TestBase testBase) { + public void beforeMethod(TestCase testCase) { } - public void afterMethod(TestBase testBase) { + public void afterMethod(TestCase testCase) { } } @FixtureClassNotTestFixture - public static class TestWithAnnotationProblem extends TestBase { + public static class TestWithAnnotationProblem extends TestCase { } @Retention(RetentionPolicy.RUNTIME) testbase/test/net/sf/cotta/test/FixtureRepositoryTest.java @@ -1,8 +1,8 @@ package net.sf.cotta.test.assertion; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; -public class IntegerAssertTest extends TestBase { +public class IntegerAssertTest extends TestCase { public void testLessThan() { new IntegerAssert(5).lessThan(6); } testbase/test/net/sf/cotta/test/assertion/IntegerAssertTest.java @@ -1,8 +1,8 @@ package net.sf.cotta.test.assertion; -import net.sf.cotta.test.TestBase; +import net.sf.cotta.test.TestCase; -public class ObjectAssertTest extends TestBase { +public class ObjectAssertTest extends TestCase { public void testDescribeAs() { Object instance = new Object(); final ObjectAssert<Object> assertion = new ObjectAssert<Object>(instance).describedAs("description"); testbase/test/net/sf/cotta/test/assertion/ObjectAssertTest.java @@ -5,6 +5,7 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> + <excludeFolder url="file://$MODULE_DIR$/bin" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> testbase/testbase.iml core/behaviour/src/net/sf/cotta/CottaTestBase.java core/behaviour/src/net/sf/cotta/acceptance/InputFileChannelTestBase.java core/behaviour/src/net/sf/cotta/acceptance/TfsTestBase.java core/behaviour/src/net/sf/cotta/physical/PhysicalFileSystemTestBase.java ftp/behaviour/src/net/sf/cotta/ftp/FtpTestBase.java testbase/src/net/sf/cotta/test/TestBase.java testbase/test/net/sf/cotta/test/TestBaseTest.java 343a67b975b2147009df20026d41c49af5370172 wolfdancer wolfdancer@gmail.com http://github.com/wolfdancer/cotta/commit/d19e060b984beace86c535e8a4c8e00a716f6ceb d19e060b984beace86c535e8a4c8e00a716f6ceb 2009-01-30T21:24:07-08:00 2009-01-30T21:24:07-08:00 use testcase as the name f74343f22f2f9be82a06375fac2fed246c771868 wolfdancer wolfdancer@gmail.com