incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liu...@apache.org
Subject svn commit: r1381843 [3/6] - in /incubator/ooo/trunk/test: ./ testcommon/source/org/openoffice/test/ testcommon/source/org/openoffice/test/common/ testcommon/source/org/openoffice/test/vcl/ testcommon/source/org/openoffice/test/vcl/widgets/ testgui/dat...
Date Fri, 07 Sep 2012 02:29:55 GMT
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/filter/Fitler.java Fri Sep  7 02:29:53 2012
@@ -25,7 +25,7 @@
 package testcase.gui.sc.filter;
 
 import static org.junit.Assert.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -35,7 +35,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.Logger;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 /**
  * Test cases about Data->Filter in spreadsheet
@@ -66,8 +66,8 @@ public class Fitler {
 	@Test
 	public void testAutoFilterWithPlusSign() {
 		String expect = "2+";
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys(expect + "<enter>");
-		assertEquals(expect, CalcUtil.getCellText("A1"));
+		assertEquals(expect, SCTool.getCellText("A1"));
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/rowcolumn/InsertRowAndColumn.java Fri Sep  7 02:29:53 2012
@@ -21,7 +21,7 @@
 package testcase.gui.sc.rowcolumn;
 
 import static org.junit.Assert.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -30,7 +30,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.Logger;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 public class InsertRowAndColumn {
 
@@ -59,33 +59,33 @@ public class InsertRowAndColumn {
 	public void testInsertEntireRowColumn() {
 
 		// insert data in cell A2 and B2
-		CalcUtil.selectRange("Sheet1.A2");
+		SCTool.selectRange("Sheet1.A2");
 		typeKeys("123");
-		CalcUtil.selectRange("Sheet1.B2");
+		SCTool.selectRange("Sheet1.B2");
 		typeKeys("456");
 
 		// Set expected result after executing insert one row
 		String[][] expectedInsertRowResult = new String[][] { { "", "" }, { "", "" }, { "123", "456" }, };
 
 		// Select Cell A2
-		CalcUtil.selectRange("Sheet1.A2");
+		SCTool.selectRange("Sheet1.A2");
 
 		// Insert one entire Row via menu
 		calc.menuItem("Insert->Rows").select();
 
 		// Verify results after inserting one row
-		assertArrayEquals("Verify results after inserting one row", expectedInsertRowResult, CalcUtil.getCellTexts("A1:B3"));
+		assertArrayEquals("Verify results after inserting one row", expectedInsertRowResult, SCTool.getCellTexts("A1:B3"));
 
 		// Set expected result after executing insert column
 		String[][] expectedInsertColumnResult = new String[][] { { "", "", "" }, { "", "", "" }, { "", "123", "456" }, };
 		// Select Cell A3
-		CalcUtil.selectRange("Sheet1.A3");
+		SCTool.selectRange("Sheet1.A3");
 
 		// Insert one entire Column via menu
 		calc.menuItem("Insert->Columns").select();
 
 		// Verify results after inserting one column
-		assertArrayEquals("Verify results after inserting one column", expectedInsertColumnResult, CalcUtil.getCellTexts("A1:C3"));
+		assertArrayEquals("Verify results after inserting one column", expectedInsertColumnResult, SCTool.getCellTexts("A1:C3"));
 
 	}
 

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java Fri Sep  7 02:29:53 2012
@@ -63,19 +63,19 @@ public class InsertSheet {
 		// Open Insert Sheet dialog via main menu Insert-> Sheet
 		app.dispatch(".uno:Insert");
 		// Change new sheet number into 3 to insert 3 new sheet one time
-		SCSheetNumber.setText("3");
+		scSheetNumber.setText("3");
 		// Click OK button to create sheet with default setting
-		SCInsertSheetDlg.ok();
+		scInsertSheetDlg.ok();
 		// Verify new sheets have been inserted before Sheet1
 		app.dispatch(".uno:SelectTables");
 		// To support multi-language, just verify the number in the sheet name
-		assertTrue(SCSheetsList.getItemsText()[0].contains("4"));
-		assertTrue(SCSheetsList.getItemsText()[1].contains("5"));
-		assertTrue(SCSheetsList.getItemsText()[2].contains("6"));
-		assertTrue(SCSheetsList.getItemsText()[3].contains("1"));
-		assertTrue(SCSheetsList.getItemsText()[4].contains("2"));
-		assertTrue(SCSheetsList.getItemsText()[5].contains("3"));
-		SCSelectSheetsDlg.ok();
+		assertTrue(scSheetsList.getItemsText()[0].contains("4"));
+		assertTrue(scSheetsList.getItemsText()[1].contains("5"));
+		assertTrue(scSheetsList.getItemsText()[2].contains("6"));
+		assertTrue(scSheetsList.getItemsText()[3].contains("1"));
+		assertTrue(scSheetsList.getItemsText()[4].contains("2"));
+		assertTrue(scSheetsList.getItemsText()[5].contains("3"));
+		scSelectSheetsDlg.ok();
 	}
 
 	/**
@@ -88,14 +88,14 @@ public class InsertSheet {
 		// Open Insert Sheet dialog via main menu Insert-> Sheet
 		app.dispatch(".uno:Insert");
 		// Click OK button to create sheet with default setting
-		SCInsertSheetDlg.ok();
+		scInsertSheetDlg.ok();
 		// Verify new sheet has been inserted before Sheet1
 		app.dispatch(".uno:SelectTables");
 		// To support multi-language, just verify the number in the sheet name
-		assertTrue(SCSheetsList.getItemsText()[0].contains("4"));
-		assertTrue(SCSheetsList.getItemsText()[1].contains("1"));
-		assertTrue(SCSheetsList.getItemsText()[2].contains("2"));
-		assertTrue(SCSheetsList.getItemsText()[3].contains("3"));
-		SCSelectSheetsDlg.ok();
+		assertTrue(scSheetsList.getItemsText()[0].contains("4"));
+		assertTrue(scSheetsList.getItemsText()[1].contains("1"));
+		assertTrue(scSheetsList.getItemsText()[2].contains("2"));
+		assertTrue(scSheetsList.getItemsText()[3].contains("3"));
+		scSelectSheetsDlg.ok();
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java Fri Sep  7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.sc.sort;
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.Testspace.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -38,7 +38,7 @@ import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.Logger;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 /**
  * Test Data->Sort dialog setting
@@ -73,26 +73,26 @@ public class SortDialogSetting {
 		// Input some data: A1~A6: 1ColumnName,D,C,B,A,a
 		String[][] data = new String[][] { { "D" }, { "C" }, { "B" }, { "A" }, { "a" }, };
 		String[][] expectedSortedResult = new String[][] { { "a" }, { "A" }, { "B" }, { "C" }, { "D" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("1ColumnName<down>D<down>C<down>B<down>A<down>a<down>");
-		CalcUtil.selectRange("A6");
+		SCTool.selectRange("A6");
 		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
 												// letter automatically
 
 		// "Data->Sort...", choose "Ascending", check "Case sensitive"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_CaseSensitive.check();
-		SortOptionsPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageCaseSensitive.check();
+		sortOptionsPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedSortedResult, CalcUtil.getCellTexts("A2:A6"));
+		assertArrayEquals("Sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A2:A6"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A2:A6"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("A2:A6"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "RowsSortWithOptionsCaseSensitive.ods");
@@ -106,7 +106,7 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedSortedResult, CalcUtil.getCellTexts("A2:A6"));
+		assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A2:A6"));
 	}
 
 	/**
@@ -127,50 +127,50 @@ public class SortDialogSetting {
 		// {"1", "AB"},
 		// };
 		String[][] expectedSortedResult = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>2<down>6<down>1");
-		CalcUtil.selectRange("B1");
+		SCTool.selectRange("B1");
 		typeKeys("D<down>FLK<down>E<down>BC<down>GE<down>AB");
 
 		// Data->Sort..., choose "Ascending", check "Copy sort results to:"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_CopyResultTo.check();
-		SortOptionsPage_CopyResultToEdit.setText("$Sheet3.$A4");
-		SortOptionsPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageCopyResultTo.check();
+		sortOptionsPageCopyResultToEdit.setText("$Sheet3.$A4");
+		sortOptionsPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Copy sorted result to", expectedSortedResult, CalcUtil.getCellTexts("$Sheet3.$A4:$B9"));
+		assertArrayEquals("Copy sorted result to", expectedSortedResult, SCTool.getCellTexts("$Sheet3.$A4:$B9"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertEquals("Undo sorted result", "", CalcUtil.getCellText("$Sheet3.$A4"));
+		assertEquals("Undo sorted result", "", SCTool.getCellText("$Sheet3.$A4"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("$Sheet3.$A4:$B9"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet3.$A4:$B9"));
 
 		// Move focus to sheet2 then select a cell range,
 		// Insert->Names->Define...
-		CalcUtil.selectRange("$Sheet2.$A1:$B3");
+		SCTool.selectRange("$Sheet2.$A1:$B3");
 		app.dispatch(".uno:DefineName");
-		DefineNamesDlg_NameEdit.setText("cellRange");
-		DefineNamesDlg.ok();
+		defineNamesDlgNameEdit.setText("cellRange");
+		defineNamesDlg.ok();
 
 		// Set focus to the original data, Data->Sort...
-		CalcUtil.selectRange("$Sheet1.$B1");
+		SCTool.selectRange("$Sheet1.$B1");
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_CopyResultTo.check();
-		SortOptionsPage_CopyResultToCellRange.select("cellRange");
-		SortOptionsPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageCopyResultTo.check();
+		sortOptionsPageCopyResultToCellRange.select("cellRange");
+		sortOptionsPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Copy sorted result to cell range", expectedSortedResult, CalcUtil.getCellTexts("$Sheet2.$A1:$B6"));
+		assertArrayEquals("Copy sorted result to cell range", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertEquals("Undo sorted result", "", CalcUtil.getCellText("$Sheet2.$A1"));
+		assertEquals("Undo sorted result", "", SCTool.getCellText("$Sheet2.$A1"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("$Sheet2.$A1:$B6"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "RowsSortWithOptionsCopyResultTo.ods");
@@ -184,8 +184,8 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedSortedResult, CalcUtil.getCellTexts("$Sheet3.$A4:$B9"));
-		assertArrayEquals("Saved sorted result to cell range", expectedSortedResult, CalcUtil.getCellTexts("$Sheet2.$A1:$B6"));
+		assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("$Sheet3.$A4:$B9"));
+		assertArrayEquals("Saved sorted result to cell range", expectedSortedResult, SCTool.getCellTexts("$Sheet2.$A1:$B6"));
 	}
 
 	/**
@@ -200,25 +200,25 @@ public class SortDialogSetting {
 		String[][] data = new String[][] { { "3", "D" }, { "5", "FLK" }, { "4", "E" }, { "2", "BC" }, { "6", "GE" }, { "1", "AB" }, };
 		String[][] expectedResultSortByColumnBAscending = new String[][] { { "1", "AB" }, { "2", "BC" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
 		String[][] expectedResultSortByColumnADescending = new String[][] { { "6", "GE" }, { "5", "FLK" }, { "4", "E" }, { "3", "D" }, { "2", "BC" }, { "1", "AB" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>2<down>6<down>1");
-		CalcUtil.selectRange("B1");
+		SCTool.selectRange("B1");
 		typeKeys("D<down>FLK<down>E<down>BC<down>GE<down>AB");
 
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
-		SortPage_Ascending1.check();
-		SortPage_By1.select(2); // "Column B"
-		SortPage.ok();
+		sortPageAscending1.check();
+		sortPageBy1.select(2); // "Column B"
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortByColumnBAscending, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Sorted result", expectedResultSortByColumnBAscending, SCTool.getCellTexts("A1:B6"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultSortByColumnBAscending, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Redo sorted result", expectedResultSortByColumnBAscending, SCTool.getCellTexts("A1:B6"));
 		app.dispatch(".uno:Undo");
 
 		// Save and close document
@@ -234,12 +234,12 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
-		SortPage_Descending1.check();
-		SortPage_By1.select(1); // "Column A"
-		SortPage.ok();
+		sortPageDescending1.check();
+		sortPageBy1.select(1); // "Column A"
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Saved sorted result", expectedResultSortByColumnADescending, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Saved sorted result", expectedResultSortByColumnADescending, SCTool.getCellTexts("A1:B6"));
 	}
 
 	/**
@@ -254,25 +254,25 @@ public class SortDialogSetting {
 		String[][] data = new String[][] { { "3", "D" }, { "5", "FLK" }, { "4", "E" }, { "1", "AB" }, { "6", "GE" }, { "2", "AB" }, };
 		String[][] expectedResultSortFirstByB = new String[][] { { "1", "AB" }, { "2", "AB" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
 		String[][] expectedResultSortSecondByA = new String[][] { { "2", "AB" }, { "1", "AB" }, { "3", "D" }, { "4", "E" }, { "5", "FLK" }, { "6", "GE" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("3<down>5<down>4<down>1<down>6<down>2");
-		CalcUtil.selectRange("B1");
+		SCTool.selectRange("B1");
 		typeKeys("D<down>FLK<down>E<down>AB<down>GE<down>AB");
 
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
-		SortPage_Ascending1.check();
-		SortPage_By1.select(2); // "Column B"
-		SortPage.ok();
+		sortPageAscending1.check();
+		sortPageBy1.select(2); // "Column B"
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortFirstByB, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:B6"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:B6"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:B6"));
 		app.dispatch(".uno:Undo");
 
 		// Save and close document
@@ -289,14 +289,14 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2); // "Column B"
-		SortPage_Ascending1.check();
-		SortPage_By2.select(1); // "Column A"
-		SortPage_Descending2.check();
-		SortPage.ok();
+		sortPageBy1.select(2); // "Column B"
+		sortPageAscending1.check();
+		sortPageBy2.select(1); // "Column A"
+		sortPageDescending2.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Saved sorted result", expectedResultSortSecondByA, CalcUtil.getCellTexts("A1:B6"));
+		assertArrayEquals("Saved sorted result", expectedResultSortSecondByA, SCTool.getCellTexts("A1:B6"));
 	}
 
 	/**
@@ -316,27 +316,27 @@ public class SortDialogSetting {
 				{ "6", "E", "4" }, { "7", "EFYU", "7" }, { "8", "FLK", "5" }, { "9", "GE", "6" }, };
 		String[][] expectedResultSortThirdByA = new String[][] { { "3", "AB", "2" }, { "2", "AB", "2" }, { "4", "AB", "1" }, { "1", "AB", "1" }, { "5", "DS", "8" },
 				{ "6", "E", "4" }, { "7", "EFYU", "7" }, { "8", "FLK", "5" }, { "9", "GE", "6" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("3<down>8<down>6<down>1<down>9<down>2<down>7<down>5<down>4");
-		CalcUtil.selectRange("B1");
+		SCTool.selectRange("B1");
 		typeKeys("AB<down>FLK<down>E<down>AB<down>GE<down>AB<down>EFYU<down>DS<down>AB");
-		CalcUtil.selectRange("C1");
+		SCTool.selectRange("C1");
 		typeKeys("2<down>5<down>4<down>1<down>6<down>2<down>7<down>8<down>1");
 
 		// "Data->Sort...", choose "Ascending", sort first by Column B
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2); // "Column B"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortPageBy1.select(2); // "Column B"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortFirstByB, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:C9"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:C9"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Redo sorted result", expectedResultSortFirstByB, SCTool.getCellTexts("A1:C9"));
 		app.dispatch(".uno:Undo");
 
 		// Save and close document
@@ -353,34 +353,34 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2); // "Column B"
-		SortPage_Ascending1.check();
-		SortPage_By2.select(3); // "Column C"
-		SortPage_Descending2.check();
-		SortPage.ok();
+		sortPageBy1.select(2); // "Column B"
+		sortPageAscending1.check();
+		sortPageBy2.select(3); // "Column C"
+		sortPageDescending2.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortSecondByC, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Sorted result", expectedResultSortSecondByC, SCTool.getCellTexts("A1:C9"));
 
 		// "Data->Sort...", sort first by Column B "Ascending", sort second by
 		// Column C "Descending", sort third by Column A "Descending"
 		app.dispatch(".uno:DataSort");
-		SortPage_By1.select(2); // "Column B"
-		SortPage_Ascending1.check();
-		SortPage_By2.select(3); // "Column C"
-		SortPage_Descending2.check();
-		SortPage_By3.select(1); // "Column A"
-		SortPage_Descending3.check();
-		SortPage.ok();
+		sortPageBy1.select(2); // "Column B"
+		sortPageAscending1.check();
+		sortPageBy2.select(3); // "Column C"
+		sortPageDescending2.check();
+		sortPageBy3.select(1); // "Column A"
+		sortPageDescending3.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", expectedResultSortSecondByC, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Undo sorted result", expectedResultSortSecondByC, SCTool.getCellTexts("A1:C9"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Redo sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
 
 		// Save and close document
 		saveTo = getPath("temp/" + "SortCriteriaSortThirdBy1.ods");
@@ -394,7 +394,7 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, CalcUtil.getCellTexts("A1:C9"));
+		assertArrayEquals("Saved sorted result", expectedResultSortThirdByA, SCTool.getCellTexts("A1:C9"));
 	}
 
 	/**
@@ -407,33 +407,33 @@ public class SortDialogSetting {
 	public void testSortOptionsCustomSortOrderPredefineFromCopyList() throws Exception {
 
 		// Dependencies start
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("red<down>yellow<down>blue<down>green<down>white<down>black");
-		CalcUtil.selectRange("A1:A6");
+		SCTool.selectRange("A1:A6");
 		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
 												// letter automatically
 
 		// Select the cell range,
 		// "Tools->Options...->OpenOffice.org Spreadsheets->Sort Lists"
-		CalcUtil.selectRange("A1:A6");
+		SCTool.selectRange("A1:A6");
 		app.dispatch(".uno:OptionsTreeDialog");
-		OptionsDlgList.collapseAll();
+		optionsDlgList.collapseAll();
 		// // Select "Sort Lists": start. Shrink the tree list and select
 		// OptionsDlgList.select(0);
 		// typeKeys("<left>");
 		// for (int i=0; i<6; i++) {
 		// typeKeys("<down><left>");
 		// }
-		OptionsDlgList.expand(3);
+		optionsDlgList.expand(3);
 		// typeKeys("<right>");
-		OptionsDlgList.select(7);
+		optionsDlgList.select(7);
 		// // Select "Sort Lists": end
 
 		// Click "Copy" button, "OK", close the document
-		OptionsDlg_SortListsTabCopy.click();
-		OptionsDlg.ok();
+		optionsDlgSortListsTabCopy.click();
+		optionsDlg.ok();
 		app.dispatch(".uno:CloseDoc");
-		MsgBox_AdditionalRowsNotSaved.no();
+		msgBox_AdditionalRowsNotSaved.no();
 		// Dependencies end
 
 		// Create a new spreadsheet document
@@ -443,62 +443,62 @@ public class SortDialogSetting {
 		String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
 		String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
 		String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "red" }, { "yellow" }, { "blue" }, { "white" }, { "black" }, { "black" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
-		CalcUtil.selectRange("A2:A7");
+		SCTool.selectRange("A2:A7");
 		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
 												// letter automatically
 
 		// "Data->Sort...", "Options" tab, check "Range contains column labels",
 		// no custom sort order, "Ascending", sort first by Color
-		CalcUtil.selectRange("A1:A7");
+		SCTool.selectRange("A1:A7");
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_CustomSortOrder.uncheck();
-		SortPage.select();
-		SortPage_By1.select(1); // "Color"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageCustomSortOrder.uncheck();
+		sortPage.select();
+		sortPageBy1.select(1); // "Color"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedResultNoCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Undo");
 
 		// Copy original data to sheet2
-		CalcUtil.selectRange("A1:A7");
+		SCTool.selectRange("A1:A7");
 		app.dispatch(".uno:Copy");
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1);
-		SCSelectSheetsDlg.ok();
+		scSheetsList.select(1);
+		scSelectSheetsDlg.ok();
 		app.dispatch(".uno:Paste");
 
 		// "Data->Sort...", "Options" tab, check "Range contains column labels",
 		// choose custom sort order, "Ascending", sort first by Color
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_CustomSortOrder.check();
-		SortOptionsPage_CustomSortOrderList.select("red,yellow,blue,green,white,black");
-		SortPage.select();
-		SortPage_By1.select(1); // "Color"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageCustomSortOrder.check();
+		sortOptionsPageCustomSortOrderList.select("red,yellow,blue,green,white,black");
+		sortPage.select();
+		sortPageBy1.select(1); // "Color"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromCopyList.ods");
@@ -513,13 +513,13 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(0); // Sheet 1
-		SCSelectSheetsDlg.ok();
-		assertArrayEquals("Original data", data, CalcUtil.getCellTexts("$A1:$A7"));
+		scSheetsList.select(0); // Sheet 1
+		scSelectSheetsDlg.ok();
+		assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1); // Sheet 2
-		SCSelectSheetsDlg.ok();
-		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("$A1:$A7"));
+		scSheetsList.select(1); // Sheet 2
+		scSelectSheetsDlg.ok();
+		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("$A1:$A7"));
 	}
 
 	/**
@@ -535,22 +535,22 @@ public class SortDialogSetting {
 		// "Tools->Options...->OpenOffice.org Spreadsheets->Sort Lists"
 		app.dispatch(".uno:OptionsTreeDialog");
 		// Select "Sort Lists": start. Shrink the tree list and select
-		OptionsDlgList.select(0);
+		optionsDlgList.select(0);
 		typeKeys("<left>");
 		for (int i = 0; i < 6; i++) {
 			typeKeys("<down><left>");
 		}
-		OptionsDlgList.select(3);
+		optionsDlgList.select(3);
 		typeKeys("<right>");
-		OptionsDlgList.select(7);
+		optionsDlgList.select(7);
 		// Select "Sort Lists": end
 
 		// Click "New" button, input "white,red,yellow,blue,green,black", press
 		// "Add" and "OK", close the document
-		OptionsDlg_SortListsTabNew.click();
+		optionsDlgSortListsTabNew.click();
 		typeKeys("white,red,yellow,blue,green,black");
-		OptionsDlg_SortListsTabAdd.click();
-		OptionsDlg.ok();
+		optionsDlgSortListsTabAdd.click();
+		optionsDlg.ok();
 		app.dispatch(".uno:CloseDoc");
 		// Dependencies end
 
@@ -561,62 +561,62 @@ public class SortDialogSetting {
 		String[][] data = new String[][] { { "Color" }, { "black" }, { "yellow" }, { "blue" }, { "black" }, { "white" }, { "red" }, };
 		String[][] expectedResultNoCustomSortOrder = new String[][] { { "Color" }, { "black" }, { "black" }, { "blue" }, { "red" }, { "white" }, { "yellow" }, };
 		String[][] expectedResultCustomSortOrder = new String[][] { { "Color" }, { "white" }, { "red" }, { "yellow" }, { "blue" }, { "black" }, { "black" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("Color<down>black<down>yellow<down>blue<down>black<down>white<down>red");
-		CalcUtil.selectRange("A2:A7");
+		SCTool.selectRange("A2:A7");
 		app.dispatch(".uno:ChangeCaseToLower"); // In case SC capitalize first
 												// letter automatically
 
 		// "Data->Sort...", "Options" tab, check "Range contains column labels",
 		// no custom sort order, "Ascending", sort first by Color
-		CalcUtil.selectRange("A1:A7");
+		SCTool.selectRange("A1:A7");
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_CustomSortOrder.uncheck();
-		SortPage.select();
-		SortPage_By1.select(1); // "Color"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageCustomSortOrder.uncheck();
+		sortPage.select();
+		sortPageBy1.select(1); // "Color"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result without custom sort order", expectedResultNoCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultNoCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedResultNoCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Undo");
 
 		// Copy original data to sheet2
-		CalcUtil.selectRange("A1:A7");
+		SCTool.selectRange("A1:A7");
 		app.dispatch(".uno:Copy");
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1); // Sheet 2
-		SCSelectSheetsDlg.ok();
+		scSheetsList.select(1); // Sheet 2
+		scSelectSheetsDlg.ok();
 		app.dispatch(".uno:Paste");
 
 		// "Data->Sort...", "Options" tab, check "Range contains column labels",
 		// choose custom sort order, "Ascending", sort first by Color
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_CustomSortOrder.check();
-		SortOptionsPage_CustomSortOrderList.select("white,red,yellow,blue,green,black");
-		SortPage.select();
-		SortPage_By1.select(1); // "Color"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageCustomSortOrder.check();
+		sortOptionsPageCustomSortOrderList.select("white,red,yellow,blue,green,black");
+		sortPage.select();
+		sortPageBy1.select(1); // "Color"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result with custom sort order", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("A1:A7"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsCustomSortOrderPredefineFromNewList.ods");
@@ -631,13 +631,13 @@ public class SortDialogSetting {
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(0); // Sheet 1
-		SCSelectSheetsDlg.ok();
-		assertArrayEquals("Original data", data, CalcUtil.getCellTexts("$A1:$A7"));
+		scSheetsList.select(0); // Sheet 1
+		scSelectSheetsDlg.ok();
+		assertArrayEquals("Original data", data, SCTool.getCellTexts("$A1:$A7"));
 		app.dispatch(".uno:SelectTables");
-		SCSheetsList.select(1); // Sheet 2
-		SCSelectSheetsDlg.ok();
-		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, CalcUtil.getCellTexts("$A1:$A7"));
+		scSheetsList.select(1); // Sheet 2
+		scSelectSheetsDlg.ok();
+		assertArrayEquals("Saved sorted result", expectedResultCustomSortOrder, SCTool.getCellTexts("$A1:$A7"));
 	}
 
 	/**
@@ -651,29 +651,29 @@ public class SortDialogSetting {
 		// Input some data
 		String[][] data = new String[][] { { "Units", "7", "27", "4", "12", "3", "6" }, };
 		String[][] expectedSortedResult = new String[][] { { "Units", "3", "4", "6", "7", "12", "27" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("Units<right>7<right>27<right>4<right>12<right>3<right>6");
 		sleep(1); // If no sleep, some strings lost
 
 		// "Data->Sort...", check "Range contains column labels",
 		// "Left to right", sort first by"Units", "Ascending"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_LeftToRight.check();
-		SortPage.select();
-		SortPage_By1.select(1); // Choose "Units"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageLeftToRight.check();
+		sortPage.select();
+		sortPageBy1.select(1); // Choose "Units"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedSortedResult, CalcUtil.getCellTexts("A1:G1"));
+		assertArrayEquals("Sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data, CalcUtil.getCellTexts("A1:G1"));
+		assertArrayEquals("Undo sorted result", data, SCTool.getCellTexts("A1:G1"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult, CalcUtil.getCellTexts("A1:G1"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsDirectionSortColumns.ods");
@@ -687,7 +687,7 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedSortedResult, CalcUtil.getCellTexts("A1:G1"));
+		assertArrayEquals("Saved sorted result", expectedSortedResult, SCTool.getCellTexts("A1:G1"));
 	}
 
 	/**
@@ -711,54 +711,54 @@ public class SortDialogSetting {
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
 
-		assertArrayEquals("source", dataWithCurrencyFormats, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("source", dataWithCurrencyFormats, SCTool.getCellTexts("A1:A7"));
 
 		// "Data->Sort...", check "Range contains column labels", check
 		// "Include formats", sort first by "Units", "Ascending"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_IncludeFormats.check();
-		SortPage.select();
-		SortPage_By1.select(1); // "Units"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageIncludeFormats.check();
+		sortPage.select();
+		sortPageBy1.select(1); // "Units"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result include formats", expectedSortedResultIncludeFormat, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result include formats", expectedSortedResultIncludeFormat, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResultIncludeFormat, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedSortedResultIncludeFormat, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Undo");
 
 		// Copy the original data to sheet2
-		CalcUtil.selectRange("A1:A7");
+		SCTool.selectRange("A1:A7");
 		app.dispatch(".uno:Copy");
-		CalcUtil.selectRange("Sheet2.A1");
+		SCTool.selectRange("Sheet2.A1");
 		app.dispatch(".uno:Paste");
 
 		// "Data->Sort...", check "Range contains column labels", uncheck
 		// "Include formats", sort first by "Units", "Ascending"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_IncludeFormats.uncheck();
-		SortPage.select();
-		SortPage_By1.select(1); // "Units"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageIncludeFormats.uncheck();
+		sortPage.select();
+		sortPageBy1.select(1); // "Units"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result exclude formats", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Sorted result exclude formats", expectedSortedResultExcludeFormat, SCTool.getCellTexts("A1:A7"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Undo sorted result", dataWithCurrencyFormats, SCTool.getCellTexts("A1:A7"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("A1:A7"));
+		assertArrayEquals("Redo sorted result", expectedSortedResultExcludeFormat, SCTool.getCellTexts("A1:A7"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsIncludeFormats.ods");
@@ -772,8 +772,8 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Original data", dataWithCurrencyFormats, CalcUtil.getCellTexts("$Sheet1.$A1:$A7"));
-		assertArrayEquals("Saved sorted result exclude format", expectedSortedResultExcludeFormat, CalcUtil.getCellTexts("$Sheet2.$A1:$A7"));
+		assertArrayEquals("Original data", dataWithCurrencyFormats, SCTool.getCellTexts("$Sheet1.$A1:$A7"));
+		assertArrayEquals("Saved sorted result exclude format", expectedSortedResultExcludeFormat, SCTool.getCellTexts("$Sheet2.$A1:$A7"));
 	}
 
 	/**
@@ -789,48 +789,48 @@ public class SortDialogSetting {
 		String[][] expectedSortedResult1 = new String[][] { { "A" }, { "B" }, { "C" }, { "D" }, { "E" }, };
 		String[][] data2 = new String[][] { { "4" }, { "2" }, { "5" }, { "1" }, { "3" }, };
 		String[][] expectedSortedResultDataOverlap = new String[][] { { "A" }, { "B" }, { "C" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("D<down>C<down>B<down>A<down>E");
 		sleep(1); // If no sleep, some strings lost
 
 		// "Data->Sort...", uncheck "Range contains column labels", sort first
 		// by "Column A", "Ascending"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.uncheck();
-		SortPage.select();
-		SortPage_By1.select(1); // "Column A"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.uncheck();
+		sortPage.select();
+		sortPageBy1.select(1); // "Column A"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Sorted result", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Undo sorted result", data1, SCTool.getCellTexts("A1:A5"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
 
 		// Input data2 into same sheet, data1 and data2 are not overlapped
-		CalcUtil.selectRange("G10");
+		SCTool.selectRange("G10");
 		typeKeys("4<down>2<down>5<down>1<down>3");
 
 		// Focus on data2, "Data->Sort...", "Copy result to" partially overlap
 		// with data1, sort first by "Column G", "Ascending"
-		CalcUtil.selectRange("G10");
+		SCTool.selectRange("G10");
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.uncheck();
-		SortOptionsPage_CopyResultTo.check();
-		SortOptionsPage_CopyResultToEdit.setText("A4");
-		SortPage.select();
-		SortPage_By1.select(1); // "Column G"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.uncheck();
+		sortOptionsPageCopyResultTo.check();
+		sortOptionsPageCopyResultToEdit.setText("A4");
+		sortPage.select();
+		sortPageBy1.select(1); // "Column G"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, CalcUtil.getCellTexts("A1:A8"));
+		assertArrayEquals("Sorted result data overlap", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsMultipleSortDataOverlap.ods");
@@ -844,8 +844,8 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result", expectedSortedResultDataOverlap, CalcUtil.getCellTexts("A1:A8"));
-		assertArrayEquals("Original data2", data2, CalcUtil.getCellTexts("G10:G14"));
+		assertArrayEquals("Saved sorted result", expectedSortedResultDataOverlap, SCTool.getCellTexts("A1:A8"));
+		assertArrayEquals("Original data2", data2, SCTool.getCellTexts("G10:G14"));
 	}
 
 	/**
@@ -862,7 +862,7 @@ public class SortDialogSetting {
 		String[][] expectedSortedResult1 = new String[][] { { "A" }, { "B" }, { "C" }, { "D" }, { "E" }, };
 		String[][] data2 = new String[][] { { "Numbers" }, { "4" }, { "2" }, { "5" }, { "1" }, { "3" }, };
 		String[][] expectedSortedResult2 = new String[][] { { "Numbers" }, { "1" }, { "2" }, { "3" }, { "4" }, { "5" }, };
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("D<down>C<down>B<down>A<down>E");
 		sleep(1); // If no sleep, some strings lost
 
@@ -870,58 +870,58 @@ public class SortDialogSetting {
 		// "Case sensitive" and "Include formats", sort first by "Column A",
 		// "Ascending"
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.uncheck();
-		SortOptionsPage_CaseSensitive.check();
-		SortOptionsPage_IncludeFormats.check();
-		SortPage.select();
-		SortPage_By1.select(1); // "Column A"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.uncheck();
+		sortOptionsPageCaseSensitive.check();
+		sortOptionsPageIncludeFormats.check();
+		sortPage.select();
+		sortPageBy1.select(1); // "Column A"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result1", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Sorted result1", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Undo sorted result", data1, SCTool.getCellTexts("A1:A5"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
 
 		// Input data2 into same sheet, data1 and data2 are not overlapped
-		CalcUtil.selectRange("G10");
+		SCTool.selectRange("G10");
 		typeKeys("Numbers<down>4<down>2<down>5<down>1<down>3");
 
 		// Focus on data2, "Data->Sort...", check
 		// "Range contains column labels", uncheck "Case sensitive" and
 		// "Include formats", sort first by "Numbers", "Ascending"
-		CalcUtil.selectRange("G10");
+		SCTool.selectRange("G10");
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		SortOptionsPage_RangeContainsColumnLabels.check();
-		SortOptionsPage_CaseSensitive.uncheck();
-		SortOptionsPage_IncludeFormats.uncheck();
-		SortPage.select();
-		SortPage_By1.select(1); // "Numbers"
-		SortPage_Ascending1.check();
-		SortPage.ok();
+		sortOptionsPage.select();
+		sortOptionsPageRangeContainsColumnLabels.check();
+		sortOptionsPageCaseSensitive.uncheck();
+		sortOptionsPageIncludeFormats.uncheck();
+		sortPage.select();
+		sortPageBy1.select(1); // "Numbers"
+		sortPageAscending1.check();
+		sortPage.ok();
 
 		// Verify sorted result
-		assertArrayEquals("Sorted result2", expectedSortedResult2, CalcUtil.getCellTexts("G10:G15"));
+		assertArrayEquals("Sorted result2", expectedSortedResult2, SCTool.getCellTexts("G10:G15"));
 
 		// Uodo/redo
 		app.dispatch(".uno:Undo");
-		assertArrayEquals("Undo sorted result", data2, CalcUtil.getCellTexts("G10:G15"));
+		assertArrayEquals("Undo sorted result", data2, SCTool.getCellTexts("G10:G15"));
 		app.dispatch(".uno:Redo");
-		assertArrayEquals("Redo sorted result", expectedSortedResult2, CalcUtil.getCellTexts("G10:G15"));
+		assertArrayEquals("Redo sorted result", expectedSortedResult2, SCTool.getCellTexts("G10:G15"));
 
 		// Open sort dialog, check its setting
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		assertTrue("Range contains column labels should be checked", SortOptionsPage_RangeContainsColumnLabels.isChecked());
-		assertFalse("Case sensitive should not be checked", SortOptionsPage_CaseSensitive.isChecked());
-		assertFalse("Include formats should not be checked", SortOptionsPage_IncludeFormats.isChecked());
-		SortOptionsPage.ok();
+		sortOptionsPage.select();
+		assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
+		assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
+		assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
+		sortOptionsPage.ok();
 
 		// Save and close document
 		String saveTo = getPath("temp/" + "SortOptionsMultipleSortParameterSaved.ods");
@@ -935,14 +935,14 @@ public class SortDialogSetting {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		assertArrayEquals("Saved sorted result1", expectedSortedResult1, CalcUtil.getCellTexts("A1:A5"));
-		assertArrayEquals("Saved sorted result2", expectedSortedResult2, CalcUtil.getCellTexts("G10:G15"));
+		assertArrayEquals("Saved sorted result1", expectedSortedResult1, SCTool.getCellTexts("A1:A5"));
+		assertArrayEquals("Saved sorted result2", expectedSortedResult2, SCTool.getCellTexts("G10:G15"));
 		app.dispatch(".uno:DataSort");
-		SortOptionsPage.select();
-		assertTrue("Range contains column labels should be checked", SortOptionsPage_RangeContainsColumnLabels.isChecked());
-		assertFalse("Case sensitive should not be checked", SortOptionsPage_CaseSensitive.isChecked());
-		assertFalse("Include formats should not be checked", SortOptionsPage_IncludeFormats.isChecked());
-		SortOptionsPage.ok();
+		sortOptionsPage.select();
+		assertTrue("Range contains column labels should be checked", sortOptionsPageRangeContainsColumnLabels.isChecked());
+		assertFalse("Case sensitive should not be checked", sortOptionsPageCaseSensitive.isChecked());
+		assertFalse("Include formats should not be checked", sortOptionsPageIncludeFormats.isChecked());
+		sortOptionsPage.ok();
 	}
 
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java Fri Sep  7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.sc.subtotals;
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.Testspace.*;
 import static org.openoffice.test.vcl.Tester.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -36,7 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openoffice.test.common.Logger;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 /**
  * 
@@ -54,7 +54,7 @@ public class SubtotalsFunctions {
 		app.dispatch(".uno:Open");
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
-		CalcUtil.selectRange("A1:E7");
+		SCTool.selectRange("A1:E7");
 		app.dispatch(".uno:DataSubTotals");
 	}
 
@@ -68,20 +68,20 @@ public class SubtotalsFunctions {
 	 */
 	@Test
 	public void testAverage() {
-		SCSubTotalsGroupByListBox.select(4); // "Team"
+		scSubTotalsGroupByListBox.select(4); // "Team"
 		// SCCalcSubTotalForColumns.click(10, 25); // In different platform, can
 		// not focus on same checkbox
-		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1); // "Code"
+		scCalcSubTotalForColumns.select(1);
+		scCalcSubTotalForColumns.check(1); // "Code"
 		sleep(1);
