commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r485757 - in /jakarta/commons/proper/vfs/trunk: ./ core/src/test/java/org/apache/commons/ core/src/test/java/org/apache/commons/vfs/ core/src/test/java/org/apache/commons/vfs/provider/res/test/
Date Mon, 11 Dec 2006 17:14:32 GMT
Author: imario
Date: Mon Dec 11 09:14:29 2006
New Revision: 485757

URL: http://svn.apache.org/viewvc?view=rev&rev=485757
Log:
make ResourceProviderTestCase work

Modified:
    jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
    jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/RunTest.java
    jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/res/test/ResourceProviderTestCase.java
    jakarta/commons/proper/vfs/trunk/project.properties

Modified: jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java?view=diff&rev=485757&r1=485756&r2=485757
==============================================================================
--- jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
(original)
+++ jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/AbstractVfsTestCase.java
Mon Dec 11 09:14:29 2006
@@ -109,17 +109,14 @@
     public static String getTestDirectory()
     {
         return System.getProperty("test.basedir");
-        /*
-        if (baseDir == null)
-        {
-            final String baseDirProp = System.getProperty("test.basedir");
-            baseDir = getCanonicalFile(new File(baseDirProp));
-        }
-        return baseDir;
-        */
     }
 
-    /**
+	public static String getResourceTestDirectory()
+	{
+		return System.getProperty("test.basedir.res");
+	}
+
+	/**
      * Locates a test directory, creating it if it does not exist.
      *
      * @param name path of the directory, relative to this test's base directory.

Modified: jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/RunTest.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/RunTest.java?view=diff&rev=485757&r1=485756&r2=485757
==============================================================================
--- jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/RunTest.java
(original)
+++ jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/RunTest.java
Mon Dec 11 09:14:29 2006
@@ -49,6 +49,7 @@
 		Properties props = System.getProperties();
 		props.setProperty("test.data.src", "src/test-data");
 		props.setProperty("test.basedir", "core/target/test-data");
+		props.setProperty("test.basedir.res", "test-data");
 		props.setProperty("test.policy", "src/test-data/test.policy");
 		props.setProperty("test.secure", "false");
 		props.setProperty("test.smb.uri",
@@ -67,31 +68,31 @@
 
 		// LocalProviderTestCase.suite(),
 			
-		FtpProviderTestCase.suite(),
+		// FtpProviderTestCase.suite(),
 
-		UrlProviderHttpTestCase.suite(),
+		// UrlProviderHttpTestCase.suite(),
 
-		VirtualProviderTestCase.suite(),
-		TemporaryProviderTestCase.suite(),
-		UrlProviderTestCase.suite(),
-		// ResourceProviderTestCase.suite(),
+		// VirtualProviderTestCase.suite(),
+		// TemporaryProviderTestCase.suite(),
+		// UrlProviderTestCase.suite(),
+		ResourceProviderTestCase.suite(),
 
-		HttpProviderTestCase.suite(),
+		// HttpProviderTestCase.suite(),
 
 		// WebdavProviderTestCase.suite(),
 
-		SftpProviderTestCase.suite(),
+		// SftpProviderTestCase.suite(),
 
-		JarProviderTestCase.suite(),
-		NestedJarTestCase.suite(),
-		ZipProviderTestCase.suite(),
-		NestedZipTestCase.suite(),
-		TarProviderTestCase.suite(),
-		TgzProviderTestCase.suite(),
-		Tbz2ProviderTestCase.suite(),
-		NestedTarTestCase.suite(),
-		NestedTgzTestCase.suite(),
-		NestedTbz2TestCase.suite(),
+		// JarProviderTestCase.suite(),
+//		NestedJarTestCase.suite(),
+//		ZipProviderTestCase.suite(),
+//		NestedZipTestCase.suite(),
+//		TarProviderTestCase.suite(),
+//		TgzProviderTestCase.suite(),
+//		Tbz2ProviderTestCase.suite(),
+//		NestedTarTestCase.suite(),
+//		NestedTgzTestCase.suite(),
+//		NestedTbz2TestCase.suite(),
 		};
 
 		TestResult result = new TestResult()

Modified: jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/res/test/ResourceProviderTestCase.java
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/res/test/ResourceProviderTestCase.java?view=diff&rev=485757&r1=485756&r2=485757
==============================================================================
--- jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/res/test/ResourceProviderTestCase.java
(original)
+++ jakarta/commons/proper/vfs/trunk/core/src/test/java/org/apache/commons/vfs/provider/res/test/ResourceProviderTestCase.java
Mon Dec 11 09:14:29 2006
@@ -58,7 +58,7 @@
     public FileObject getBaseTestFolder(FileSystemManager manager)
         throws Exception
     {
-        String baseDir = AbstractVfsTestCase.getTestDirectory();
+        String baseDir = AbstractVfsTestCase.getResourceTestDirectory();
         return manager.resolveFile("res:" + baseDir);
     }
 }

Modified: jakarta/commons/proper/vfs/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/vfs/trunk/project.properties?view=diff&rev=485757&r1=485756&r2=485757
==============================================================================
--- jakarta/commons/proper/vfs/trunk/project.properties (original)
+++ jakarta/commons/proper/vfs/trunk/project.properties Mon Dec 11 09:14:29 2006
@@ -48,7 +48,7 @@
 maven.repo.apache.snapshots=scp://people.apache.org
 maven.repo.apache.snapshots.directory=/www/people.apache.org/repository
 maven.junit.fork = true
-maven.junit.sysproperties = test.basedir test.ftp.uri test.smb.uri test.webdav.uri test.sftp.uri
test.http.uri
+maven.junit.sysproperties = test.basedir test.basedir.res test.ftp.uri test.smb.uri test.webdav.uri
test.sftp.uri test.http.uri
 maven.junit.jvmargs = -Xss8192k
 maven.test.failure.ignore=true
 maven.ant.excludeTests=**/*.java
@@ -59,7 +59,8 @@
 test.path=/vfstest
 
 test.data.src=${maven.src.dir}/../core/src/test/test-data
-test.basedir=${maven.build.dir}/test-data
+test.basedir=${maven.build.dir}/test-classes/test-data
+test.basedir.res=test-data
 test.policy=${maven.test.data.src}/test.policy
 test.secure=false
 test.smb.uri=smb://${test.user}:${test.password}@${test.hostname}/${test.user}${test.path}



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message