#120352# - Automated Test：Rename GUI test package name into testcase.gui

test/testoo/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java → test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java

@@ -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;
 
 /**
  *

test/testoo/source/testcase/gui/performance/benchmark/Filter.java → test/testgui/source/testcase/gui/performance/benchmark/Filter.java

@@ -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);

test/testoo/source/testcase/gui/performance/benchmark/GenerateReports.java → test/testgui/source/testcase/gui/performance/benchmark/GenerateReports.java

@@ -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)

test/testoo/source/testcase/gui/sc/sheet/InsertSheet.java → test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java

@@ -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.

test/testoo/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java → test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java

@@ -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);

test/testoo/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java → test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java

@@ -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 {