-		SCCalcSubTotolsFuncionList.select(2); // "Average"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotolsFuncionList.select(2); // "Average"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" }, { "CS", "30", "5", "A", "Ally" },
 				{ "MS", "10", "1", "A", "Joker" }, { "", "20", "", "A Average", "" }, { "BS", "20", "4", "B", "Elle" }, { "MS", "10", "3", "B", "Kevin" },
 				{ "", "15", "", "B Average", "" }, { "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Average", "" }, { "", "18.33333333", "", "Grand Total", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -91,16 +91,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testCountNumbersOnly() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(6); // "Count (numbers only)"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(6); // "Count (numbers only)"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Count", "", "3", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Count", "", "1", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Count", "", "2", "", "" }, { "Grand Total", "", "6", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -109,16 +109,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testMax() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(3); // "Max"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(3); // "Max"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Max", "", "6", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Max", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Max", "", "3", "", "" }, { "Grand Total", "", "6", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -127,16 +127,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testMin() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(4); // "Min"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(4); // "Min"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Min", "", "2", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Min", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Min", "", "1", "", "" }, { "Grand Total", "", "1", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -145,16 +145,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testProduct() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(5); // "Product"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(5); // "Product"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Product", "", "48", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Product", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Product", "", "3", "", "" }, { "Grand Total", "", "720", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -164,16 +164,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testStDevPPopulation() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(8); // "StDevP (Population)"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(8); // "StDevP (Population)"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS StDev", "", "1.63299316", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS StDev", "", "0", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS StDev", "", "1", "", "" }, { "Grand Total", "", "1.70782513", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -182,16 +182,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testSum() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(0); // "Sum"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(0); // "Sum"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Sum", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "21", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -200,16 +200,16 @@ public class SubtotalsFunctions {
 	@Test
 	public void testVarSample() {
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCCalcSubTotolsFuncionList.select(9); // "Var (Sample)"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scCalcSubTotolsFuncionList.select(9); // "Var (Sample)"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "BS", "20", "6", "C", "Sweet" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Var", "", "4", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Var", "", "#DIV/0!", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Var", "", "2", "", "" }, { "Grand Total", "", "3.5", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 	}
 
 	/**
@@ -217,19 +217,19 @@ public class SubtotalsFunctions {
 	 */
 	@Test
 	public void testDoNotSortOption() {
-		SCSubTotalsGroupByListBox.select(4); // "Team"
+		scSubTotalsGroupByListBox.select(4); // "Team"
 		// SCCalcSubTotalForColumns.click(10, 25);
-		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1); // "Code"
-		SCSubTotalsOptionsTabPage.select();
-		SCSubtotalsPreSortToGroupCheckBox.uncheck();
-		SCSubTotalsOptionsTabPage.ok();
+		scCalcSubTotalForColumns.select(1);
+		scCalcSubTotalForColumns.check(1); // "Code"
+		scSubTotalsOptionsTabPage.select();
+		scSubtotalsPreSortToGroupCheckBox.uncheck();
+		scSubTotalsOptionsTabPage.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" }, { "", "20", "", "B Sum", "" },
 				{ "BS", "20", "6", "C", "Sweet" }, { "", "20", "", "C Sum", "" }, { "BS", "20", "2", "A", "Chcomic" }, { "CS", "30", "5", "A", "Ally" },
 				{ "MS", "10", "1", "A", "Joker" }, { "", "60", "", "A Sum", "" }, { "MS", "10", "3", "B", "Kevin" }, { "", "10", "", "B Sum", "" },
-				{ "", "110", "", "Grand Total", "" } }, CalcUtil.getCellTexts("A1:E12"));
+				{ "", "110", "", "Grand Total", "" } }, SCTool.getCellTexts("A1:E12"));
 	}
 
 	/**
@@ -237,18 +237,18 @@ public class SubtotalsFunctions {
 	 */
 	@Test
 	public void testDefaultUI() {
-		assertArrayEquals("Group List: ", new String[] { "- none -", "Level", "Code", "No.", "Team", "Name" }, SCSubTotalsGroupByListBox.getItemsText());
+		assertArrayEquals("Group List: ", new String[] { "- none -", "Level", "Code", "No.", "Team", "Name" }, scSubTotalsGroupByListBox.getItemsText());
 
-		SCSubTotalsOptionsTabPage.select();
-		assertFalse(SCSubtotalsInsertPageBreakCheckBox.isChecked());
-		assertFalse(SCSubtotalsCaseSensitiveCheckBox.isChecked());
-		assertTrue(SCSubtotalsPreSortToGroupCheckBox.isChecked());
-		assertTrue(SCSubtotalSortAscendingRadioButton.isChecked());
-		assertFalse(SCSubtotalSortDescendingRadioButton.isChecked());
-		assertFalse(SCSubtotalsIncludeFormatsCheckBox.isChecked());
-		assertFalse(SCSubtotalsCustomSortOrderCheckBox.isChecked());
-		assertFalse(SCSubtotalsCustomSortListBox.isEnabled());
-		SCSubTotalsOptionsTabPage.ok();
+		scSubTotalsOptionsTabPage.select();
+		assertFalse(scSubtotalsInsertPageBreakCheckBox.isChecked());
+		assertFalse(scSubtotalsCaseSensitiveCheckBox.isChecked());
+		assertTrue(scSubtotalsPreSortToGroupCheckBox.isChecked());
+		assertTrue(scSubtotalSortAscendingRadioButton.isChecked());
+		assertFalse(scSubtotalSortDescendingRadioButton.isChecked());
+		assertFalse(scSubtotalsIncludeFormatsCheckBox.isChecked());
+		assertFalse(scSubtotalsCustomSortOrderCheckBox.isChecked());
+		assertFalse(scSubtotalsCustomSortListBox.isEnabled());
+		scSubTotalsOptionsTabPage.ok();
 	}
 
 	/**
@@ -256,24 +256,24 @@ public class SubtotalsFunctions {
 	 */
 	@Test
 	public void testUsingAllGroup() {
-		SCSubTotalsGroup1Dialog.select();
-		SCSubTotalsGroupByListBox.select(1); // "Level"
+		scSubTotalsGroup1Dialog.select();
+		scSubTotalsGroupByListBox.select(1); // "Level"
 		// SCCalcSubTotalForColumns.click(10, 45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCSubTotalsGroup2Dialog.select();
-		SCSubTotalsGroupByListBox.select(4); // "Team"
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scSubTotalsGroup2Dialog.select();
+		scSubTotalsGroupByListBox.select(4); // "Team"
 		// SCCalcSubTotalForColumns.click(10, 25);
-		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1); // "Code"
-		SCCalcSubTotolsFuncionList.select(3); // "Max"
-		SCSubTotalsGroup3Dialog.select();
-		SCSubTotalsGroupByListBox.select(5); // "Name"
+		scCalcSubTotalForColumns.select(1);
+		scCalcSubTotalForColumns.check(1); // "Code"
+		scCalcSubTotolsFuncionList.select(3); // "Max"
+		scSubTotalsGroup3Dialog.select();
+		scSubTotalsGroupByListBox.select(5); // "Name"
 		// SCCalcSubTotalForColumns.click(10, 25);
