incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1361849 - in /incubator/ooo/trunk/main/test/testoo/src/testlib: AppUtil.java Log.java Testspace.java
Date Mon, 16 Jul 2012 00:35:25 GMT
Author: liuzhe
Date: Mon Jul 16 00:35:25 2012
New Revision: 1361849

URL: http://svn.apache.org/viewvc?rev=1361849&view=rev
Log:
Move Testspace into testcommon.

Removed:
    incubator/ooo/trunk/main/test/testoo/src/testlib/Testspace.java
Modified:
    incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java
    incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java

Modified: incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java?rev=1361849&r1=1361848&r2=1361849&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java (original)
+++ incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java Mon Jul 16 00:35:25 2012
@@ -24,11 +24,10 @@
 package testlib;
 import static testlib.UIMap.*;
 
-import java.io.File;
-
 import org.openoffice.test.common.Condition;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.SystemUtil;
+import org.openoffice.test.common.Testspace;
 import org.openoffice.test.vcl.Tester;
 import org.openoffice.test.vcl.widgets.VclWindow;
 
@@ -83,16 +82,10 @@ public class AppUtil extends Tester {
 	 * @return a absolute path on the local
 	 */
 	public static String testFile(String path) {
-		File source = new File("data", path);
-		File target = Testspace.getFile("data/" + path);
-		FileUtil.copyFile(source, target);
-		return target.getAbsolutePath();
+		return Testspace.prepareData(path);
 	}
 	
 	public static String fullPath(String relativePath) {
-		File file = new File(relativePath);
-		if (file.isAbsolute())
-			return relativePath;
 		return Testspace.getPath(relativePath);
 	}
 	

Modified: incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java?rev=1361849&r1=1361848&r2=1361849&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java (original)
+++ incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java Mon Jul 16 00:35:25 2012
@@ -32,6 +32,7 @@ import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
 import org.openoffice.test.OpenOffice;
 import org.openoffice.test.common.GraphicsUtil;
+import org.openoffice.test.common.Testspace;
 import org.openoffice.test.vcl.client.CommunicationException;
 
 /**



Mime
View raw message