incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1364868 - in /incubator/ooo/trunk/main/test/testoo: ./ source/ source/testcase/ source/testcase/formula/ source/testcase/gui/ source/testcase/gui/formula/ source/testcase/gui/formula/catalog/ source/testcase/gui/formula/elements/ source/te...
Date Tue, 24 Jul 2012 02:00:35 GMT
Author: liuzhe
Date: Tue Jul 24 02:00:32 2012
New Revision: 1364868

URL: http://svn.apache.org/viewvc?rev=1364868&view=rev
Log:
#120352# - Automated Test´╝ÜRename GUI test package name into testcase.gui 

Added:
    incubator/ooo/trunk/main/test/testoo/source/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFileType.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFileType.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFunction.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFunction.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/LongRun.java
      - copied, changed from r1364861, incubator/ooo/trunk/main/test/testoo/src/testcase/LongRun.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SayHelloToOO.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/SayHelloToOO.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SmokeTest.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/SmokeTest.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/TestSample.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/TestSample.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/formula/catalog/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/elements/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/formula/elements/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/formula/importexport/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/performance/benchmark/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/celltext/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/celltext/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/chart/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/ChartDialogSetting.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/chart/ChartDialogSetting.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/datapilot/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/DataPivotTable.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/datapilot/DataPivotTable.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/filter/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/Fitler.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/filter/Fitler.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sheet/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sort/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/SortDialogSetting.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sort/SortDialogSetting.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/subtotals/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogDefaultValue.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogSetting.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogSetting.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValiditySampleFile.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValiditySampleFile.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/HeaderAndFooterSetting.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/
      - copied from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/sw/table/
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/Table.java
      - copied, changed from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sw/table/Table.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/AppUtil.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/CalcUtil.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/CalcUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/ImpressUtil.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/ImpressUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/Log.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/gui/UIMap.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/UIMap.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/
    incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/BVT.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/BVT.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsMS2003.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsMS2003.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsOriginal.java
      - copied, changed from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsOriginal.java
Removed:
    incubator/ooo/trunk/main/test/testoo/source/testcase/BVTFileType.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/BVTFunction.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/LongRun.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/SayHelloToOO.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/SmokeTest.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/TestSample.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/formula/
    incubator/ooo/trunk/main/test/testoo/source/testcase/performance/
    incubator/ooo/trunk/main/test/testoo/source/testcase/presentation/
    incubator/ooo/trunk/main/test/testoo/source/testcase/sc/
    incubator/ooo/trunk/main/test/testoo/source/testcase/sd/
    incubator/ooo/trunk/main/test/testoo/source/testcase/sw/
    incubator/ooo/trunk/main/test/testoo/source/testcase/textdocument/
    incubator/ooo/trunk/main/test/testoo/source/testlib/AppUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/CalcUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/ImpressUtil.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/Log.java
    incubator/ooo/trunk/main/test/testoo/source/testlib/UIMap.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/BVT.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/TestSampleAsMS2003.java
    incubator/ooo/trunk/main/test/testoo/source/testsuite/TestSampleAsOriginal.java
    incubator/ooo/trunk/main/test/testoo/src/
Modified:
    incubator/ooo/trunk/main/test/testoo/.classpath
    incubator/ooo/trunk/main/test/testoo/.project
    incubator/ooo/trunk/main/test/testoo/build.xml
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/Filter.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
    incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java

Modified: incubator/ooo/trunk/main/test/testoo/.classpath
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/.classpath?rev=1364868&r1=1364867&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/.classpath (original)
+++ incubator/ooo/trunk/main/test/testoo/.classpath Tue Jul 24 02:00:32 2012
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="source"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/testcommon"/>
 	<classpathentry kind="lib" path="output/lib/junit.jar"/>

Modified: incubator/ooo/trunk/main/test/testoo/.project
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/.project?rev=1364868&r1=1364867&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/.project (original)
+++ incubator/ooo/trunk/main/test/testoo/.project Tue Jul 24 02:00:32 2012
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>testoo</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>testgui</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Modified: incubator/ooo/trunk/main/test/testoo/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/build.xml?rev=1364868&r1=1364867&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/build.xml (original)
+++ incubator/ooo/trunk/main/test/testoo/build.xml Tue Jul 24 02:00:32 2012
@@ -25,7 +25,7 @@
 <project basedir="." default="test">
 	<property file="build.properties" />
 	<property environment="env" />
-	<property name="src" value="./src" />
+	<property name="src" value="./source" />
 	<property name="out" value="output"/>
 	<property name="classes" value="${out}/class" />
 	<property name="lib" value="${out}/lib" />
@@ -34,7 +34,7 @@
 	<property name="env.TESTSPACE" value="../testspace" />
 	<property name="junit.home" value="${env.JUNIT_HOME}" />
 	<property name="testspace" value="${env.TESTSPACE}" />
-	<property name="test.classes" value="testsuite/BVT.class" />
+	<property name="test.classes" value="testsuite/gui/BVT.class" />
 	<property name="test.output" value="${testspace}/output" />
 	<property name="test.result" value="${test.output}/result" />
 	<property name="test.report" value="${test.output}/report" />

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFileType.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFileType.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFileType.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFileType.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFileType.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFileType.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFileType.java Tue Jul 24 02:00:32 2012
@@ -24,12 +24,12 @@
 /**
  * 
  */
-package testcase;
-
+package testcase.gui;
+import static org.openoffice.test.common.Testspace.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.awt.Rectangle;
 
