You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2006/03/05 17:04:21 UTC
svn commit: r383348 - in
/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer:
AbstractDeployerTestCase.java
filemanager/NontransactionalFileManagerTest.java
Author: reinhard
Date: Sun Mar 5 08:04:19 2006
New Revision: 383348
URL: http://svn.apache.org/viewcvs?rev=383348&view=rev
Log:
make tests work again in reactor build (this Maven bug gets more and more annoying ...)
Modified:
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java
cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/filemanager/NontransactionalFileManagerTest.java
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java?rev=383348&r1=383347&r2=383348&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/AbstractDeployerTestCase.java Sun Mar 5 08:04:19 2006
@@ -28,8 +28,8 @@
public abstract class AbstractDeployerTestCase extends TestCase {
- public final static String MOCKS_DIR = "src/test/mocks";
- public final static String OUTPUT_DIR = "target/test";
+ private final static String MOCKS_DIR = "src/test/mocks";
+ private final static String OUTPUT_DIR = "target/test";
/**
* Code that is executed for each test.
@@ -46,14 +46,17 @@
* @return the artifact as <code>java.io.File</code>
*/
public File getMockArtefact(String artifact) {
+ return new File(getMockDirectory(), artifact);
+ }
+
+ public File getMockDirectory() {
String basedir = System.getProperty("basedir");
if(basedir != null || "".equals(basedir)) {
basedir = basedir + File.separator;
} else {
basedir = "." + File.separator;
}
- System.out.println("basedir: " + basedir + MOCKS_DIR + ", artifact=" + artifact);
- return new File(basedir + MOCKS_DIR, artifact);
+ return new File(basedir, MOCKS_DIR);
}
/**
Modified: cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/filemanager/NontransactionalFileManagerTest.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/filemanager/NontransactionalFileManagerTest.java?rev=383348&r1=383347&r2=383348&view=diff
==============================================================================
--- cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/filemanager/NontransactionalFileManagerTest.java (original)
+++ cocoon/trunk/cocoon-block-deployer/cocoon-deployer-core/src/test/java/org/apache/cocoon/deployer/filemanager/NontransactionalFileManagerTest.java Sun Mar 5 08:04:19 2006
@@ -29,7 +29,7 @@
private static final String NOT_EXISTING_RESOURCE = "lib-01/lib-01.jar_______";
public void testWrite() throws Exception {
- File basedir = new File(AbstractDeployerTestCase.OUTPUT_DIR, "/xyz/abc");
+ File basedir = new File(this.getMockDirectory(), "/xyz/abc");
String fileName = "x.txt";
FileManager fm = new NontransactionalFileManager(basedir.toURI());
@@ -43,14 +43,12 @@
}
public void testRead() throws Exception {
- File basedir = new File(this.MOCKS_DIR);
- InputStream is = new NontransactionalFileManager(basedir.toURI()).readResource(EXISTING_RESOURCE);
+ InputStream is = new NontransactionalFileManager(this.getMockDirectory().toURI()).readResource(EXISTING_RESOURCE);
}
public void testReadNotExistingFile() throws Exception {
- File basedir = new File(this.MOCKS_DIR);
try {
- InputStream is = new NontransactionalFileManager(basedir.toURI()).readResource(NOT_EXISTING_RESOURCE);
+ InputStream is = new NontransactionalFileManager(this.getMockDirectory().toURI()).readResource(NOT_EXISTING_RESOURCE);
fail("A non-existing file has to throw an exception.");
} catch(FileManagerException fme) {
// expected