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 [2/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/datapilot/DataPivotTable.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/datapilot/DataPivotTable.java Fri Sep  7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.sc.datapilot;
 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.Logger;
 import org.openoffice.test.common.SystemUtil;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 /**
  * Test Data->Pivot Table Test cases in this class are unavailable. Because
@@ -75,73 +75,73 @@ public class DataPivotTable {
 		sleep(2);
 
 		// Create DataPilotTable and verify the content
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
 		// Add field into every area
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
 		// Copy and paste the data pilot table and verify the content
-		CalcUtil.selectRange("A1:J24");
+		SCTool.selectRange("A1:J24");
 		typeKeys("<$copy>");
 
-		CalcUtil.selectRange("A26");
+		SCTool.selectRange("A26");
 		typeKeys("<$paste>");
-		assertEquals("Locale", CalcUtil.getCellText("A26"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A28"));
-		assertEquals("Name", CalcUtil.getCellText("B28"));
-		assertEquals("Date", CalcUtil.getCellText("A29"));
-		assertEquals("Total Result", CalcUtil.getCellText("A48"));
-		assertEquals("Total Result", CalcUtil.getCellText("J29"));
-		assertEquals("266773", CalcUtil.getCellText("J48"));
+		assertEquals("Locale", SCTool.getCellText("A26"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A28"));
+		assertEquals("Name", SCTool.getCellText("B28"));
+		assertEquals("Date", SCTool.getCellText("A29"));
+		assertEquals("Total Result", SCTool.getCellText("A48"));
+		assertEquals("Total Result", SCTool.getCellText("J29"));
+		assertEquals("266773", SCTool.getCellText("J48"));
 		sleep(1);
 
-		CalcUtil.selectRange("A1:J24");
+		SCTool.selectRange("A1:J24");
 		typeKeys("<$copy>");
-		CalcUtil.selectRange("$A.$A29");
+		SCTool.selectRange("$A.$A29");
 		typeKeys("<$paste>");
-		assertEquals("Locale", CalcUtil.getCellText("A29"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A31"));
-		assertEquals("Name", CalcUtil.getCellText("B31"));
-		assertEquals("Date", CalcUtil.getCellText("A32"));
-		assertEquals("Total Result", CalcUtil.getCellText("A51"));
-		assertEquals("Total Result", CalcUtil.getCellText("J32"));
-		assertEquals("266773", CalcUtil.getCellText("J51"));
+		assertEquals("Locale", SCTool.getCellText("A29"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A31"));
+		assertEquals("Name", SCTool.getCellText("B31"));
+		assertEquals("Date", SCTool.getCellText("A32"));
+		assertEquals("Total Result", SCTool.getCellText("A51"));
+		assertEquals("Total Result", SCTool.getCellText("J32"));
+		assertEquals("266773", SCTool.getCellText("J51"));
 	}
 
 	/**
@@ -157,62 +157,62 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
 		sleep(1);
 
 		// Add field into every area
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A1"));
+		assertEquals("Name", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A2"));
+		assertEquals("Date", SCTool.getCellText("A2"));
 		sleep(1);
 
-		DataPilotFieldSelect.drag(1, 1, 184, 80);
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		dataPilotFieldSelect.drag(1, 1, 184, 80);
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("", CalcUtil.getCellText("A1"));
+		assertEquals("", SCTool.getCellText("A1"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("", CalcUtil.getCellText("A3"));
+		assertEquals("", SCTool.getCellText("A3"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 	}
 
@@ -229,86 +229,86 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
 
-		DataPilotAutomaticallyUpdateCheckBox.uncheck();
+		dataPilotAutomaticallyUpdateCheckBox.uncheck();
 
 		sleep(1);
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 		sleep(1);
 
-		CalcUtil.selectRange("B20");
-		ActiveMsgBox.yes();
+		SCTool.selectRange("B20");
+		activeMsgBox.yes();
 		sleep(1);
-		assertEquals("Name", CalcUtil.getCellText("B1"));
-		assertEquals("Date", CalcUtil.getCellText("A2"));
+		assertEquals("Name", SCTool.getCellText("B1"));
+		assertEquals("Date", SCTool.getCellText("A2"));
 
-		DataPilotFieldSelect.drag(1, 1, 184, 80);
-		assertEquals("Name", CalcUtil.getCellText("B1"));
-		assertEquals("Date", CalcUtil.getCellText("A2"));
+		dataPilotFieldSelect.drag(1, 1, 184, 80);
+		assertEquals("Name", SCTool.getCellText("B1"));
+		assertEquals("Date", SCTool.getCellText("A2"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Name", CalcUtil.getCellText("B1"));
-		assertEquals("Date", CalcUtil.getCellText("A2"));
+		assertEquals("Name", SCTool.getCellText("B1"));
+		assertEquals("Date", SCTool.getCellText("A2"));
 		sleep(1);
 
-		DataPilotTableUpdateButton.click();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		dataPilotTableUpdateButton.click();
+		assertEquals("Locale", SCTool.getCellText("A1"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Name", CalcUtil.getCellText("B1"));
-		assertEquals("Date", CalcUtil.getCellText("A2"));
+		assertEquals("Name", SCTool.getCellText("B1"));
+		assertEquals("Date", SCTool.getCellText("A2"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPilotAutomaticallyUpdateCheckBox.check();
-		assertTrue(DataPilotAutomaticallyUpdateCheckBox.isChecked());
+		dataPilotAutomaticallyUpdateCheckBox.check();
+		assertTrue(dataPilotAutomaticallyUpdateCheckBox.isChecked());
 	}
 
 	/**
@@ -324,118 +324,118 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("B1"));
+		assertEquals("Name", SCTool.getCellText("B1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
+		assertEquals("Order Number", SCTool.getCellText("B3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 90);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 90);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Amount", CalcUtil.getCellText("A1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Sum - Amount", SCTool.getCellText("A1"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
 		// Change Locale option settings, and verify it
 		String target = "New Locale";
-		DataPilotColumnArea.click(1, 1);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 1);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Field Option").select();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldDisplayNameEditBox.setText(target);
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldDisplayNameEditBox.setText(target);
 		sleep(1);
 
-		DataPilotFieldOptionFiledSubtotalsPage.select();
+		dataPilotFieldOptionFiledSubtotalsPage.select();
 		sleep(1);
-		DataPilotFieldOptionSubTotalsManuallyRadioButton.check();
+		dataPilotFieldOptionSubTotalsManuallyRadioButton.check();
 		sleep(1);
-		SC_DataPilotOptionSubtotalFunctionList.click(9, 24);
+		scDataPilotOptionSubtotalFunctionList.click(9, 24);
 		sleep(1);
 
-		DataPilotFieldOptionSortTabPageDialog.select();
+		dataPilotFieldOptionSortTabPageDialog.select();
 
-		DataPilotFieldOptionSortDescendingRadioButton.check();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
+		dataPilotFieldOptionSortDescendingRadioButton.check();
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
 		sleep(1);
 
-		assertEquals("New Locale", CalcUtil.getCellText("C1"));
-		assertEquals("USA", CalcUtil.getCellText("C2"));
-		assertEquals("USA Count - Amount", CalcUtil.getCellInput("H2"));
-		assertEquals("17", CalcUtil.getCellInput("H30"));
-		assertEquals("China Count - Amount", CalcUtil.getCellInput("L2"));
-		assertEquals("9", CalcUtil.getCellInput("L30"));
-		assertEquals("32779.17", CalcUtil.getCellInput("M30"));
+		assertEquals("New Locale", SCTool.getCellText("C1"));
+		assertEquals("USA", SCTool.getCellText("C2"));
+		assertEquals("USA Count - Amount", SCTool.getCellInput("H2"));
+		assertEquals("17", SCTool.getCellInput("H30"));
+		assertEquals("China Count - Amount", SCTool.getCellInput("L2"));
+		assertEquals("9", SCTool.getCellInput("L30"));
+		assertEquals("32779.17", SCTool.getCellInput("M30"));
 
-		DataPilotColumnArea.click(1, 30);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 30);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Field Option").select();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldShowItemWithoutDataCheckBox.check();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("Emmy Ma", CalcUtil.getCellText("F3"));
-		assertEquals("32779.17", CalcUtil.getCellInput("U30"));
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldShowItemWithoutDataCheckBox.check();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("Emmy Ma", SCTool.getCellText("F3"));
+		assertEquals("32779.17", SCTool.getCellInput("U30"));
 
-		CalcUtil.selectRange("C1");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("C1");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldDisplayNameEditBox.setText("Locale");
-		DataPilotFieldOptionFiledSubtotalsPage.select();
-		DataPilotFieldOptionSubTotalsNeverRadioButton.check();
-		sleep(1);
-		DataPilotFieldOptionSortTabPageDialog.select();
-		DataPilotFieldOptionSortAscendingRadioButton.check();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-
-		assertEquals("Locale", CalcUtil.getCellText("C1"));
-		assertEquals("China", CalcUtil.getCellText("C2"));
-		assertEquals("USA", CalcUtil.getCellText("K2"));
-		assertEquals("32779.17", CalcUtil.getCellInput("S30"));
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldDisplayNameEditBox.setText("Locale");
+		dataPilotFieldOptionFiledSubtotalsPage.select();
+		dataPilotFieldOptionSubTotalsNeverRadioButton.check();
+		sleep(1);
+		dataPilotFieldOptionSortTabPageDialog.select();
+		dataPilotFieldOptionSortAscendingRadioButton.check();
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+
+		assertEquals("Locale", SCTool.getCellText("C1"));
+		assertEquals("China", SCTool.getCellText("C2"));
+		assertEquals("USA", SCTool.getCellText("K2"));
+		assertEquals("32779.17", SCTool.getCellInput("S30"));
 
-		CalcUtil.selectRange("D1");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("D1");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldShowItemWithoutDataCheckBox.uncheck();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldShowItemWithoutDataCheckBox.uncheck();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 	}
 
 	/**
@@ -449,74 +449,74 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		CalcUtil.selectRange("B4:C4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B4:C4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Group->Group Selected Items").select();
-		assertEquals("Name2", CalcUtil.getCellText("B3"));
-		assertEquals("Name", CalcUtil.getCellText("C3"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Name2", SCTool.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellText("C3"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
-		DataPilotColumnArea.click(1, 1);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 1);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Move to Row").select();
-		assertEquals("Name2", CalcUtil.getCellText("B4"));
-		assertEquals("Group1", CalcUtil.getCellText("B6"));
-		assertEquals("266773", CalcUtil.getCellText("K31"));
+		assertEquals("Name2", SCTool.getCellText("B4"));
+		assertEquals("Group1", SCTool.getCellText("B6"));
+		assertEquals("266773", SCTool.getCellText("K31"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Name2", CalcUtil.getCellText("B3"));
-		assertEquals("Name", CalcUtil.getCellText("C3"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Name2", SCTool.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellText("C3"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Name2", CalcUtil.getCellText("B4"));
-		assertEquals("Group1", CalcUtil.getCellText("B6"));
-		assertEquals("266773", CalcUtil.getCellText("K31"));
+		assertEquals("Name2", SCTool.getCellText("B4"));
+		assertEquals("Group1", SCTool.getCellText("B6"));
+		assertEquals("266773", SCTool.getCellText("K31"));
 	}
 
 	/**
@@ -531,87 +531,87 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		CalcUtil.selectRange("A1:J24");
+		SCTool.selectRange("A1:J24");
 		typeKeys("<$copy>");
 
-		CalcUtil.selectRange("A26");
+		SCTool.selectRange("A26");
 		typeKeys("<$paste>");
-		assertEquals("Locale", CalcUtil.getCellText("A26"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A28"));
-		assertEquals("Name", CalcUtil.getCellText("B28"));
-		assertEquals("Date", CalcUtil.getCellText("A29"));
-		assertEquals("Total Result", CalcUtil.getCellText("A48"));
-		assertEquals("Total Result", CalcUtil.getCellText("J29"));
-		assertEquals("266773", CalcUtil.getCellText("J48"));
+		assertEquals("Locale", SCTool.getCellText("A26"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A28"));
+		assertEquals("Name", SCTool.getCellText("B28"));
+		assertEquals("Date", SCTool.getCellText("A29"));
+		assertEquals("Total Result", SCTool.getCellText("A48"));
+		assertEquals("Total Result", SCTool.getCellText("J29"));
+		assertEquals("266773", SCTool.getCellText("J48"));
 		sleep(1);
 
-		CalcUtil.selectRange("A1");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("A1");
+		spreadSheetCells.openContextMenu();
 		menuItem("Show DataPilot Panel").select();
-		assertFalse(DataPilotPanel.exists());
+		assertFalse(dataPilotPanel.exists());
 		sleep(1);
 
-		CalcUtil.selectRange("A1");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("A1");
+		spreadSheetCells.openContextMenu();
 		menuItem("Show DataPilot Panel").select();
-		assertTrue(DataPilotPanel.exists());
+		assertTrue(dataPilotPanel.exists());
 		sleep(1);
 
-		DataPilotPanel.close();
-		assertFalse(DataPilotPanel.exists());
+		dataPilotPanel.close();
+		assertFalse(dataPilotPanel.exists());
 		sleep(1);
 
-		CalcUtil.selectRange("A26");
-		DataPilotButton.click();
+		SCTool.selectRange("A26");
+		dataPilotButton.click();
 		sleep(1);
-		assertTrue(DataPilotPanel.exists());
-		assertEquals("Locale", CalcUtil.getCellText("A26"));
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A28"));
-		assertEquals("Name", CalcUtil.getCellText("B28"));
-		assertEquals("Date", CalcUtil.getCellText("A29"));
-		assertEquals("Total Result", CalcUtil.getCellText("A48"));
-		assertEquals("Total Result", CalcUtil.getCellText("J29"));
-		assertEquals("266773", CalcUtil.getCellText("J48"));
+		assertTrue(dataPilotPanel.exists());
+		assertEquals("Locale", SCTool.getCellText("A26"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A28"));
+		assertEquals("Name", SCTool.getCellText("B28"));
+		assertEquals("Date", SCTool.getCellText("A29"));
+		assertEquals("Total Result", SCTool.getCellText("A48"));
+		assertEquals("Total Result", SCTool.getCellText("J29"));
+		assertEquals("266773", SCTool.getCellText("J48"));
 	}
 
 	/**
@@ -626,95 +626,95 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		createDataPilotTableDialog.ok();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("B1"));
+		assertEquals("Name", SCTool.getCellText("B1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
+		assertEquals("Order Number", SCTool.getCellText("B3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 90);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 90);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Amount", CalcUtil.getCellText("A1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Sum - Amount", SCTool.getCellText("A1"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
-		DataPilotAutomaticallyUpdateCheckBox.uncheck();
-		DataPilotColumnArea.drag(1, 1, 1, 60);
-		assertEquals("Name", CalcUtil.getCellText("D1"));
-		assertEquals("Locale", CalcUtil.getCellText("C1"));
+		dataPilotAutomaticallyUpdateCheckBox.uncheck();
+		dataPilotColumnArea.drag(1, 1, 1, 60);
+		assertEquals("Name", SCTool.getCellText("D1"));
+		assertEquals("Locale", SCTool.getCellText("C1"));
 		sleep(1);
 
-		DataPilotPaneRowArea.drag(1, 1, 1, 60);
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
-		assertEquals("Date", CalcUtil.getCellText("A3"));
+		dataPilotPaneRowArea.drag(1, 1, 1, 60);
+		assertEquals("Order Number", SCTool.getCellText("B3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
 		sleep(1);
 
-		CalcUtil.selectRange("A33");
-		ActiveMsgBox.yes();
-		assertEquals("Name", CalcUtil.getCellText("C1"));
-		assertEquals("Locale", CalcUtil.getCellText("D1"));
-		assertEquals("Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("Date", CalcUtil.getCellText("B3"));
+		SCTool.selectRange("A33");
+		activeMsgBox.yes();
+		assertEquals("Name", SCTool.getCellText("C1"));
+		assertEquals("Locale", SCTool.getCellText("D1"));
+		assertEquals("Order Number", SCTool.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("B3"));
 		sleep(1);
 
-		DataPilotColumnArea.click(1, 1);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 1);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Move Down").select();
-		assertEquals("Name", CalcUtil.getCellText("C1"));
-		assertEquals("Locale", CalcUtil.getCellText("D1"));
+		assertEquals("Name", SCTool.getCellText("C1"));
+		assertEquals("Locale", SCTool.getCellText("D1"));
 		sleep(1);
 
-		DataPilotPaneRowArea.click(1, 30);
-		DataPilotPaneRowArea.openContextMenu();
+		dataPilotPaneRowArea.click(1, 30);
+		dataPilotPaneRowArea.openContextMenu();
 		menuItem("Move Up").select();
-		assertEquals("Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("Date", CalcUtil.getCellText("B3"));
+		assertEquals("Order Number", SCTool.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("B3"));
 		sleep(1);
 
-		CalcUtil.selectRange("A33");
-		ActiveMsgBox.yes();
-		assertEquals("Name", CalcUtil.getCellText("D1"));
-		assertEquals("Locale", CalcUtil.getCellText("C1"));
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
-		assertEquals("Date", CalcUtil.getCellText("A3"));
-		assertEquals("Sum - Amount", CalcUtil.getCellText("A1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
-		DataPilotAutomaticallyUpdateCheckBox.check();
+		SCTool.selectRange("A33");
+		activeMsgBox.yes();
+		assertEquals("Name", SCTool.getCellText("D1"));
+		assertEquals("Locale", SCTool.getCellText("C1"));
+		assertEquals("Order Number", SCTool.getCellText("B3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
+		assertEquals("Sum - Amount", SCTool.getCellText("A1"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
+		dataPilotAutomaticallyUpdateCheckBox.check();
 		sleep(1);
 	}
 
@@ -730,73 +730,73 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		createDataPilotTableDialog.ok();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("B1"));
+		assertEquals("Name", SCTool.getCellText("B1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
+		assertEquals("Order Number", SCTool.getCellText("B3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 90);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 90);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Amount", CalcUtil.getCellText("A1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Sum - Amount", SCTool.getCellText("A1"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
-		DataPilotPaneRowArea.drag(1, 1, 1, -50);
-		assertEquals("Date", CalcUtil.getCellText("D1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("AB31"));
+		dataPilotPaneRowArea.drag(1, 1, 1, -50);
+		assertEquals("Date", SCTool.getCellText("D1"));
+		assertEquals("32779.17", SCTool.getCellInput("AB31"));
 		sleep(1);
 
-		DataPilotColumnArea.click(1, 50);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 50);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Move to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("B3"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Date", SCTool.getCellText("B3"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Date", CalcUtil.getCellText("D1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("AB31"));
+		assertEquals("Date", SCTool.getCellText("D1"));
+		assertEquals("32779.17", SCTool.getCellInput("AB31"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Date", CalcUtil.getCellText("B3"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Date", SCTool.getCellText("B3"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 	}
 
 	/**
@@ -811,79 +811,79 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		createDataPilotTableDialog.ok();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("B1"));
+		assertEquals("Name", SCTool.getCellText("B1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A3"));
+		assertEquals("Date", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Order Number", CalcUtil.getCellText("B3"));
+		assertEquals("Order Number", SCTool.getCellText("B3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 90);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 90);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Amount", CalcUtil.getCellText("A1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		assertEquals("Sum - Amount", SCTool.getCellText("A1"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
-		DataPilotAutomaticallyUpdateCheckBox.uncheck();
+		dataPilotAutomaticallyUpdateCheckBox.uncheck();
 
-		DataPilotPaneRowArea.drag(1, 1, 1, -50);
-		assertEquals("Date", CalcUtil.getCellText("A3"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		dataPilotPaneRowArea.drag(1, 1, 1, -50);
+		assertEquals("Date", SCTool.getCellText("A3"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
-		CalcUtil.selectRange("B33");
-		ActiveMsgBox.yes();
-		assertEquals("Date", CalcUtil.getCellText("D1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("AB31"));
+		SCTool.selectRange("B33");
+		activeMsgBox.yes();
+		assertEquals("Date", SCTool.getCellText("D1"));
+		assertEquals("32779.17", SCTool.getCellInput("AB31"));
 		sleep(1);
 
-		DataPilotColumnArea.click(1, 50);
-		DataPilotColumnArea.openContextMenu();
+		dataPilotColumnArea.click(1, 50);
+		dataPilotColumnArea.openContextMenu();
 		menuItem("Move to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("D1"));
-		assertEquals("32779.17", CalcUtil.getCellInput("AB31"));
+		assertEquals("Date", SCTool.getCellText("D1"));
+		assertEquals("32779.17", SCTool.getCellInput("AB31"));
 
-		CalcUtil.selectRange("B33");
-		ActiveMsgBox.yes();
-		assertEquals("Date", CalcUtil.getCellText("B3"));
-		assertEquals("32779.17", CalcUtil.getCellInput("K30"));
+		SCTool.selectRange("B33");
+		activeMsgBox.yes();
+		assertEquals("Date", SCTool.getCellText("B3"));
+		assertEquals("32779.17", SCTool.getCellInput("K30"));
 		sleep(1);
 
-		DataPilotAutomaticallyUpdateCheckBox.check();
+		dataPilotAutomaticallyUpdateCheckBox.check();
 	}
 
 	/**
@@ -901,63 +901,63 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		CalcUtil.selectRange("A1:B4");
+		SCTool.selectRange("A1:B4");
 		typeKeys("<$copy>");
-		CalcUtil.selectRange("C1");
+		SCTool.selectRange("C1");
 		typeKeys("<$paste>");
 		sleep(1);
 
-		CalcUtil.selectRange("$A.A1");
+		SCTool.selectRange("$A.A1");
 		typeKeys("New Locale" + "<enter>");
 
-		CalcUtil.selectRange("$DataPilot_A_1.A1");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("$DataPilot_A_1.A1");
+		spreadSheetCells.openContextMenu();
 		menuItem("Refresh Data").select();
-		ActiveMsgBox.ok();
+		activeMsgBox.ok();
 
-		CalcUtil.selectRange("A1:B4");
-		SpreadSheetCells.drag(80, 45, 80, 350);
+		SCTool.selectRange("A1:B4");
+		spreadSheetCells.drag(80, 45, 80, 350);
 
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B20"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B22"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B23"));
-		assertEquals("Page Area", CalcUtil.getCellText("B25"));
-		assertEquals("Row Area", CalcUtil.getCellText("B28"));
-		assertEquals("Column Area", CalcUtil.getCellText("D27"));
-		assertEquals("Data Area", CalcUtil.getCellText("D29"));
-		DataPilotPanel.close();
-		sleep(1);
-
-		CalcUtil.selectRange("C1:D4");
-		SpreadSheetCells.drag(210, 50, 10, 50);
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		assertEquals("New DataPilot Table", SCTool.getCellText("B20"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B22"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B23"));
+		assertEquals("Page Area", SCTool.getCellText("B25"));
+		assertEquals("Row Area", SCTool.getCellText("B28"));
+		assertEquals("Column Area", SCTool.getCellText("D27"));
+		assertEquals("Data Area", SCTool.getCellText("D29"));
+		dataPilotPanel.close();
+		sleep(1);
+
+		SCTool.selectRange("C1:D4");
+		spreadSheetCells.drag(210, 50, 10, 50);
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 	}
 
 	/**
@@ -972,52 +972,52 @@ public class DataPivotTable {
 		submitOpenDlg(file);
 		sleep(2);
 		calc.maximize();
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		typeKeys("<$copy>");
-		CalcUtil.selectRange("A1048540");
+		SCTool.selectRange("A1048540");
 		typeKeys("<$paste>");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		DataPilotTableToExistPlaceRadioButton.check();
-		assertTrue(DataPilotTableToExistPlaceRadioButton.isChecked());
-		DataPilotTableToExistPlaceEditBox.setText("$A.$F$1048540");
-		CreateDataPilotTableDialog.ok();
+		dataPilotTableToExistPlaceRadioButton.check();
+		assertTrue(dataPilotTableToExistPlaceRadioButton.isChecked());
+		dataPilotTableToExistPlaceEditBox.setText("$A.$F$1048540");
+		createDataPilotTableDialog.ok();
 		sleep(1);
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 
 		}
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("F1048540"));
+		assertEquals("Locale", SCTool.getCellText("F1048540"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("F1048542"));
+		assertEquals("Name", SCTool.getCellText("F1048542"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("F1048543"));
+		assertEquals("Date", SCTool.getCellText("F1048543"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("F1048542"));
-		assertEquals("266773", CalcUtil.getCellText("O1048562"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("F1048542"));
+		assertEquals("266773", SCTool.getCellText("O1048562"));
 		sleep(1);
 
-		CalcUtil.selectRange("D1048541");
+		SCTool.selectRange("D1048541");
 		typeKeys("10000<enter>");
 		sleep(1);
 
-		CalcUtil.selectRange("O1048562");
+		SCTool.selectRange("O1048562");
 		calc.menuItem("Data->DataPilot->Refresh").select();
-		assertEquals("266525", CalcUtil.getCellText("O1048562"));
+		assertEquals("266525", SCTool.getCellText("O1048562"));
 	}
 
 	/**
@@ -1032,81 +1032,81 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPilotAutomaticallyUpdateCheckBox.uncheck();
+		dataPilotAutomaticallyUpdateCheckBox.uncheck();
 
-		DataPilotColumnArea.drag(1, 1, -30, 1);
-		assertEquals("Name", CalcUtil.getCellText("B3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		dataPilotColumnArea.drag(1, 1, -30, 1);
+		assertEquals("Name", SCTool.getCellText("B3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPilotPaneRowArea.click(1, 1);
-		DataPilotPaneRowArea.openContextMenu();
+		dataPilotPaneRowArea.click(1, 1);
+		dataPilotPaneRowArea.openContextMenu();
 		menuItem("Remove").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Date", SCTool.getCellText("A4"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPilotPanePageArea.drag(1, 1, -30, 1);
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		dataPilotPanePageArea.drag(1, 1, -30, 1);
+		assertEquals("Locale", SCTool.getCellText("A1"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPiloPaneDataArea.openContextMenu();
+		dataPiloPaneDataArea.openContextMenu();
 		menuItem("Remove").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 
-		CalcUtil.selectRange("B25");
-		ActiveMsgBox.yes();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		SCTool.selectRange("B25");
+		activeMsgBox.yes();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		DataPilotAutomaticallyUpdateCheckBox.check();
+		dataPilotAutomaticallyUpdateCheckBox.check();
 	}
 
 	/**
@@ -1120,62 +1120,62 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		CalcUtil.selectRange("B4:C4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B4:C4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Group->Group Selected Items").select();
-		assertEquals("Name2", CalcUtil.getCellText("B3"));
-		assertEquals("Name", CalcUtil.getCellText("C3"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Name2", SCTool.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellText("C3"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
-		CalcUtil.selectRange("D4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("D4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Group->Ungroup").select();
-		assertEquals("Name", CalcUtil.getCellText("B3"));
-		assertEquals("", CalcUtil.getCellText("C3"));
-		assertEquals("Bill Zhang", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Name", SCTool.getCellText("B3"));
+		assertEquals("", SCTool.getCellText("C3"));
+		assertEquals("Bill Zhang", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 	}
 
 	/**
@@ -1190,107 +1190,107 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		DataPilotPanePageArea.click(1, 1);
-		DataPilotPanePageArea.openContextMenu();
+		dataPilotPanePageArea.click(1, 1);
+		dataPilotPanePageArea.openContextMenu();
 		menuItem("Field Option").select();
-		DataPilotFieldDisplayNameEditBox.setText("New Locale");
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("New Locale", CalcUtil.getCellText("A1"));
+		dataPilotFieldDisplayNameEditBox.setText("New Locale");
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("New Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("New Locale", CalcUtil.getCellText("A1"));
+		assertEquals("New Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		CalcUtil.selectRange("B3");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B3");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldDisplayNameEditBox.setText("New Name");
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("New Name", CalcUtil.getCellText("B3"));
+		dataPilotFieldDisplayNameEditBox.setText("New Name");
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("New Name", SCTool.getCellText("B3"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Name", CalcUtil.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellText("B3"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("New Name", CalcUtil.getCellText("B3"));
+		assertEquals("New Name", SCTool.getCellText("B3"));
 		sleep(1);
 
-		CalcUtil.selectRange("A4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("A4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldDisplayNameEditBox.setText("New Date");
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("New Date", CalcUtil.getCellText("A4"));
+		dataPilotFieldDisplayNameEditBox.setText("New Date");
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("New Date", SCTool.getCellText("A4"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("New Date", CalcUtil.getCellText("A4"));
+		assertEquals("New Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPiloPaneDataArea.openContextMenu();
+		dataPiloPaneDataArea.openContextMenu();
 		menuItem("Field Option").select();
-		DataPilotFieldDisplayNameEditBox.setText("New Sum - Order Number");
-		DataPilotFieldOptionFieldTabPageDialog.ok();
-		assertEquals("New Sum - Order Number", CalcUtil.getCellText("A3"));
+		dataPilotFieldDisplayNameEditBox.setText("New Sum - Order Number");
+		dataPilotFieldOptionFieldTabPageDialog.ok();
+		assertEquals("New Sum - Order Number", SCTool.getCellText("A3"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("New Sum - Order Number", CalcUtil.getCellText("A3"));
+		assertEquals("New Sum - Order Number", SCTool.getCellText("A3"));
 		sleep(1);
 	}
 
@@ -1306,82 +1306,82 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		CalcUtil.selectRange("B4:C4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B4:C4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Group->Group Selected Items").select();
-		assertEquals("Name2", CalcUtil.getCellText("B3"));
-		assertEquals("Name", CalcUtil.getCellInput("C3"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Name2", SCTool.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellInput("C3"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
-		CalcUtil.selectRange("B3");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B3");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldOptionSortTabPageDialog.select();
+		dataPilotFieldOptionSortTabPageDialog.select();
 
-		DataPilotFieldOptionSortDescendingRadioButton.check();
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
+		dataPilotFieldOptionSortDescendingRadioButton.check();
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
 		sleep(1);
 
-		assertEquals("Kevin Wang", CalcUtil.getCellText("B4"));
-		assertEquals("Group1", CalcUtil.getCellText("F4"));
-		assertEquals("Bill Zhang", CalcUtil.getCellText("I4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Kevin Wang", SCTool.getCellText("B4"));
+		assertEquals("Group1", SCTool.getCellText("F4"));
+		assertEquals("Bill Zhang", SCTool.getCellText("I4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 
 		typeKeys("<$undo>");
-		assertEquals("Bill Zhang", CalcUtil.getCellText("B4"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("Kevin Wang", CalcUtil.getCellText("I4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Bill Zhang", SCTool.getCellText("B4"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("Kevin Wang", SCTool.getCellText("I4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
 		typeKeys("<$redo>");
-		assertEquals("Kevin Wang", CalcUtil.getCellText("B4"));
-		assertEquals("Group1", CalcUtil.getCellText("F4"));
-		assertEquals("Bill Zhang", CalcUtil.getCellText("I4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Kevin Wang", SCTool.getCellText("B4"));
+		assertEquals("Group1", SCTool.getCellText("F4"));
+		assertEquals("Bill Zhang", SCTool.getCellText("I4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 	}
 
 	/**
@@ -1396,137 +1396,137 @@ public class DataPivotTable {
 		startcenter.menuItem("File->Open...").select();
 		submitOpenDlg(file);
 		sleep(2);
-		CalcUtil.selectRange("A1:E27");
+		SCTool.selectRange("A1:E27");
 		calc.menuItem("Data->DataPilot->Start...").select();
-		CreateDataPilotTableDialog.ok();
-		assertEquals("New DataPilot Table", CalcUtil.getCellText("B2"));
-		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", CalcUtil.getCellText("B4"));
-		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", CalcUtil.getCellText("B5"));
-		assertEquals("Page Area", CalcUtil.getCellText("B7"));
-		assertEquals("Row Area", CalcUtil.getCellText("B10"));
-		assertEquals("Column Area", CalcUtil.getCellText("D9"));
-		assertEquals("Data Area", CalcUtil.getCellText("D11"));
+		createDataPilotTableDialog.ok();
+		assertEquals("New DataPilot Table", SCTool.getCellText("B2"));
+		assertEquals("Use the DataPilot panel to assign fields to areas in the DataPilot table.", SCTool.getCellText("B4"));
+		assertEquals("The DataPilot panel automatically displays when the DataPilot table has focus.", SCTool.getCellText("B5"));
+		assertEquals("Page Area", SCTool.getCellText("B7"));
+		assertEquals("Row Area", SCTool.getCellText("B10"));
+		assertEquals("Column Area", SCTool.getCellText("D9"));
+		assertEquals("Data Area", SCTool.getCellText("D11"));
 
-		if (DataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
-			DataPilotAutomaticallyUpdateCheckBox.check();
+		if (dataPilotAutomaticallyUpdateCheckBox.isChecked() == false) {
+			dataPilotAutomaticallyUpdateCheckBox.check();
 		}
 
-		DataPilotFieldSelect.click(1, 1);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 1);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Page").select();
-		assertEquals("Locale", CalcUtil.getCellText("A1"));
+		assertEquals("Locale", SCTool.getCellText("A1"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 30);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 30);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Column").select();
-		assertEquals("Name", CalcUtil.getCellText("A3"));
+		assertEquals("Name", SCTool.getCellText("A3"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 50);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 50);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Row").select();
-		assertEquals("Date", CalcUtil.getCellText("A4"));
+		assertEquals("Date", SCTool.getCellText("A4"));
 		sleep(1);
 
-		DataPilotFieldSelect.click(1, 70);
-		DataPilotFieldSelect.openContextMenu();
+		dataPilotFieldSelect.click(1, 70);
+		dataPilotFieldSelect.openContextMenu();
 		menuItem("Add to Data by->Sum").select();
-		assertEquals("Sum - Order Number", CalcUtil.getCellText("A3"));
-		assertEquals("266773", CalcUtil.getCellText("J23"));
+		assertEquals("Sum - Order Number", SCTool.getCellText("A3"));
+		assertEquals("266773", SCTool.getCellText("J23"));
 		sleep(1);
 
-		CalcUtil.selectRange("B4:C4");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B4:C4");
+		spreadSheetCells.openContextMenu();
 		menuItem("Group->Group Selected Items").select();
-		assertEquals("Name2", CalcUtil.getCellText("B3"));
-		assertEquals("Name", CalcUtil.getCellText("C3"));
-		assertEquals("Group1", CalcUtil.getCellText("D4"));
-		assertEquals("266773", CalcUtil.getCellText("J24"));
+		assertEquals("Name2", SCTool.getCellText("B3"));
+		assertEquals("Name", SCTool.getCellText("C3"));
+		assertEquals("Group1", SCTool.getCellText("D4"));
+		assertEquals("266773", SCTool.getCellText("J24"));
 		sleep(1);
 
-		CalcUtil.selectRange("B3");
-		SpreadSheetCells.openContextMenu();
+		SCTool.selectRange("B3");
+		spreadSheetCells.openContextMenu();
 		menuItem("Field Option...").select();
-		DataPilotFieldOptionFiledSubtotalsPage.select();
+		dataPilotFieldOptionFiledSubtotalsPage.select();
 		sleep(1);
 
-		DataPilotFieldOptionSubTotalsManuallyRadioButton.check();
+		dataPilotFieldOptionSubTotalsManuallyRadioButton.check();
 
-		SC_DataPilotOptionSubtotalFunctionList.click(9, 24);
+		scDataPilotOptionSubtotalFunctionList.click(9, 24);
 		sleep(1);
-		DataPilotFieldOptionFieldTabPageDialog.select();
-		DataPilotFieldOptionFieldTabPageDialog.ok();
+		dataPilotFieldOptionFieldTabPageDialog.select();
+		dataPilotFieldOptionFieldTabPageDialog.ok();
 
-		assertEquals("Bill Zhang Count - Order Number", CalcUtil.getCellText("C4"));
-		assertEquals("5", CalcUtil.getCellText("C24"));
+		assertEquals("Bill Zhang Count - Order Number", SCTool.getCellText("C4"));
+		assertEquals("5", SCTool.getCellText("C24"));
 
-		assertEquals("Emmy Ma Count - Order Number", CalcUtil.getCellText("E4"));
-		assertEquals("2", CalcUtil.getCellText("E24"));
+		assertEquals("Emmy Ma Count - Order Number", SCTool.getCellText("E4"));
+		assertEquals("2", SCTool.getCellText("E24"));
 
-		assertEquals("Group1 Count - Order Number", CalcUtil.getCellText("H4"));
-		assertEquals("9", CalcUtil.getCellText("H24"));
+		assertEquals("Group1 Count - Order Number", SCTool.getCellText("H4"));
+		assertEquals("9", SCTool.getCellText("H24"));
 
-		assertEquals("Harry Wu Count - Order Number", CalcUtil.getCellText("J4"));
-		assertEquals("1", CalcUtil.getCellText("J24"));
+		assertEquals("Harry Wu Count - Order Number", SCTool.getCellText("J4"));
+		assertEquals("1", SCTool.getCellText("J24"));
 
-		assertEquals("Jerry Lu Count - Order Number", CalcUtil.getCellText("L4"));
-		assertEquals("2", CalcUtil.getCellText("L24"));
+		assertEquals("Jerry Lu Count - Order Number", SCTool.getCellText("L4"));
+		assertEquals("2", SCTool.getCellText("L24"));
 
-		assertEquals("Joe Liu Count - Order Number", CalcUtil.getCellText("N4"));
-		assertEquals("4", CalcUtil.getCellText("N24"));
+		assertEquals("Joe Liu Count - Order Number", SCTool.getCellText("N4"));
+		assertEquals("4", SCTool.getCellText("N24"));
 
-		assertEquals("Kevin Wang Count - Order Number", CalcUtil.getCellText("P4"));
-		assertEquals("3", CalcUtil.getCellText("P24"));
-		assertEquals("266773", CalcUtil.getCellText("Q24"));
+		assertEquals("Kevin Wang Count - Order Number", SCTool.getCellText("P4"));
+		assertEquals("3", SCTool.getCellText("P24"));
+		assertEquals("266773", SCTool.getCellText("Q24"));
 		sleep(1);
 
 		typeKeys("<$undo>");
-		assertEquals("Emmy Ma", CalcUtil.getCellText("C4"));
-		assertEquals("20518", CalcUtil.getCellText("C24"));
+		assertEquals("Emmy Ma", SCTool.getCellText("C4"));
+		assertEquals("20518", SCTool.getCellText("C24"));
 
-		assertEquals("", CalcUtil.getCellText("E4"));
-		assertEquals("20528", CalcUtil.getCellText("E24"));
+		assertEquals("", SCTool.getCellText("E4"));
+		assertEquals("20528", SCTool.getCellText("E24"));
 
-		assertEquals("Joe Liu", CalcUtil.getCellText("H4"));
-		assertEquals("41056", CalcUtil.getCellText("H24"));

[... 301 lines stripped ...]


Mime
View raw message