-		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1); // "Code"
-		SCSubTotalsGroup1Dialog.select();
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(1);
+		scCalcSubTotalForColumns.check(1); // "Code"
+		scSubTotalsGroup1Dialog.select();
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "2", "A", "Chcomic" }, { "", "20", "", "", "Chcomic Sum" },
@@ -282,7 +282,7 @@ public class SubtotalsFunctions {
 				{ "CS", "30", "5", "A", "Ally" }, { "", "30", "", "", "Ally Sum" }, { "", "30", "", "A Max", "" }, { "CS Sum", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "", "10", "", "", "Joker Sum" }, { "", "10", "", "A Max", "" }, { "MS", "10", "3", "B", "Kevin" },
 				{ "", "10", "", "", "Kevin Sum" }, { "", "10", "", "B Max", "" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "21", "", "" } },
-				CalcUtil.getCellTexts("A1:E23"));
+				SCTool.getCellTexts("A1:E23"));
 	}
 
 	/**
@@ -292,26 +292,26 @@ public class SubtotalsFunctions {
 	@Test
 	public void testRecalculateAfterRowDeleted() {
 		// SCCalcSubTotalForColumns.click(10,45);
-		SCCalcSubTotalForColumns.select(2);
-		SCCalcSubTotalForColumns.check(2); // "No."
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(2);
+		scCalcSubTotalForColumns.check(2); // "No."
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table before deleting row", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
 				{ "BS", "20", "6", "C", "Sweet" }, { "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "12", "", "" }, { "CS", "30", "5", "A", "Ally" },
 				{ "CS Sum", "", "5", "", "" }, { "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" },
-				{ "Grand Total", "", "21", "", "" } }, CalcUtil.getCellTexts("A1:E11"));
+				{ "Grand Total", "", "21", "", "" } }, SCTool.getCellTexts("A1:E11"));
 
-		CalcUtil.selectRange("A3:E3");
+		SCTool.selectRange("A3:E3");
 		app.dispatch(".uno:DeleteCell");
-		SCDeleteCellsDeleteRowsRadioButton.check();
-		SCDeleteCellsDialog.ok();
+		scDeleteCellsDeleteRowsRadioButton.check();
+		scDeleteCellsDialog.ok();
 		sleep(1);
 
 		assertArrayEquals("Subtotal table after deleting row", new String[][] { { "Level", "Code", "No.", "Team", "Name" }, { "BS", "20", "4", "B", "Elle" },
 				{ "BS", "20", "2", "A", "Chcomic" }, { "BS Sum", "", "6", "", "" }, { "CS", "30", "5", "A", "Ally" }, { "CS Sum", "", "5", "", "" },
 				{ "MS", "10", "1", "A", "Joker" }, { "MS", "10", "3", "B", "Kevin" }, { "MS Sum", "", "4", "", "" }, { "Grand Total", "", "15", "", "" }, { "", "", "", "", "" } },
-				CalcUtil.getCellTexts("A1:E11"));
+				SCTool.getCellTexts("A1:E11"));
 
 	}
 
@@ -321,30 +321,30 @@ public class SubtotalsFunctions {
 	 */
 	@Test
 	public void testRecalculateWhenDataChanged() {
-		SCSubTotalsGroupByListBox.select(4); // "Team"
+		scSubTotalsGroupByListBox.select(4); // "Team"
 		// SCCalcSubTotalForColumns.click(10,25);
-		SCCalcSubTotalForColumns.select(1);
-		SCCalcSubTotalForColumns.check(1); // "Code"
-		SCCalcSubTotolsFuncionList.select(2); // "Average"
-		SCSubTotalsGroup1Dialog.ok();
+		scCalcSubTotalForColumns.select(1);
+		scCalcSubTotalForColumns.check(1); // "Code"
+		scCalcSubTotolsFuncionList.select(2); // "Average"
+		scSubTotalsGroup1Dialog.ok();
 		sleep(1);
 
-		CalcUtil.selectRange("B4");
+		SCTool.selectRange("B4");
 		typeKeys("40" + "<enter>");
 		sleep(1);
-		assertEquals("30", CalcUtil.getCellText("B5"));
-		assertEquals("23.33333333", CalcUtil.getCellText("B11"));
+		assertEquals("30", SCTool.getCellText("B5"));
+		assertEquals("23.33333333", SCTool.getCellText("B11"));
 
-		CalcUtil.selectRange("B7");
+		SCTool.selectRange("B7");
 		typeKeys("50" + "<enter>");
 		sleep(1);
-		assertEquals("35", CalcUtil.getCellText("B8"));
-		assertEquals("30", CalcUtil.getCellText("B11"));
+		assertEquals("35", SCTool.getCellText("B8"));
+		assertEquals("30", SCTool.getCellText("B11"));
 
-		CalcUtil.selectRange("B9");
+		SCTool.selectRange("B9");
 		typeKeys("30" + "<enter>");
 		sleep(1);
-		assertEquals("30", CalcUtil.getCellText("B10"));
-		assertEquals("31.66666667", CalcUtil.getCellText("B11"));
+		assertEquals("30", SCTool.getCellText("B10"));
+		assertEquals("31.66666667", SCTool.getCellText("B11"));
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java Fri Sep  7 02:29:53 2012
@@ -22,7 +22,7 @@
 package testcase.gui.sc.validity;
 
 import static org.junit.Assert.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import java.io.File;
@@ -35,7 +35,7 @@ import org.openoffice.test.common.Logger
 import org.openoffice.test.vcl.IDList;
 import org.openoffice.test.vcl.widgets.VclMessageBox;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 public class ValidityDateSupport1024Columns {
 	private static IDList idList = new IDList(new File("./ids"));
@@ -61,41 +61,41 @@ public class ValidityDateSupport1024Colu
 	@Test
 	public void testValidityDateSupport1024Columns() {
 		app.dispatch("private:factory/scalc");
-		CalcUtil.selectRange("ALM1000:ALO1005");
+		SCTool.selectRange("ALM1000:ALO1005");
 		app.dispatch(".uno:Validation");
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(3); // "Date"
-		SC_ValidityDecimalCompareOperator.select(2); // "greater than"
-		SC_ValiditySourceInput.setText("01/01/08");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(3); // "Date"
+		scValidityDecimalCompareOperator.select(2); // "greater than"
+		scValiditySourceInput.setText("01/01/08");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("ALM1001");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("ALM1001");
+		scInputBarInput.activate();
 		typeKeys("02/01/08<enter>");
-		assertEquals("02/01/08", CalcUtil.getCellText("ALM1001"));
+		assertEquals("02/01/08", SCTool.getCellText("ALM1001"));
 
-		CalcUtil.selectRange("ALM1002");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("ALM1002");
+		scInputBarInput.activate();
 		typeKeys("01/02/08<enter>");
-		assertEquals("01/02/08", CalcUtil.getCellText("ALM1002"));
+		assertEquals("01/02/08", SCTool.getCellText("ALM1002"));
 
-		CalcUtil.selectRange("ALM1003");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("ALM1003");
+		scInputBarInput.activate();
 		typeKeys("01/01/08<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("ALM1003"));
+		assertEquals("", SCTool.getCellText("ALM1003"));
 
-		CalcUtil.selectRange("AML1003");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("AML1003");
+		scInputBarInput.activate();
 		typeKeys("12/31/07<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("AML1003"));
+		assertEquals("", SCTool.getCellText("AML1003"));
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java Fri Sep  7 02:29:53 2012
@@ -55,16 +55,16 @@ public class ValidityDialogDefaultValue 
 	@Test
 	public void testValidityUICellRange() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(5); // "Cell range"
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(5); // "Cell range"
 
-		assertEquals(true, SC_ValidityAllowBlankCells.isChecked());
-		assertEquals(true, SC_ValidityShowSelectionList.isChecked());
-		assertEquals(false, SC_ValiditySortEntriesAscending.isChecked());
-		assertEquals(true, SC_ValidityAllowBlankCells.isEnabled());
-		assertEquals(true, SC_ValiditySortEntriesAscending.isEnabled());
-		assertEquals(true, SC_ValiditySortEntriesAscending.isEnabled());
-		assertEquals(true, SC_ValiditySourcePicker.isEnabled());
+		assertEquals(true, scValidityAllowBlankCells.isChecked());
+		assertEquals(true, scValidityShowSelectionList.isChecked());
+		assertEquals(false, scValiditySortEntriesAscending.isChecked());
+		assertEquals(true, scValidityAllowBlankCells.isEnabled());
+		assertEquals(true, scValiditySortEntriesAscending.isEnabled());
+		assertEquals(true, scValiditySortEntriesAscending.isEnabled());
+		assertEquals(true, scValiditySourcePicker.isEnabled());
 	}
 
 	/**
@@ -73,16 +73,16 @@ public class ValidityDialogDefaultValue 
 	@Test
 	public void testValidityUIErrorAlert() {
 
-		SC_ValidityErrorAlertTabPage.select();
-		assertEquals(true, SC_ValidityErrorAlertActionList.isEnabled());
+		scValidityErrorAlertTabPage.select();
+		assertEquals(true, scValidityErrorAlertActionList.isEnabled());
 		// assertEquals("Stop",SC_ValidityErrorAlertActionList.getSelText()); //
 		// Do not test this. Do it in GVT.
-		assertEquals(true, SC_ValidityErrorMessageTitle.isEnabled());
-		assertEquals("", SC_ValidityErrorMessageTitle.getText());
-		assertEquals(true, SC_ValidityErrorMessage.isEnabled());
-		assertEquals("", SC_ValidityErrorMessage.getText());
-		SC_ValidityErrorAlertActionList.select(3); // "Macro"
-		assertEquals(true, SC_ValidityErrorBrowseButton.isEnabled());
+		assertEquals(true, scValidityErrorMessageTitle.isEnabled());
+		assertEquals("", scValidityErrorMessageTitle.getText());
+		assertEquals(true, scValidityErrorMessage.isEnabled());
+		assertEquals("", scValidityErrorMessage.getText());
+		scValidityErrorAlertActionList.select(3); // "Macro"
+		assertEquals(true, scValidityErrorBrowseButton.isEnabled());
 	}
 
 }



Mime
View raw message