@@ -41,8 +41,8 @@ import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.GraphicsUtil;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * 
@@ -97,7 +97,7 @@ public class BVTFileType {
 	}
 	
 	private void saveNewDocument(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		//Create a new text document
 		app.dispatch("private:factory/swriter", 3);
 		sleep(3);
@@ -183,7 +183,7 @@ public class BVTFileType {
 	}
 	
 	private void saveNewSpreadsheet(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		String text = "Hello Openoffice";
 		app.dispatch("private:factory/scalc");
 		calc.waitForExistence(10, 2);
@@ -237,7 +237,7 @@ public class BVTFileType {
 	
 	
 	private void saveNewPresentation(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		String text = "Hello Openoffice";
 		app.dispatch("private:factory/simpress?slot=6686");
 		PresentationWizard.ok();
@@ -315,8 +315,8 @@ public class BVTFileType {
 	 * @throws Exception
 	 */
 	public void saveNewDrawing(String filename) {
-		String saveTo = fullPath("temp/" + filename);
-		String bmp_green = testFile("pure_green_64x64.bmp");
+		String saveTo = getPath("temp/" + filename);
+		String bmp_green = prepareData("pure_green_64x64.bmp");
 		
 		// Create a new drawing document
 		app.dispatch("private:factory/sdraw", 3);
@@ -392,7 +392,7 @@ public class BVTFileType {
 	 * @throws Exception
 	 */
 	public void saveNewMath(String filename) {
-		String saveTo = fullPath("temp/" + filename);
+		String saveTo = getPath("temp/" + filename);
 		
 		// Create a new math
 		app.dispatch("private:factory/smath", 3);

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFunction.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFunction.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFunction.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFunction.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFunction.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/BVTFunction.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/BVTFunction.java Tue Jul 24 02:00:32 2012
@@ -24,12 +24,12 @@
 /**
  * 
  */
-package testcase;
-
+package testcase.gui;
+import static org.openoffice.test.common.Testspace.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.awt.Rectangle;
 import java.io.File;
@@ -41,8 +41,8 @@ import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.GraphicsUtil;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * 
@@ -66,8 +66,8 @@ public class BVTFunction {
 	
 	@Test
 	public void testExportAsPDF() throws Exception  {
-		String file = testFile("export_pdf.odt");
-		String exportTo = fullPath("temp/odt.pdf");
+		String file = prepareData("export_pdf.odt");
+		String exportTo = getPath("temp/odt.pdf");
 		
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
@@ -158,8 +158,8 @@ public class BVTFunction {
 	 
 	@Test
 	public void testInsertPictureInDocument() throws Exception {
-		String bmp_green = testFile("pure_green_64x64.bmp");
-		String bmp_red = testFile("pure_red_64x64.bmp");
+		String bmp_green = prepareData("pure_green_64x64.bmp");
+		String bmp_red = prepareData("pure_red_64x64.bmp");
 		
 		//Create a new text document
 		app.dispatch("private:factory/swriter", 3);
@@ -192,8 +192,8 @@ public class BVTFunction {
 
 	@Test
 	public void testInsertPictureInSpreadsheet() throws Exception {
-		String bmp_green = testFile("pure_green_64x64.bmp");
-		String bmp_red = testFile("pure_red_64x64.bmp");
+		String bmp_green = prepareData("pure_green_64x64.bmp");
+		String bmp_red = prepareData("pure_red_64x64.bmp");
 		
 		//Create a new text document
 		app.dispatch("private:factory/scalc", 3);
@@ -225,8 +225,8 @@ public class BVTFunction {
 	
 	@Test
 	public void testInsertPictureInPresentation() throws Exception {
-		String bmp_green = testFile("pure_green_64x64.bmp");
-		String bmp_red = testFile("pure_red_64x64.bmp");
+		String bmp_green = prepareData("pure_green_64x64.bmp");
+		String bmp_red = prepareData("pure_red_64x64.bmp");
 		
 		//Create a new text document
 		app.dispatch("private:factory/simpress?slot=6686");
@@ -259,7 +259,7 @@ public class BVTFunction {
 	
 	@Test
 	public void testSlideShow() throws Exception {
-		String file = testFile("slideshow.odp");
+		String file = prepareData("slideshow.odp");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		impress.waitForExistence(10, 2);
@@ -286,7 +286,7 @@ public class BVTFunction {
 	
 	@Test
 	public void testFind() {
-		String file = testFile("find.odt");
+		String file = prepareData("find.odt");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		writer.waitForExistence(10, 2);
@@ -426,7 +426,7 @@ public class BVTFunction {
 				{ "$123.00" }, { "$200.00" }, { "$400.00" }, { "$10,000.00" },
 
 		};
-		String file = testFile("sort.ods");
+		String file = prepareData("sort.ods");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/LongRun.java (from r1364861, incubator/ooo/trunk/main/test/testoo/src/testcase/LongRun.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/LongRun.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/LongRun.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/LongRun.java&r1=1364861&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/LongRun.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/LongRun.java Tue Jul 24 02:00:32 2012
@@ -19,11 +19,12 @@
  * 
  *************************************************************/
 
-package testcase;
+package testcase.gui;
+import static org.openoffice.test.common.Testspace.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
@@ -43,8 +44,8 @@ import org.openoffice.test.common.Graphi
 import org.openoffice.test.common.SystemUtil;
 import org.openoffice.test.common.Testspace;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 public class LongRun {
 	
@@ -134,7 +135,7 @@ public class LongRun {
 	}
 
 	private void saveNewDocument(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		// Create a new text document
 		writer.menuItem("File->New->Text Document").select();
 		sleep(3);
@@ -188,7 +189,7 @@ public class LongRun {
 	}
 
 	private void saveNewSpreadsheet(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		String text = "Hello Openoffice";
 		writer.menuItem("File->New->Spreadsheet").select();
 		calc.waitForExistence(10, 2);
@@ -212,7 +213,7 @@ public class LongRun {
 	}
 
 	private void saveNewPresentation(String file) {
-		String saveTo = fullPath("temp/" + file);
+		String saveTo = getPath("temp/" + file);
 		String text = "Hello Openoffice";
 		writer.menuItem("File->New->Presentation").select();
 		PresentationWizard.ok();
@@ -259,8 +260,8 @@ public class LongRun {
 	 * @throws Exception
 	 */
 	public void saveNewDrawing(String filename) {
-		String saveTo = fullPath("temp/" + filename);
-		String bmp_green = testFile("pure_green_64x64.bmp");
+		String saveTo = getPath("temp/" + filename);
+		String bmp_green = prepareData("pure_green_64x64.bmp");
 
 		// Create a new drawing document
 		writer.menuItem("File->New->Drawing").select();
@@ -315,7 +316,7 @@ public class LongRun {
 	 * @throws Exception
 	 */
 	public void saveNewMath(String filename) {
-		String saveTo = fullPath("temp/" + filename);
+		String saveTo = getPath("temp/" + filename);
 
 		// Create a new math
 		writer.menuItem("File->New->Formula").select();

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SayHelloToOO.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/SayHelloToOO.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SayHelloToOO.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SayHelloToOO.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/SayHelloToOO.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/SayHelloToOO.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SayHelloToOO.java Tue Jul 24 02:00:32 2012
@@ -21,19 +21,19 @@
 
 
 
-package testcase;
+package testcase.gui;
 
 import static org.junit.Assert.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * Before running the testing class, you need specify the AOO location firstly with system property openoffice.home.

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SmokeTest.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/SmokeTest.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SmokeTest.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SmokeTest.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/SmokeTest.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/SmokeTest.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/SmokeTest.java Tue Jul 24 02:00:32 2012
@@ -21,12 +21,13 @@
 
 
 
-package testcase;
+package testcase.gui;
 
+import static org.openoffice.test.common.Testspace.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.FileUtil.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.io.File;
 
@@ -35,7 +36,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import testlib.Log;
+import testlib.gui.Log;
 
 public class SmokeTest {
 
@@ -58,8 +59,8 @@ public class SmokeTest {
 	
 	@Test
 	public void testMacro() {
-		testFile("TestExtension.oxt");
-		String file = testFile("smoketestdoc.sxw");
+		prepareData("TestExtension.oxt");
+		String file = prepareData("smoketestdoc.sxw");
 		// Open sample file smoketestdoc.sxw
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/TestSample.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testcase/TestSample.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/TestSample.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/TestSample.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/TestSample.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/TestSample.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/TestSample.java Tue Jul 24 02:00:32 2012
@@ -21,12 +21,12 @@
 
 
 
-package testcase;
-
+package testcase.gui;
 
+import static org.openoffice.test.common.Testspace.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -44,8 +44,8 @@ import org.junit.runners.Parameterized.P
 import org.openoffice.test.common.Condition;
 import org.openoffice.test.common.FileUtil;
 
-import testlib.ImpressUtil;
-import testlib.Log;
+import testlib.gui.ImpressUtil;
+import testlib.gui.Log;
 
 
 @RunWith(Parameterized.class)
@@ -119,20 +119,20 @@ public class TestSample {
 	public void setUp() {
 		app.start();
 		
-		FileUtil.deleteFile(fullPath("temp"));
-		File temp = new File(fullPath("temp"));
+		FileUtil.deleteFile(getPath("temp"));
+		File temp = new File(getPath("temp"));
 		temp.mkdirs();
 		LOG.info("Load sample file from \"" + originalFile.getAbsolutePath() + "\"");
 		file = new File(temp + "/origin", "sample." + FileUtil.getFileExtName(originalFile.getName()) /*file.getName()*/);
 		FileUtil.copyFile(originalFile, file); // We use the copy to do test
-		saveTo = fullPath("temp/" + file.getName() + (saveas == null ? "": "." + saveas));
+		saveTo = getPath("temp/" + file.getName() + (saveas == null ? "": "." + saveas));
 	}
 
 	@After
 	public void tearDown() {
 		if (!passed) {
 			// Collect the failed sample files.
-			File failedDir = new File(fullPath("output/TestSample.Failed"));
+			File failedDir = new File(getPath("output/TestSample.Failed"));
 			FileUtil.copyFile(originalFile, new File(failedDir, originalFile.getName()));
 		}
 	}

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java Tue Jul 24 02:00:32 2012
@@ -24,16 +24,17 @@
 /**
  * 
  */
-package testcase.formula.catalog;
+package testcase.gui.formula.catalog;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 /**
  *

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java Tue Jul 24 02:00:32 2012
@@ -24,16 +24,17 @@
 /**
  * 
  */
-package testcase.formula.catalog;
+package testcase.gui.formula.catalog;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 /**
  *

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java Tue Jul 24 02:00:32 2012
@@ -24,17 +24,19 @@
 /**
  * 
  */
-package testcase.formula.importexport;
+package testcase.gui.formula.importexport;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
-import testlib.Log;
+import org.openoffice.test.common.Testspace;
+
+import testlib.gui.Log;
 
 /**
  *
@@ -86,7 +88,7 @@ public class CreateFormulaInDifferentWay
 	 */
 	@Test
 	public void testCreateFormulaFromElementsWindow() throws Exception{
-		String saveTo = fullPath("temp/" + "FormulaFromElements.odf");
+		String saveTo = Testspace.getPath("temp/" + "FormulaFromElements.odf");
 		
 		// New a formula document
 		startcenter.menuItem("File->New->Formula").select();
@@ -143,7 +145,7 @@ public class CreateFormulaInDifferentWay
 	 */
 	@Test
 	public void testCreateFormulaFromRightClickMenu() throws Exception{
-		String saveTo = fullPath("temp/" + "FormulaFromRightClickMenu.odf");
+		String saveTo = Testspace.getPath("temp/FormulaFromRightClickMenu.odf");
 		
 		// New a formula document
 		startcenter.menuItem("File->New->Formula").select();

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/Filter.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/Filter.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/Filter.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/Filter.java Tue Jul 24 02:00:32 2012
@@ -26,11 +26,11 @@
  */
 
 
-package testcase.performance.benchmark;
+package testcase.gui.performance.benchmark;
 
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.io.FileWriter;
 import java.io.IOException;
@@ -220,7 +220,7 @@ public class Filter {
 	{
 		System.out.println(fileName + " Load Show");
 		long tr = 0;
-		String file = testFile(fileName);
+		String file = Testspace.prepareData(fileName);
 		startcenter.menuItem("File->Open...").select();
 		FilePicker_Path.setText(file);
 		FilePicker_Open.click();
@@ -280,7 +280,7 @@ public class Filter {
 	{
 		System.out.println(fileName + " Load Finish");
 		long tr = 0;
-		String file = testFile(fileName);
+		String file = Testspace.prepareData(fileName);
 		startcenter.menuItem("File->Open...").select();
 //		submitOpenDlg(file);
 		FilePicker_Path.setText(file);
@@ -338,7 +338,7 @@ public class Filter {
 //		System.out.println(fileName);
 		long tr = 0;
 		sleep(2);
-		String file = testFile(fileName_i);
+		String file = Testspace.prepareData(fileName_i);
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(8);

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java Tue Jul 24 02:00:32 2012
@@ -25,7 +25,7 @@
  * 
  */
 
-package testcase.performance.benchmark;
+package testcase.gui.performance.benchmark;
 
 import java.io.File;
 import java.io.BufferedReader;
@@ -44,18 +44,13 @@ import org.junit.Before;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 
-import testlib.CalcUtil;
+import testlib.gui.CalcUtil;
 
 import static org.openoffice.test.vcl.Tester.sleep;
 import static org.openoffice.test.vcl.Tester.typeKeys;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.SC_InsertColumnsRowsdialog;
-import static testlib.UIMap.app;
-import static testlib.UIMap.dialog;
-import static testlib.UIMap.startcenter;
-import static testlib.UIMap.writer;
-import static testlib.CalcUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.CalcUtil.*;
+import static testlib.gui.UIMap.*;
 
 public class GenerateReports {
 	static public void computeResults(String resultDir)

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/ChartDialogSetting.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/chart/ChartDialogSetting.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/ChartDialogSetting.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/ChartDialogSetting.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/chart/ChartDialogSetting.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/chart/ChartDialogSetting.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/chart/ChartDialogSetting.java Tue Jul 24 02:00:32 2012
@@ -24,15 +24,17 @@
 /**
  * 
  */
-package testcase.sc.chart;
+package testcase.gui.sc.chart;
+
+import static testlib.gui.UIMap.*;
 
-import static testlib.UIMap.*;
 import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 /**
  * Test the setting about chart dialog in spreadsheet

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/DataPivotTable.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/datapilot/DataPivotTable.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/DataPivotTable.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/DataPivotTable.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/datapilot/DataPivotTable.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/datapilot/DataPivotTable.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/datapilot/DataPivotTable.java Tue Jul 24 02:00:32 2012
@@ -24,10 +24,11 @@
 /**
  * 
  */
-package testcase.sc.datapilot;
+package testcase.gui.sc.datapilot;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
+import static org.openoffice.test.common.Testspace.*;
 import org.junit.After;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
@@ -35,8 +36,9 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.openoffice.test.common.SystemUtil;
-import testlib.CalcUtil;
-import testlib.Log;
+
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * Test Data->Pivot Table
@@ -67,7 +69,7 @@ public class DataPivotTable {
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testCopyPasteDataPilotTable() {
 		//Open the sample file
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -149,7 +151,7 @@ public class DataPivotTable {
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testDataPilotAddFieldsAutoUpdate() {
 		//open the sample file Create DataPilotTable and verify the content
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -219,7 +221,7 @@ public class DataPivotTable {
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testDataPilotAddFieldsManualUpdate() {
 		//open the sample file Create DataPilotTable and verify the content
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -314,7 +316,7 @@ public class DataPivotTable {
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testDataPilotChangeDataFieldOptionAutoUpdate() {
 		//open the sample file Create DataPilotTable and verify the content
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -440,7 +442,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testDragMoveFunctionOfGroupedField() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -520,7 +522,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testHideShowPanel() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -613,7 +615,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testMoveFieldInSameAreaManualUpdate() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -715,7 +717,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testMoveFieldToOtherAreaAutoUpdate() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -794,7 +796,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testMoveFieldToOtherAreaDiscardChange() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -882,7 +884,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testMoveTableNarrowSpaceToShowTheTable() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -951,7 +953,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testOneMRowDataPilotRefresh() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1010,7 +1012,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testRemoveFieldsDiscardChange() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1097,7 +1099,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testRemoveFunctionOfGroupedField() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1165,7 +1167,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testRenameFieldAutoUpdate() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1279,7 +1281,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testSortFunctionInGroupedField() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1367,7 +1369,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testSubtotalsFunctionInGroupedField() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
@@ -1510,7 +1512,7 @@ public class DataPivotTable {
 	 */
 	@Ignore("DataPilot in symphony is totally not the same in AOO")
 	public void testTopNFunctionInGroupedField() {
-		String file = testFile("source_data01.ods");
+		String file = prepareData("source_data01.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/Fitler.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/filter/Fitler.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/Fitler.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/Fitler.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/filter/Fitler.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/filter/Fitler.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/filter/Fitler.java Tue Jul 24 02:00:32 2012
@@ -24,18 +24,20 @@
 /**
  * 
  */
-package testcase.sc.filter;
+package testcase.gui.sc.filter;
+
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
 import org.junit.After;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
-import testlib.CalcUtil;
-import testlib.Log;
+
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * Test cases about Data->Filter in spreadsheet

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java Tue Jul 24 02:00:32 2012
@@ -18,15 +18,17 @@
  * under the License.
  * 
  *************************************************************/
-package testcase.sc.sheet;
+package testcase.gui.sc.sheet;
 
 import static org.junit.Assert.*;
-import static testlib.UIMap.*;
+import static testlib.gui.UIMap.*;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 /**
  * Before running the testing class, you need specify the AOO location firstly with system property openoffice.home.

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/SortDialogSetting.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sort/SortDialogSetting.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/SortDialogSetting.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/SortDialogSetting.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sort/SortDialogSetting.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/sort/SortDialogSetting.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/sort/SortDialogSetting.java Tue Jul 24 02:00:32 2012
@@ -24,11 +24,12 @@
 /**
  * 
  */
-package testcase.sc.sort;
+package testcase.gui.sc.sort;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
+import static org.openoffice.test.common.Testspace.*;
 import static org.openoffice.test.vcl.Tester.*;
 import org.junit.After;
 import org.junit.Before;
@@ -36,8 +37,9 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
-import testlib.CalcUtil;
-import testlib.Log;
+
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * Test Data->Sort dialog setting
@@ -103,7 +105,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("A2:A6"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
+		String saveTo = getPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -186,7 +188,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("$Sheet2.$A1:$B6"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
+		String saveTo = getPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -255,7 +257,7 @@ public class SortDialogSetting {
 		calc.menuItem("Edit->Undo: Sort").select();
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortCriteriaSortFirstBy.ods");
+		String saveTo = getPath("temp/" + "SortCriteriaSortFirstBy.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -329,7 +331,7 @@ public class SortDialogSetting {
 		calc.menuItem("Edit->Undo: Sort").select();
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortCriteriaSortSecondBy.ods");
+		String saveTo = getPath("temp/" + "SortCriteriaSortSecondBy.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -428,7 +430,7 @@ public class SortDialogSetting {
 		calc.menuItem("Edit->Undo: Sort").select();
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortCriteriaSortThirdBy.ods");
+		String saveTo = getPath("temp/" + "SortCriteriaSortThirdBy.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -469,7 +471,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
 
 		// Save and close document
-		saveTo = fullPath("temp/" + "SortCriteriaSortThirdBy1.ods");
+		saveTo = getPath("temp/" + "SortCriteriaSortThirdBy1.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -601,7 +603,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
+		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -731,7 +733,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
+		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -783,7 +785,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("A1:G1"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsDirectionSortColumns.ods");
+		String saveTo = getPath("temp/" + "SortOptionsDirectionSortColumns.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -835,7 +837,7 @@ public class SortDialogSetting {
 		};
 
 		// Input source data
-		String file = testFile("sc/SortOptionsIncludeFormats.ods");
+		String file = prepareData("sc/SortOptionsIncludeFormats.ods");
 		//		String file = testFile("sc/FFC252FFCSC_XML_Datarange0235.xls");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
@@ -931,7 +933,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Redo sorted result", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("A1:A7"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsIncludeFormats.ods");
+		String saveTo = getPath("temp/" + "SortOptionsIncludeFormats.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -1026,7 +1028,7 @@ public class SortDialogSetting {
 		assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, CalcUtil.getCellTexts("A1:A8"));
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
+		String saveTo = getPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
@@ -1136,7 +1138,7 @@ public class SortDialogSetting {
 		SortOptionsPage.ok();		
 
 		// Save and close document
-		String saveTo = fullPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
+		String saveTo = getPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java Tue Jul 24 02:00:32 2012
@@ -22,20 +22,21 @@
 /**
  * 
  */
-package testcase.sc.subtotals;
+package testcase.gui.sc.subtotals;
 
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static org.openoffice.test.common.Testspace.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 /**
  * 
@@ -49,7 +50,7 @@ public class SubtotalsFunctions {
 	@Before
 	public void setUp() throws Exception {
 		app.start();
-		String file = testFile("sc/SubtotalsSampleFile.ods");
+		String file = prepareData("sc/SubtotalsSampleFile.ods");
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);

Modified: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java?rev=1364868&r1=1364474&r2=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java Tue Jul 24 02:00:32 2012
@@ -21,10 +21,10 @@
 
 
 
-package testcase.sc.validity;
+package testcase.gui.sc.validity;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.io.File;
 
@@ -39,8 +39,8 @@ import org.openoffice.test.vcl.IDList;
 import org.openoffice.test.vcl.widgets.VclMessageBox;
 
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 
 public class ValidityDateSupport1024Columns {

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogDefaultValue.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogDefaultValue.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogDefaultValue.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java Tue Jul 24 02:00:32 2012
@@ -21,15 +21,17 @@
 
 
 
-package testcase.sc.validity;
+package testcase.gui.sc.validity;
+
+import static testlib.gui.UIMap.*;
 
-import static testlib.UIMap.*;
 import org.junit.After;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 
 public class ValidityDialogDefaultValue {

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogSetting.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogSetting.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogSetting.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogSetting.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogSetting.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValidityDialogSetting.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValidityDialogSetting.java Tue Jul 24 02:00:32 2012
@@ -21,10 +21,10 @@
 
 
 
-package testcase.sc.validity;
+package testcase.gui.sc.validity;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 
 import java.io.File;
 
@@ -39,8 +39,8 @@ import org.junit.Test;
 import org.openoffice.test.vcl.IDList;
 import org.openoffice.test.vcl.widgets.VclMessageBox;
 
-import testlib.CalcUtil;
-import testlib.Log;
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 
 public class ValidityDialogSetting {

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValiditySampleFile.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValiditySampleFile.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValiditySampleFile.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValiditySampleFile.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValiditySampleFile.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sc/validity/ValiditySampleFile.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sc/validity/ValiditySampleFile.java Tue Jul 24 02:00:32 2012
@@ -21,20 +21,20 @@
 
 
 
-package testcase.sc.validity;
+package testcase.gui.sc.validity;
 
-import static testlib.AppUtil.submitOpenDlg;
-import static testlib.AppUtil.testFile;
-import static testlib.AppUtil.typeKeys;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.typeKeys;
+import static org.openoffice.test.common.Testspace.*;
+import static org.openoffice.test.vcl.Tester.*;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import testlib.CalcUtil;
-import testlib.Log;
+
+import testlib.gui.CalcUtil;
+import testlib.gui.Log;
 
 public class ValiditySampleFile {
 
@@ -59,7 +59,7 @@ public class ValiditySampleFile {
 	@Test
 	public void testFFCIgnoreBlank() throws Exception{
 		// Open sample file
-		String file = testFile("sc/FFC252FFCSC_XML_Datarange0235.xls");
+		String file = prepareData("sc/FFC252FFCSC_XML_Datarange0235.xls");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
@@ -81,7 +81,7 @@ public class ValiditySampleFile {
 	@Test
 	public void testFFCNotIgnoreBlank() throws Exception{
 		//open sample file
-		String file = testFile("sc/FFC252FFCSC_XML_Datarange0205.xls");
+		String file = prepareData("sc/FFC252FFCSC_XML_Datarange0205.xls");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
@@ -101,7 +101,7 @@ public class ValiditySampleFile {
 	@Test
 	public void testNotLockCellFromValidityCell() {
 		//open sample file on data path
-		String file = testFile("sc/sampledata.ods");
+		String file = prepareData("sc/sampledata.ods");
 		app.dispatch(".uno:Open", 3);
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/HeaderAndFooterSetting.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/HeaderAndFooterSetting.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/HeaderAndFooterSetting.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java Tue Jul 24 02:00:32 2012
@@ -24,13 +24,10 @@
 /**
  * 
  */
-package testcase.sd.headerandfooter;
-
-import static testlib.AppUtil.fullPath;
-import static testlib.AppUtil.openStartcenter;
-import static testlib.AppUtil.submitOpenDlg;
-import static testlib.AppUtil.submitSaveDlg;
-import static testlib.UIMap.*;
+package testcase.gui.sd.headerandfooter;
+import static org.openoffice.test.common.Testspace.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
 import org.junit.After;
@@ -38,8 +35,9 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
-import testlib.ImpressUtil;
-import testlib.Log;
+
+import testlib.gui.ImpressUtil;
+import testlib.gui.Log;
 
 public class HeaderAndFooterSetting{
 
@@ -639,7 +637,7 @@ public class HeaderAndFooterSetting{
 
 		//save this file
 		impress.menuItem("File->Save").select();
-		String saveTo = fullPath("temp/" + "hello.odp");
+		String saveTo = getPath("temp/" + "hello.odp");
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
 		impress.menuItem("File->Close").select();
@@ -648,7 +646,7 @@ public class HeaderAndFooterSetting{
 		//Reopen this file
 		openStartcenter();
 		app.dispatch(".uno:Open");
-		String openFrom=fullPath("temp/" + "hello.odp");
+		String openFrom=getPath("temp/" + "hello.odp");
 		submitOpenDlg(openFrom);
 
 		//check after reopen		
@@ -702,7 +700,7 @@ public class HeaderAndFooterSetting{
 
 		//save this file
 		impress.menuItem("File->Save").select();
-		String saveTo = fullPath("temp/" + "hello.odp");
+		String saveTo = getPath("temp/" + "hello.odp");
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
 		impress.menuItem("File->Close").select();
@@ -711,7 +709,7 @@ public class HeaderAndFooterSetting{
 		//Reopen this file
 		openStartcenter();
 		app.dispatch(".uno:Open");
-		String openFrom=fullPath("temp/" + "hello.odp");
+		String openFrom=getPath("temp/" + "hello.odp");
 		submitOpenDlg(openFrom);
 
 		//check after reopen		

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/OpenDocumentWithHeaderFooter.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/OpenDocumentWithHeaderFooter.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sd/headerandfooter/OpenDocumentWithHeaderFooter.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java Tue Jul 24 02:00:32 2012
@@ -24,14 +24,10 @@
 /**
  * 
  */
-package testcase.sd.headerandfooter;
-
-import static testlib.AppUtil.fullPath;
-import static testlib.AppUtil.openStartcenter;
-import static testlib.AppUtil.submitSaveDlg;
-import static testlib.AppUtil.submitOpenDlg;
-import static testlib.AppUtil.testFile;
-import static testlib.UIMap.*;
+package testcase.gui.sd.headerandfooter;
+import static org.openoffice.test.common.Testspace.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import static org.openoffice.test.vcl.Tester.*;
 import org.junit.After;
@@ -39,7 +35,8 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
-import testlib.Log;
+
+import testlib.gui.Log;
 
 public class OpenDocumentWithHeaderFooter {
 
@@ -64,7 +61,7 @@ public class OpenDocumentWithHeaderFoote
 	@Test
 	public void testOpenAOO34WithHeaderFooter() throws Exception{
 		//open sample file
-		String file = testFile("sd/AOO3.4HeaderFooter.odp");
+		String file = prepareData("sd/AOO3.4HeaderFooter.odp");
 		app.dispatch(".uno:Open");
 		submitOpenDlg(file);
 
@@ -82,7 +79,7 @@ public class OpenDocumentWithHeaderFoote
 
 		//save to odp and reopen
 		impress.menuItem("File->Save As...").select();
-		String saveTo2 = fullPath("temp/" + "AOO3.4HeaderFooter.odp");
+		String saveTo2 = getPath("temp/" + "AOO3.4HeaderFooter.odp");
 		FileUtil.deleteFile(saveTo2);
 		submitSaveDlg(saveTo2);	
 		impress.menuItem("File->Close").select();
@@ -90,7 +87,7 @@ public class OpenDocumentWithHeaderFoote
 
 		openStartcenter();
 		app.dispatch(".uno:Open");
-		String openFrom2=fullPath("temp/" + "AOO3.4HeaderFooter.odp");
+		String openFrom2=getPath("temp/" + "AOO3.4HeaderFooter.odp");
 		submitOpenDlg(openFrom2);
 
 		impress.menuItem("View->Header and Footer...").select();
@@ -107,7 +104,7 @@ public class OpenDocumentWithHeaderFoote
 	@Test
 	public void testOpenPPTWithHeaderFooter() throws Exception{
 		//open sample file
-		String file = testFile("sd/gfdd.ppt");
+		String file = prepareData("sd/gfdd.ppt");
 		app.dispatch(".uno:Open");
 		submitOpenDlg(file);
 
@@ -125,7 +122,7 @@ public class OpenDocumentWithHeaderFoote
 
 		//save to ppt and reopen
 		impress.menuItem("File->Save As...").select();
-		String saveTo = fullPath("temp/" + "gfdd.ppt");
+		String saveTo = getPath("temp/" + "gfdd.ppt");
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);	
 		if (AlienFormatDlg.exists(3))
@@ -136,7 +133,7 @@ public class OpenDocumentWithHeaderFoote
 
 		openStartcenter();
 		app.dispatch(".uno:Open");
-		String openFrom=fullPath("temp/" + "gfdd.ppt");
+		String openFrom=getPath("temp/" + "gfdd.ppt");
 		submitOpenDlg(openFrom);
 
 		impress.menuItem("View->Header and Footer...").select();
@@ -152,7 +149,7 @@ public class OpenDocumentWithHeaderFoote
 
 		//save to odp and reopen
 		impress.menuItem("File->Save As...").select();
-		String saveTo2 = fullPath("temp/" + "gfdd.odp");
+		String saveTo2 = getPath("temp/" + "gfdd.odp");
 		FileUtil.deleteFile(saveTo2);
 		submitSaveDlg(saveTo2);	
 		impress.menuItem("File->Close").select();
@@ -160,7 +157,7 @@ public class OpenDocumentWithHeaderFoote
 
 		openStartcenter();
 		app.dispatch(".uno:Open");
-		String openFrom2=fullPath("temp/" + "gfdd.odp");
+		String openFrom2=getPath("temp/" + "gfdd.odp");
 		submitOpenDlg(openFrom2);
 
 		impress.menuItem("View->Header and Footer...").select();

Copied: incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/Table.java (from r1364479, incubator/ooo/trunk/main/test/testoo/src/testcase/sw/table/Table.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/Table.java?p2=incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/Table.java&p1=incubator/ooo/trunk/main/test/testoo/src/testcase/sw/table/Table.java&r1=1364479&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testcase/sw/table/Table.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testcase/gui/sw/table/Table.java Tue Jul 24 02:00:32 2012
@@ -24,10 +24,10 @@
 /**
  * 
  */
-package testcase.sw.table;
+package testcase.gui.sw.table;
 
-import static testlib.AppUtil.*;
-import static testlib.UIMap.*;
+import static testlib.gui.AppUtil.*;
+import static testlib.gui.UIMap.*;
 import static org.junit.Assert.*;
 import org.junit.After;
 import org.junit.Before;
@@ -35,7 +35,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.SystemUtil;
 
-import testlib.Log;
+import testlib.gui.Log;
 
 /**
  *

Copied: incubator/ooo/trunk/main/test/testoo/source/testlib/gui/AppUtil.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testlib/gui/AppUtil.java?p2=incubator/ooo/trunk/main/test/testoo/source/testlib/gui/AppUtil.java&p1=incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/AppUtil.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testlib/gui/AppUtil.java Tue Jul 24 02:00:32 2012
@@ -21,8 +21,8 @@
 
 
 
-package testlib;
-import static testlib.UIMap.*;
+package testlib.gui;
+import static testlib.gui.UIMap.*;
 
 import org.openoffice.test.common.Condition;
 import org.openoffice.test.common.FileUtil;
@@ -79,19 +79,7 @@ public class AppUtil extends Tester {
 		sleep(1);
 	}
 	
-	/**
-	 * Fetch a test file to test space
-	 * @param path
-	 * @return a absolute path on the local
-	 */
-	public static String testFile(String path) {
-		return Testspace.prepareData(path);
-	}
-	
-	public static String fullPath(String relativePath) {
-		return Testspace.getPath(relativePath);
-	}
-	
+
 	public static void submitSaveDlg(String path) {
 		FileSave_Path.setText(path);
 		

Copied: incubator/ooo/trunk/main/test/testoo/source/testlib/gui/CalcUtil.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/CalcUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testlib/gui/CalcUtil.java?p2=incubator/ooo/trunk/main/test/testoo/source/testlib/gui/CalcUtil.java&p1=incubator/ooo/trunk/main/test/testoo/src/testlib/CalcUtil.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/CalcUtil.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testlib/gui/CalcUtil.java Tue Jul 24 02:00:32 2012
@@ -21,10 +21,10 @@
 
 
 
-package testlib;
+package testlib.gui;
 
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.UIMap.*;
+import static testlib.gui.UIMap.*;
 
 import java.lang.reflect.Array;
 import java.util.StringTokenizer;

Copied: incubator/ooo/trunk/main/test/testoo/source/testlib/gui/ImpressUtil.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/ImpressUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testlib/gui/ImpressUtil.java?p2=incubator/ooo/trunk/main/test/testoo/source/testlib/gui/ImpressUtil.java&p1=incubator/ooo/trunk/main/test/testoo/src/testlib/ImpressUtil.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/ImpressUtil.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testlib/gui/ImpressUtil.java Tue Jul 24 02:00:32 2012
@@ -21,11 +21,11 @@
 
 
 
-package testlib;
+package testlib.gui;
 
 import org.openoffice.test.vcl.widgets.VclWindow;
 
-import static testlib.UIMap.*;
+import static testlib.gui.UIMap.*;
 public class ImpressUtil {
 	
 	public static VclWindow getCurView() {

Copied: incubator/ooo/trunk/main/test/testoo/source/testlib/gui/Log.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testlib/gui/Log.java?p2=incubator/ooo/trunk/main/test/testoo/source/testlib/gui/Log.java&p1=incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/Log.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testlib/gui/Log.java Tue Jul 24 02:00:32 2012
@@ -19,7 +19,7 @@
  * 
  *************************************************************/
 
-package testlib;
+package testlib.gui;
 
 import java.io.File;
 import java.io.IOException;

Copied: incubator/ooo/trunk/main/test/testoo/source/testlib/gui/UIMap.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testlib/UIMap.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testlib/gui/UIMap.java?p2=incubator/ooo/trunk/main/test/testoo/source/testlib/gui/UIMap.java&p1=incubator/ooo/trunk/main/test/testoo/src/testlib/UIMap.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testlib/UIMap.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testlib/gui/UIMap.java Tue Jul 24 02:00:32 2012
@@ -21,7 +21,7 @@
 
 
 
-package testlib;
+package testlib.gui;
 import java.io.File;
 
 import org.openoffice.test.OpenOffice;

Copied: incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/BVT.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/BVT.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/BVT.java?p2=incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/BVT.java&p1=incubator/ooo/trunk/main/test/testoo/src/testsuite/BVT.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testsuite/BVT.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/BVT.java Tue Jul 24 02:00:32 2012
@@ -21,15 +21,15 @@
 
 
 
-package testsuite;
+package testsuite.gui;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import testcase.BVTFileType;
-import testcase.BVTFunction;
-import testcase.SmokeTest;
+import testcase.gui.BVTFileType;
+import testcase.gui.BVTFunction;
+import testcase.gui.SmokeTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({SmokeTest.class, BVTFileType.class, BVTFunction.class})

Copied: incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsMS2003.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsMS2003.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsMS2003.java?p2=incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsMS2003.java&p1=incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsMS2003.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsMS2003.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsMS2003.java Tue Jul 24 02:00:32 2012
@@ -21,7 +21,7 @@
 
 
 
-package testsuite;
+package testsuite.gui;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -34,8 +34,8 @@ import org.junit.runners.Suite;
 import org.junit.runners.Parameterized.Parameters;
 import org.junit.runners.Suite.SuiteClasses;
 
-import testcase.TestSample;
-import testsuite.TestSampleAsMS2003.SetParams;
+import testcase.gui.TestSample;
+import testsuite.gui.TestSampleAsMS2003.SetParams;
 
 @RunWith(Suite.class)
 @SuiteClasses({SetParams.class, TestSample.class })

Copied: incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsOriginal.java (from r1364474, incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsOriginal.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsOriginal.java?p2=incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsOriginal.java&p1=incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsOriginal.java&r1=1364474&r2=1364868&rev=1364868&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testoo/src/testsuite/TestSampleAsOriginal.java (original)
+++ incubator/ooo/trunk/main/test/testoo/source/testsuite/gui/TestSampleAsOriginal.java Tue Jul 24 02:00:32 2012
@@ -21,7 +21,7 @@
 
 
 
-package testsuite;
+package testsuite.gui;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,8 +32,8 @@ import org.junit.runners.Parameterized.P
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import testcase.TestSample;
-import testsuite.TestSampleAsOriginal.SetParams;
+import testcase.gui.TestSample;
+import testsuite.gui.TestSampleAsOriginal.SetParams;
 
 @RunWith(Suite.class)
 @SuiteClasses({SetParams.class, TestSample.class })



Mime
View raw message