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 [4/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/validity/ValidityDialogSetting.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.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;
@@ -36,7 +36,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 ValidityDialogSetting {
 	private static IDList idList = new IDList(new File("./ids"));
@@ -52,7 +52,7 @@ public class ValidityDialogSetting {
 		// New a spreadsheet, select cell range, open Validity dialog
 		app.dispatch("private:factory/scalc");
 		calc.waitForExistence(10, 2);
-		CalcUtil.selectRange("A1:C5");
+		SCTool.selectRange("A1:C5");
 		app.dispatch(".uno:Validation");
 	}
 
@@ -66,76 +66,76 @@ public class ValidityDialogSetting {
 	 */
 	@Test
 	public void testAllowDateNotBetween() {
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(3); // "Date"
-		SC_ValidityDecimalCompareOperator.select(7); // "not between"
-		SC_ValiditySourceInput.setText("01/01/08");
-		SC_ValidityMaxValueInput.setText("03/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(7); // "not between"
+		scValiditySourceInput.setText("01/01/08");
+		scValidityMaxValueInput.setText("03/01/08");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("12/31/07");
 		typeKeys("<enter>");
-		assertEquals("12/31/07", CalcUtil.getCellText("A1"));
+		assertEquals("12/31/07", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("03/02/08");
 		typeKeys("<enter>");
-		assertEquals("03/02/08", CalcUtil.getCellText("A2"));
+		assertEquals("03/02/08", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("01/01/08");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A3"));
+		assertEquals("", SCTool.getCellText("A3"));
 
-		CalcUtil.selectRange("A4");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A4");
+		scInputBarInput.activate();
 		typeKeys("03/01/08");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A4"));
+		assertEquals("", SCTool.getCellText("A4"));
 
-		CalcUtil.selectRange("A5");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A5");
+		scInputBarInput.activate();
 		typeKeys("01/02/08");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A5"));
+		assertEquals("", SCTool.getCellText("A5"));
 
-		CalcUtil.selectRange("B1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B1");
+		scInputBarInput.activate();
 		typeKeys("02/29/08");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B1"));
+		assertEquals("", SCTool.getCellText("B1"));
 
-		CalcUtil.selectRange("B2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B2");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B2"));
+		assertEquals("", SCTool.getCellText("B2"));
 
-		CalcUtil.selectRange("B3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B3");
+		scInputBarInput.activate();
 		typeKeys("39448");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B3"));
+		assertEquals("", SCTool.getCellText("B3"));
 	}
 
 	/**
@@ -144,53 +144,53 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowDecimalEqual() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(2); // "Decimal"
-		SC_ValidityDecimalCompareOperator.select(0); // "equal"
-		SC_ValiditySourceInput.setText("0.33333333");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(2); // "Decimal"
+		scValidityDecimalCompareOperator.select(0); // "equal"
+		scValiditySourceInput.setText("0.33333333");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("0.33333333");
 		typeKeys("<enter>");
-		assertEquals("0.33333333", CalcUtil.getCellText("A1"));
+		assertEquals("0.33333333", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("=1/3");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A2"));
+		assertEquals("", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("0.3");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A3"));
+		assertEquals("", SCTool.getCellText("A3"));
 
-		CalcUtil.selectRange("A4");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A4");
+		scInputBarInput.activate();
 		typeKeys("0.333333333");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A4"));
+		assertEquals("", SCTool.getCellText("A4"));
 
-		CalcUtil.selectRange("B2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B2");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B2"));
+		assertEquals("", SCTool.getCellText("B2"));
 	}
 
 	/**
@@ -199,43 +199,43 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowGreaterTextLength() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(7); // "Text length"
-		SC_ValidityDecimalCompareOperator.select(4); // "greater than or equal to"
-		SC_ValiditySourceInput.setText("10");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(7); // "Text length"
+		scValidityDecimalCompareOperator.select(4); // "greater than or equal to"
+		scValiditySourceInput.setText("10");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("testtesttesttest");
 		typeKeys("<enter>");
-		assertEquals("testtesttesttest", CalcUtil.getCellText("A1"));
+		assertEquals("testtesttesttest", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("test test ");
 		typeKeys("<enter>");
-		assertEquals("test test ", CalcUtil.getCellText("A2"));
+		assertEquals("test test ", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A4");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A4");
+		scInputBarInput.activate();
 		typeKeys(" ");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A4"));
+		assertEquals("", SCTool.getCellText("A4"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("Testatest");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A3"));
+		assertEquals("", SCTool.getCellText("A3"));
 	}
 
 	/**
@@ -246,44 +246,44 @@ public class ValidityDialogSetting {
 
 		app.dispatch(".uno:Validation");
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(7); // "Text length"
-		SC_ValidityDecimalCompareOperator.select(1); // "less than"
-		SC_ValiditySourceInput.setText("10");
-
-		SC_ValidityInputHelpTabPage.select();
-		SC_ValidityInputHelpCheckbox.check();
-		SC_ValidityInputHelpTitle.setText("Help Info Title");
-		SC_ValidityHelpMessage.setText("help info");
-
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorAlertActionList.select("Information");
-		SC_ValidityErrorMessageTitle.setText("Notes to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(7); // "Text length"
+		scValidityDecimalCompareOperator.select(1); // "less than"
+		scValiditySourceInput.setText("10");
+
+		scValidityInputHelpTabPage.select();
+		scValidityInputHelpCheckbox.check();
+		scValidityInputHelpTitle.setText("Help Info Title");
+		scValidityHelpMessage.setText("help info");
+
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorAlertActionList.select("Information");
+		scValidityErrorMessageTitle.setText("Notes to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("testtesttesttest<enter>");
 		ActiveMsgBox.ok();
-		assertEquals("testtesttesttest", CalcUtil.getCellText("A1"));
+		assertEquals("testtesttesttest", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("sfsafsddddddd<enter>");
 		ActiveMsgBox.cancel();
-		assertEquals("", CalcUtil.getCellText("A2"));
+		assertEquals("", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("10<enter>");
-		assertEquals("10", CalcUtil.getCellText("A2"));
+		assertEquals("10", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("ok<enter>");
-		assertEquals("ok", CalcUtil.getCellText("A3"));
+		assertEquals("ok", SCTool.getCellText("A3"));
 	}
 
 	/**
@@ -292,18 +292,18 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowListSpecialChar() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(6); // "List"
-		SC_ValidityEntries.focus();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(6); // "List"
+		scValidityEntries.focus();
 		typeKeys("a");
 		typeKeys("<enter>");
 		typeKeys("b");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaTabpage.ok();
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaTabpage.ok();
 
 		// These codes are not stable: start
 		// calc.rightClick(1, 1);
@@ -311,18 +311,18 @@ public class ValidityDialogSetting {
 		// typeKeys("<down><enter>"); // Choose a
 		// sleep(2); // if no sleep, error occur
 		// These codes are not stable: end
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("a<enter>");
-		assertEquals("a", CalcUtil.getCellText("A1"));
+		assertEquals("a", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("B2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B2");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B2"));
+		assertEquals("", SCTool.getCellText("B2"));
 	}
 
 	/**
@@ -331,94 +331,94 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowTimeBetween() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(4); // "Time"
-		SC_ValidityDecimalCompareOperator.select(6); // "between"
-		SC_ValiditySourceInput.setText("27:00");
-		SC_ValidityMaxValueInput.setText("21:00");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(4); // "Time"
+		scValidityDecimalCompareOperator.select(6); // "between"
+		scValiditySourceInput.setText("27:00");
+		scValidityMaxValueInput.setText("21:00");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("21:00");
 		typeKeys("<enter>");
-		assertEquals("09:00:00 PM", CalcUtil.getCellText("A1"));
+		assertEquals("09:00:00 PM", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("27:00");
 		typeKeys("<enter>");
-		assertEquals("27:00:00", CalcUtil.getCellText("A2"));
+		assertEquals("27:00:00", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("1.125");
 		typeKeys("<enter>");
-		assertEquals("1.125", CalcUtil.getCellText("A3"));
+		assertEquals("1.125", SCTool.getCellText("A3"));
 
-		CalcUtil.selectRange("A4");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A4");
+		scInputBarInput.activate();
 		typeKeys("0.875");
 		typeKeys("<enter>");
-		assertEquals("0.875", CalcUtil.getCellText("A4"));
+		assertEquals("0.875", SCTool.getCellText("A4"));
 
-		CalcUtil.selectRange("B1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B1");
+		scInputBarInput.activate();
 		typeKeys("03:00:01");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B1"));
+		assertEquals("", SCTool.getCellText("B1"));
 
-		CalcUtil.selectRange("B2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B2");
+		scInputBarInput.activate();
 		typeKeys("20:59:59");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B2"));
+		assertEquals("", SCTool.getCellText("B2"));
 
-		CalcUtil.selectRange("B3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B3");
+		scInputBarInput.activate();
 		typeKeys("1.126");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B3"));
+		assertEquals("", SCTool.getCellText("B3"));
 
-		CalcUtil.selectRange("B4");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B4");
+		scInputBarInput.activate();
 		typeKeys("0.874");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B4"));
+		assertEquals("", SCTool.getCellText("B4"));
 
-		CalcUtil.selectRange("C1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("C1");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("C1"));
+		assertEquals("", SCTool.getCellText("C1"));
 
-		CalcUtil.selectRange("C2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("C2");
+		scInputBarInput.activate();
 		typeKeys("24:00");
 		typeKeys("<enter>");
-		assertEquals("24:00:00", CalcUtil.getCellText("C2"));
+		assertEquals("24:00:00", SCTool.getCellText("C2"));
 
-		CalcUtil.selectRange("C3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("C3");
+		scInputBarInput.activate();
 		typeKeys("12:00");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("C3"));
+		assertEquals("", SCTool.getCellText("C3"));
 	}
 
 	/**
@@ -427,40 +427,40 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowTimeGreaterThan() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(4); // "Time"
-		SC_ValidityDecimalCompareOperator.select(4); // "greater than or equal to"
-		SC_ValiditySourceInput.setText("8:00");
-
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorAlertActionList.select(1); // "Warning"
-
-		SC_ValidityErrorMessageTitle.setText("warning to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(4); // "Time"
+		scValidityDecimalCompareOperator.select(4); // "greater than or equal to"
+		scValiditySourceInput.setText("8:00");
+
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorAlertActionList.select(1); // "Warning"
+
+		scValidityErrorMessageTitle.setText("warning to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("7:30");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("07:30:00 AM", CalcUtil.getCellText("A1"));
+		assertEquals("07:30:00 AM", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("6:00");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.cancel();
-		assertEquals("", CalcUtil.getCellText("A2"));
+		assertEquals("", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("A3");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A3");
+		scInputBarInput.activate();
 		typeKeys("8:00");
 		typeKeys("<enter>");
-		assertEquals("08:00:00 AM", CalcUtil.getCellText("A3"));
+		assertEquals("08:00:00 AM", SCTool.getCellText("A3"));
 	}
 
 	/**
@@ -469,51 +469,51 @@ public class ValidityDialogSetting {
 	@Test
 	public void testAllowWholeNumLessThan() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(1); // "Whole Numbers"
-		SC_ValidityDecimalCompareOperator.select(3); // "less than or equal"
-		SC_ValiditySourceInput.setText("100");
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(1); // "Whole Numbers"
+		scValidityDecimalCompareOperator.select(3); // "less than or equal"
+		scValiditySourceInput.setText("100");
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value");
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("99");
 		typeKeys("<enter>");
-		assertEquals("99", CalcUtil.getCellText("A1"));
+		assertEquals("99", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("A2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A2");
+		scInputBarInput.activate();
 		typeKeys("100");
 		typeKeys("<enter>");
-		assertEquals("100", CalcUtil.getCellText("A2"));
+		assertEquals("100", SCTool.getCellText("A2"));
 
-		CalcUtil.selectRange("B1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B1");
+		scInputBarInput.activate();
 		typeKeys("101");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B1"));
+		assertEquals("", SCTool.getCellText("B1"));
 
-		CalcUtil.selectRange("B2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B2");
+		scInputBarInput.activate();
 		typeKeys("45.5");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("B2"));
+		assertEquals("", SCTool.getCellText("B2"));
 
-		CalcUtil.selectRange("C1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("C1");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 		assertEquals("Invalid value", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("C1"));
+		assertEquals("", SCTool.getCellText("C1"));
 	}
 
 	/**
@@ -522,25 +522,25 @@ public class ValidityDialogSetting {
 	@Test
 	public void testDefaultErrorAlertMessage() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(2); // "Decimal"
-		SC_ValidityDecimalCompareOperator.select(0); // "equal"
-		SC_ValiditySourceInput.setText("1");
-
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorAlertActionList.select(0); // "Stop"
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(2); // "Decimal"
+		scValidityDecimalCompareOperator.select(0); // "equal"
+		scValiditySourceInput.setText("1");
+
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorAlertActionList.select(0); // "Stop"
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("13");
 		typeKeys("<enter>");
 		assertEquals("OpenOffice.org Calc", ActiveMsgBox.getCaption());
 		// assertEquals("Invalid value.",ActiveMsgBox.getMessage()); // Can not
 		// verify in multi-language
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A1"));
+		assertEquals("", SCTool.getCellText("A1"));
 	}
 
 	/**
@@ -549,20 +549,20 @@ public class ValidityDialogSetting {
 	@Test
 	public void testUncheckErrorAlert() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(2); // "Decimal"
-		SC_ValidityDecimalCompareOperator.select(0); // "equal"
-		SC_ValiditySourceInput.setText("1");
-
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.uncheck();
-		SC_ValidityErrorAlertActionList.select(0); // "Stop"
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(2); // "Decimal"
+		scValidityDecimalCompareOperator.select(0); // "equal"
+		scValiditySourceInput.setText("1");
+
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.uncheck();
+		scValidityErrorAlertActionList.select(0); // "Stop"
+		scValidityErrorAlertTabPage.ok();
 
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("13");
 		typeKeys("<enter>");
-		assertEquals("13", CalcUtil.getCellText("A1"));
+		assertEquals("13", SCTool.getCellText("A1"));
 	}
 
 	/**
@@ -571,40 +571,40 @@ public class ValidityDialogSetting {
 	@Test
 	public void testValidityCellRangeSourcePicker() {
 
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(5); // "Cell range"
-		SC_ValiditySourcePicker.click();
-		assertEquals(false, SC_ValidityCriteriaAllowList.exists());
-		SC_ValiditySourceInput.setText("$E$2:$G$5");
-		SC_ValiditySourcePicker.click();
-		assertEquals(true, SC_ValidityCriteriaAllowList.exists());
-
-		SC_ValidityErrorAlertTabPage.select();
-		SC_ValidityShowErrorMessage.check();
-		SC_ValidityErrorAlertActionList.select(0); // "Stop"
-		SC_ValidityErrorMessageTitle.setText("Stop to enter");
-		SC_ValidityErrorMessage.setText("Invalid value.");
-		SC_ValidityErrorAlertTabPage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(5); // "Cell range"
+		scValiditySourcePicker.click();
+		assertEquals(false, scValidityCriteriaAllowList.exists());
+		scValiditySourceInput.setText("$E$2:$G$5");
+		scValiditySourcePicker.click();
+		assertEquals(true, scValidityCriteriaAllowList.exists());
+
+		scValidityErrorAlertTabPage.select();
+		scValidityShowErrorMessage.check();
+		scValidityErrorAlertActionList.select(0); // "Stop"
+		scValidityErrorMessageTitle.setText("Stop to enter");
+		scValidityErrorMessage.setText("Invalid value.");
+		scValidityErrorAlertTabPage.ok();
 
 		// calc.focus();
-		CalcUtil.selectRange("E2");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("E2");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
 
-		CalcUtil.selectRange("A1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("A1");
+		scInputBarInput.activate();
 		typeKeys("test32");
 		typeKeys("<enter>");
 		assertEquals("Invalid value.", ActiveMsgBox.getMessage());
 		ActiveMsgBox.ok();
-		assertEquals("", CalcUtil.getCellText("A1"));
+		assertEquals("", SCTool.getCellText("A1"));
 
-		CalcUtil.selectRange("B1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B1");
+		scInputBarInput.activate();
 		typeKeys("test");
 		typeKeys("<enter>");
-		assertEquals("test", CalcUtil.getCellText("B1"));
+		assertEquals("test", SCTool.getCellText("B1"));
 	}
 
 	/**
@@ -612,30 +612,30 @@ public class ValidityDialogSetting {
 	 */
 	@Test
 	public void testAllowBlankCells() {
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityCriteriaAllowList.select(5); // "Cell range"
-		SC_ValiditySourceInput.setText("$E$1:$E$5");
-		SC_ValidityAllowBlankCells.check();
-		SC_ValidityCriteriaTabpage.ok();
+		scValidityCriteriaTabpage.select();
+		scValidityCriteriaAllowList.select(5); // "Cell range"
+		scValiditySourceInput.setText("$E$1:$E$5");
+		scValidityAllowBlankCells.check();
+		scValidityCriteriaTabpage.ok();
 
-		CalcUtil.selectRange("E1");
+		SCTool.selectRange("E1");
 		typeKeys("A<enter>A<enter>A<enter>A<enter>A<enter>");
 
-		CalcUtil.selectRange("A1");
+		SCTool.selectRange("A1");
 		typeKeys("A<enter>");
-		CalcUtil.selectRange("D1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("D1");
+		scInputBarInput.activate();
 		typeKeys("<backspace><enter>");
-		assertEquals("", CalcUtil.getCellText("D1"));
+		assertEquals("", SCTool.getCellText("D1"));
 
-		CalcUtil.selectRange("B1");
+		SCTool.selectRange("B1");
 		app.dispatch(".uno:Validation");
-		SC_ValidityCriteriaTabpage.select();
-		SC_ValidityAllowBlankCells.uncheck();
+		scValidityCriteriaTabpage.select();
+		scValidityAllowBlankCells.uncheck();
 		typeKeys("<enter>");
 
-		CalcUtil.selectRange("B1");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("B1");
+		scInputBarInput.activate();
 		typeKeys("<backspace><enter>");
 		typeKeys("<enter>");
 	}

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java Fri Sep  7 02:29:53 2012
@@ -23,7 +23,7 @@ package testcase.gui.sc.validity;
 
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.Testspace.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -32,7 +32,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 ValiditySampleFile {
 
@@ -62,13 +62,13 @@ public class ValiditySampleFile {
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
 
-		CalcUtil.selectRange("D5");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("D5");
+		scInputBarInput.activate();
 		for (int i = 1; i <= 10; i++)
 			typeKeys("<backspace>");
 		typeKeys("<enter>");
 
-		assertEquals("", CalcUtil.getCellText("D5"));
+		assertEquals("", SCTool.getCellText("D5"));
 	}
 
 	/**
@@ -84,12 +84,12 @@ public class ValiditySampleFile {
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
 
-		CalcUtil.selectRange("F5");
-		SC_InputBar_Input.activate();
+		SCTool.selectRange("F5");
+		scInputBarInput.activate();
 		typeKeys("<backspace><enter>");
 
-		ActiveMsgBox.ok();
-		assertEquals("8", CalcUtil.getCellText("F5"));
+		activeMsgBox.ok();
+		assertEquals("8", SCTool.getCellText("F5"));
 	}
 
 	/**
@@ -103,11 +103,11 @@ public class ValiditySampleFile {
 		submitOpenDlg(file);
 		calc.waitForExistence(10, 2);
 
-		CalcUtil.selectRange("F19");
+		SCTool.selectRange("F19");
 		typeKeys("d<enter>");
-		CalcUtil.selectRange("F17");
+		SCTool.selectRange("F17");
 		typeKeys("Test<enter>");
 
-		assertEquals("Test", CalcUtil.getCellText("F17"));
+		assertEquals("Test", SCTool.getCellText("F17"));
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java Fri Sep  7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.sd.headerandfooter;
 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;
@@ -37,7 +37,7 @@ import org.junit.Test;
 import org.openoffice.test.common.FileUtil;
 import org.openoffice.test.common.Logger;
 
-import testlib.gui.ImpressUtil;
+import testlib.gui.SDTool;
 
 public class HeaderAndFooterSetting {
 
@@ -50,14 +50,14 @@ public class HeaderAndFooterSetting {
 
 		// New a impress, insert some slides
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		impress.waitForExistence(10, 2);
 
 		for (int i = 0; i < 5; i++) {
-			SD_InsertPageButtonOnToolbar.click();
+			sdInsertPageButtonOnToolbar.click();
 		}
 		// Pop up navigator panel
-		if (!SD_NavigatorDlg.exists()) {
+		if (!sdNavigatorDlg.exists()) {
 			app.dispatch(".uno:Navigator");
 		}
 	}
@@ -78,46 +78,46 @@ public class HeaderAndFooterSetting {
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
 
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		// Click slide 3
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up><up><up>");
 		sleep(1);
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_SlideNumAsFooterOnSlide.uncheck();
-		SD_ApplyButtonOnSlideFooter.click();
+		sdSlideNumAsFooterOnSlide.uncheck();
+		sdApplyButtonOnSlideFooter.click();
 
 		// paste to the same file
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		app.dispatch(".uno:Copy");
 		app.dispatch(".uno:Paste");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
-		SD_HeaderAndFooterDlgSlideTab.cancel();
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterDlgSlideTab.cancel();
 
 		// paste to different file
 		impress.focus();
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		app.dispatch(".uno:Paste");
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<down>");
 		sleep(1);
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -131,47 +131,47 @@ public class HeaderAndFooterSetting {
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
 
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		for (int j = 0; j <= 2; j++) {
 			typeKeys("<up>");
 		}
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_SlideNumAsFooterOnSlide.uncheck();
-		SD_ApplyButtonOnSlideFooter.click();
+		sdSlideNumAsFooterOnSlide.uncheck();
+		sdApplyButtonOnSlideFooter.click();
 
 		// paste to the same file
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 		app.dispatch(".uno:Copy");
 		typeKeys("<down>");
 		app.dispatch(".uno:Paste");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
-		SD_HeaderAndFooterDlgSlideTab.cancel();
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterDlgSlideTab.cancel();
 
 		// paste to different file
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		app.dispatch(".uno:Paste");
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<down>");
 		sleep(1); // If no sleep, error occur
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -184,46 +184,46 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		SD_HeaderTextOnNotes.check();
-		SD_HeaderTextOnNotesInput.setText("Header Test");
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdHeaderAndFooterOnNotesTabPage.select();
+		sdHeaderTextOnNotes.check();
+		sdHeaderTextOnNotesInput.setText("Header Test");
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		// paste to the same file
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 		app.dispatch(".uno:Copy");
 		typeKeys("<down>");
 		app.dispatch(".uno:Paste");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
-		SD_HeaderAndFooterOnNotesTabPage.cancel();
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.cancel();
 
 		// paste to different file
 		impress.focus();
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		app.dispatch(".uno:Paste");
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<down>");
-		ImpressUtil.getCurView().activate();
+		SDTool.getActiveView().activate();
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -237,23 +237,23 @@ public class HeaderAndFooterSetting {
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
 
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		for (int j = 0; j <= 2; j++) {
 			typeKeys("<up>");
 		}
 		app.dispatch(".uno:DuplicatePage");
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -266,13 +266,13 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_FooterNotShowOn1stSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdFooterNotShowOn1stSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		// Check slide 1
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		// typeKeys("<up><up><up><up><up>"); // Not stable on ubuntu10.04
 		// sleep(1); // If no sleep, error occur
 		for (int i = 0; i < 5; i++) {
@@ -281,8 +281,8 @@ public class HeaderAndFooterSetting {
 		}
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_FooterNotShowOn1stSlide.isChecked());
-		assertEquals(false, SD_FooterTextOnSlide.isChecked());
+		assertEquals(true, sdFooterNotShowOn1stSlide.isChecked());
+		assertEquals(false, sdFooterTextOnSlide.isChecked());
 	}
 
 	/**
@@ -296,46 +296,46 @@ public class HeaderAndFooterSetting {
 		// add header and footer to focus slide.
 		app.dispatch(".uno:HeaderAndFooter");
 
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyButtonOnSlideFooter.click();
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 		sleep(1); // If no sleep, error occur
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("", SD_FooterTextOnSlideInput.getText());
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("", sdFooterTextOnSlideInput.getText());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		SD_InsertPageButtonOnToolbar.click();
+		sdInsertPageButtonOnToolbar.click();
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("", SD_FooterTextOnSlideInput.getText());
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("", sdFooterTextOnSlideInput.getText());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -348,63 +348,63 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer to focus slide.
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		SD_HeaderTextOnNotes.check();
-		SD_HeaderTextOnNotesInput.setText("Header Test");
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
-
-		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals(true, SD_HeaderTextOnNotes.isChecked());
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.select();
+		sdHeaderTextOnNotes.check();
+		sdHeaderTextOnNotesInput.setText("Header Test");
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
+
+		app.dispatch(".uno:HeaderAndFooter");
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals(true, sdHeaderTextOnNotes.isChecked());
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyToAllButtonOnSlideFooter.focus();
+		sdApplyToAllButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals(true, SD_HeaderTextOnNotes.isChecked());
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals(true, sdHeaderTextOnNotes.isChecked());
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyToAllButtonOnSlideFooter.focus();
+		sdApplyToAllButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		SD_InsertPageButtonOnToolbar.click();
+		sdInsertPageButtonOnToolbar.click();
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals(true, SD_HeaderTextOnNotes.isChecked());
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals(true, sdHeaderTextOnNotes.isChecked());
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -418,51 +418,51 @@ public class HeaderAndFooterSetting {
 		// add header and footer to focus slide.
 		app.dispatch(".uno:HeaderAndFooter");
 
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120323");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 		// close header and footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end close
 
-		SD_InsertPageButtonOnToolbar.click();
+		sdInsertPageButtonOnToolbar.click();
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals(true, SD_FixedDateAndTimeFooterOnSlide.isChecked());
-		assertEquals("Fix Date: 20120323", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals(true, sdFixedDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120323", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -475,14 +475,14 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_AutoUpdateTimeFooter.check();
-		SD_AutoUpdateTimeFooterType.select(7);
-		String currentTime = SD_AutoUpdateTimeFooterType.getItemText(7);
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdAutoUpdateTimeFooter.check();
+		sdAutoUpdateTimeFooterType.select(7);
+		String currentTime = sdAutoUpdateTimeFooterType.getItemText(7);
+		sdApplyToAllButtonOnSlideFooter.click();
 		sleep(1); // Wait some time to check the time update
 
 		app.dispatch(".uno:HeaderAndFooter");
-		String updatedTime = SD_AutoUpdateTimeFooterType.getItemText(7);
+		String updatedTime = sdAutoUpdateTimeFooterType.getItemText(7);
 		assertNotSame("Time can not update", currentTime, updatedTime);
 	}
 
@@ -496,15 +496,15 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		SD_AutoUpdateTimeFooter.check();
-		String currentTime = SD_AutoUpdateTimeFooterType.getItemText(7);
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdHeaderAndFooterOnNotesTabPage.select();
+		sdAutoUpdateTimeFooter.check();
+		String currentTime = sdAutoUpdateTimeFooterType.getItemText(7);
+		sdApplyToAllButtonOnSlideFooter.click();
 		sleep(1); // Wait some time to check the time update
 
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		String updatedTime = SD_AutoUpdateTimeFooterType.getItemText(7);
+		sdHeaderAndFooterOnNotesTabPage.select();
+		String updatedTime = sdAutoUpdateTimeFooterType.getItemText(7);
 
 		assertNotSame("Time can not update", currentTime, updatedTime);
 	}
@@ -519,27 +519,27 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		SD_HeaderTextOnNotes.check();
-		SD_HeaderTextOnNotesInput.setText("Header Test");
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdHeaderAndFooterOnNotesTabPage.select();
+		sdHeaderTextOnNotes.check();
+		sdHeaderTextOnNotesInput.setText("Header Test");
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
-		SD_HeaderAndFooterOnNotesTabPage.cancel();
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.cancel();
 
 		// save this file
 		app.dispatch(".uno:SaveAs");
@@ -556,11 +556,11 @@ public class HeaderAndFooterSetting {
 
 		// check after reopen
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_HeaderAndFooterOnNotesTabPage.select();
-		assertEquals("Header Test", SD_HeaderTextOnNotesInput.getText());
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		sdHeaderAndFooterOnNotesTabPage.select();
+		assertEquals("Header Test", sdHeaderTextOnNotesInput.getText());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 
 	/**
@@ -573,24 +573,24 @@ public class HeaderAndFooterSetting {
 
 		// add header and footer
 		app.dispatch(".uno:HeaderAndFooter");
-		SD_DateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeFooterOnSlide.check();
-		SD_FixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
-		SD_FooterTextOnSlide.check();
-		SD_FooterTextOnSlideInput.setText("Footer Test");
-		SD_SlideNumAsFooterOnSlide.check();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeFooterOnSlide.check();
+		sdFixedDateAndTimeOnSlideInput.setText("Fix Date: 20120329");
+		sdFooterTextOnSlide.check();
+		sdFooterTextOnSlideInput.setText("Footer Test");
+		sdSlideNumAsFooterOnSlide.check();
+		sdApplyToAllButtonOnSlideFooter.click();
 
-		ImpressSlideSorter.focus();
+		impressSlideSorter.focus();
 		typeKeys("<up>");
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 
 		// close header and footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 
@@ -609,8 +609,8 @@ public class HeaderAndFooterSetting {
 
 		// check after reopen
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals("Fix Date: 20120329", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals("Footer Test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals("Fix Date: 20120329", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals("Footer Test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java Fri Sep  7 02:29:53 2012
@@ -26,7 +26,7 @@ package testcase.gui.sd.headerandfooter;
 
 import static org.junit.Assert.*;
 import static org.openoffice.test.common.Testspace.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -67,14 +67,14 @@ public class OpenDocumentWithHeaderFoote
 
 		// check after reopen
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals("fixed date", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("footer test", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("fixed date", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("footer test", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 
-		SD_SlideNumAsFooterOnSlide.uncheck();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdSlideNumAsFooterOnSlide.uncheck();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		// save to odp and reopen
 		app.dispatch(".uno:SaveAs");
@@ -89,7 +89,7 @@ public class OpenDocumentWithHeaderFoote
 		submitOpenDlg(openFrom2);
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 		// end-save to odp and reopen
 	}
 
@@ -108,22 +108,22 @@ public class OpenDocumentWithHeaderFoote
 
 		// check after reopen
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(true, SD_DateAndTimeFooterOnSlide.isChecked());
-		assertEquals("testdte", SD_FixedDateAndTimeOnSlideInput.getText());
-		assertEquals(true, SD_FooterTextOnSlide.isChecked());
-		assertEquals("yesy", SD_FooterTextOnSlideInput.getText());
-		assertEquals(true, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(true, sdDateAndTimeFooterOnSlide.isChecked());
+		assertEquals("testdte", sdFixedDateAndTimeOnSlideInput.getText());
+		assertEquals(true, sdFooterTextOnSlide.isChecked());
+		assertEquals("yesy", sdFooterTextOnSlideInput.getText());
+		assertEquals(true, sdSlideNumAsFooterOnSlide.isChecked());
 
-		SD_SlideNumAsFooterOnSlide.uncheck();
-		SD_ApplyToAllButtonOnSlideFooter.click();
+		sdSlideNumAsFooterOnSlide.uncheck();
+		sdApplyToAllButtonOnSlideFooter.click();
 
 		// save to ppt and reopen
 		app.dispatch(".uno:SaveAs");
 		String saveTo = getPath("temp/" + "gfdd.ppt");
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok();
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok();
 		app.dispatch(".uno:CloseDoc");
 
 		openStartcenter();
@@ -132,11 +132,11 @@ public class OpenDocumentWithHeaderFoote
 		submitOpenDlg(openFrom);
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 		// end-save to ppt and reopen
 
 		// close Header and Footer dialog.
-		SD_ApplyButtonOnSlideFooter.focus();
+		sdApplyButtonOnSlideFooter.focus();
 		typeKeys("<tab>");
 		typeKeys("<enter>");
 		// end
@@ -154,7 +154,7 @@ public class OpenDocumentWithHeaderFoote
 		submitOpenDlg(openFrom2);
 
 		app.dispatch(".uno:HeaderAndFooter");
-		assertEquals(false, SD_SlideNumAsFooterOnSlide.isChecked());
+		assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
 		// end-save to odp and reopen
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/shape/ShapeTypes.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/shape/ShapeTypes.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/shape/ShapeTypes.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/shape/ShapeTypes.java Fri Sep  7 02:29:53 2012
@@ -24,7 +24,7 @@
 
 package testcase.gui.sd.shape;
 import static org.junit.Assert.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
 import static testlib.gui.UIMap.*;
 
 import org.junit.After;
@@ -45,13 +45,13 @@ public class ShapeTypes {
 
 		// New a impress, insert some slides
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		// Pop up navigator panel
-		if (!SD_NavigatorDlg.exists()) {
+		if (!sdNavigatorDlg.exists()) {
 			app.dispatch(".uno:Navigator");
 		}
 			
-		if(!SD_Drawing_Toolbar.exists()){
+		if(!sdDrawingToolbar.exists()){
 			app.dispatch(".uno:AvailableToolbars?Toolbar:string=toolbar");
 		}
 	}
@@ -70,27 +70,27 @@ public class ShapeTypes {
 
 		impress.focus();
 		//---before insert CallOut Shape
-		SD_Navigator.focus();
-		SD_Navigator_Shape_Filter.click();
+		sdNavigator.focus();
+		sdNavigatorShapeFilter.click();
 		typeKeys("<down><down>");
 		typeKeys("<enter>");
-		SD_Navigator.select(0);
+		sdNavigator.select(0);
 		typeKeys("<enter>");
-		String[] allShapes=SD_Navigator.getAllItemsText();
+		String[] allShapes=sdNavigator.getAllItemsText();
 		assertEquals(3, allShapes.length);
 		
 		//--- After insert CallOut shape
-		SD_CalloutShapes.click();
+		sdCalloutShapes.click();
 		impress.focus();
 		impress.drag(100, 100, 200, 200);
-		SD_NavigatorDlg.focus();
-		SD_Navigator_Shape_Filter.click();
+		sdNavigatorDlg.focus();
+		sdNavigatorShapeFilter.click();
 		typeKeys("<down><down>");
 		typeKeys("<enter>");
-		SD_Navigator.focus();
-		SD_Navigator.select(0);
+		sdNavigator.focus();
+		sdNavigator.select(0);
 		typeKeys("<enter>");
-		allShapes=SD_Navigator.getAllItemsText();
+		allShapes=sdNavigator.getAllItemsText();
 		assertEquals(4, allShapes.length);
 
 	}
@@ -103,27 +103,27 @@ public class ShapeTypes {
 
 		impress.focus();
 		//---before insert CallOut Shape
-		SD_Navigator.focus();
-		SD_Navigator_Shape_Filter.click();
+		sdNavigator.focus();
+		sdNavigatorShapeFilter.click();
 		typeKeys("<down><down>");
 		typeKeys("<enter>");
-		SD_Navigator.select(0);
+		sdNavigator.select(0);
 		typeKeys("<enter>");
-		String[] allShapes=SD_Navigator.getAllItemsText();
+		String[] allShapes=sdNavigator.getAllItemsText();
 		assertEquals(3, allShapes.length);
 		
 		//--- After insert CallOut shape
-		SD_StarShapes.click();
+		sdStarShapes.click();
 		impress.focus();
 		impress.drag(100, 100, 200, 200);
-		SD_NavigatorDlg.focus();
-		SD_Navigator_Shape_Filter.click();
+		sdNavigatorDlg.focus();
+		sdNavigatorShapeFilter.click();
 		typeKeys("<down><down>");
 		typeKeys("<enter>");
-		SD_Navigator.focus();
-		SD_Navigator.select(0);
+		sdNavigator.focus();
+		sdNavigator.select(0);
 		typeKeys("<enter>");
-		allShapes=SD_Navigator.getAllItemsText();
+		allShapes=sdNavigator.getAllItemsText();
 		assertEquals(4, allShapes.length);
 
 	}

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBackgroundProperty.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBackgroundProperty.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBackgroundProperty.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBackgroundProperty.java Fri Sep  7 02:29:53 2012
@@ -55,55 +55,55 @@ public class ChangeTableBackgroundProper
 
 		// Create a new presentation document
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 
 		// Insert a table
 		app.dispatch(".uno:InsertTable", 3);
-		InsertTable.ok();
+		insertTable.ok();
 
 		// Verify if the table toolbar is active
-		assertTrue(Table_Toolbar.exists(3));
+		assertTrue(tableToolbar.exists(3));
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		Area_Area_page.select();
+		areaAreapage.select();
 		// select Color
-		Area_Fill_Type.select(1);
-		assertEquals("Area_Fill_Type is Color", Area_Fill_Type.getSelText(), Area_Fill_Type.getItemText(1));
-		Area_Fill_Color.select(2);
+		areaFillType.select(1);
+		assertEquals("Area_Fill_Type is Color", areaFillType.getSelText(), areaFillType.getItemText(1));
+		areaFillColor.select(2);
 		// Area_Fill_Color.getItemCount();
-		assertEquals("Area_Fill_Color is second item", Area_Fill_Color.getSelText(), Area_Fill_Color.getItemText(2));
-		Area_Area_page.ok();
+		assertEquals("Area_Fill_Color is second item", areaFillColor.getSelText(), areaFillColor.getItemText(2));
+		areaAreapage.ok();
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		Area_Area_page.select();
+		areaAreapage.select();
 		// select Gradient
-		Area_Fill_Type.select(2);
-		assertEquals("Area_Fill_Type is Gradient", Area_Fill_Type.getSelText(), Area_Fill_Type.getItemText(2));
-		Area_Fill_Gradient.select(2);
-		assertEquals("Area_Fill_Gradient is second item", Area_Fill_Gradient.getSelText(), Area_Fill_Gradient.getItemText(2));
-		Area_Area_page.ok();
+		areaFillType.select(2);
+		assertEquals("Area_Fill_Type is Gradient", areaFillType.getSelText(), areaFillType.getItemText(2));
+		areaFillGradient.select(2);
+		assertEquals("Area_Fill_Gradient is second item", areaFillGradient.getSelText(), areaFillGradient.getItemText(2));
+		areaAreapage.ok();
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		Area_Area_page.select();
+		areaAreapage.select();
 		// select Hatching
-		Area_Fill_Type.select(3);
-		assertEquals("Area_Fill_Type is Hatching", Area_Fill_Type.getSelText(), Area_Fill_Type.getItemText(3));
-		Area_Fill_Hatching.select(2);
-		assertEquals("Area_Fill_Hatching is second item", Area_Fill_Hatching.getSelText(), Area_Fill_Hatching.getItemText(2));
-		Area_Area_page.ok();
+		areaFillType.select(3);
+		assertEquals("Area_Fill_Type is Hatching", areaFillType.getSelText(), areaFillType.getItemText(3));
+		areaFillHatching.select(2);
+		assertEquals("Area_Fill_Hatching is second item", areaFillHatching.getSelText(), areaFillHatching.getItemText(2));
+		areaAreapage.ok();
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		Area_Area_page.select();
+		areaAreapage.select();
 		// select Bitmap
-		Area_Fill_Type.select(4);
-		assertEquals("Area_Fill_Type is Bitmap", Area_Fill_Type.getSelText(), Area_Fill_Type.getItemText(4));
-		Area_Fill_Bitmap.select(2);
-		assertEquals("Area_Fill_Bitmap is second item", Area_Fill_Bitmap.getSelText(), Area_Fill_Bitmap.getItemText(2));
-		Area_Area_page.ok();
+		areaFillType.select(4);
+		assertEquals("Area_Fill_Type is Bitmap", areaFillType.getSelText(), areaFillType.getItemText(4));
+		areaFillBitmap.select(2);
+		assertEquals("Area_Fill_Bitmap is second item", areaFillBitmap.getSelText(), areaFillBitmap.getItemText(2));
+		areaAreapage.ok();
 
 	}
 

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBorderProperty.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBorderProperty.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBorderProperty.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableBorderProperty.java Fri Sep  7 02:29:53 2012
@@ -56,47 +56,47 @@ public class ChangeTableBorderProperty {
 
 		// Create a new presentation document
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		sleep(3);
 
 		// Insert a table
 		app.dispatch(".uno:InsertTable", 3);
-		InsertTable.ok();
+		insertTable.ok();
 		sleep(3);
 
 		// Verify if the table toolbar is active
-		assertTrue(Table_Toolbar.exists(3));
+		assertTrue(tableToolbar.exists(3));
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		Area_Border_page.select();
+		areaBorderpage.select();
 
-		Area_Border_Presets.click(0.01, 0.01);
+		areaBorderPresets.click(0.01, 0.01);
 
 		// select Line
-		Area_Border_LineStyle.select(1);
-		assertEquals("Area_Border_LineStyle is first item", Area_Border_LineStyle.getSelText(), Area_Border_LineStyle.getItemText(1));
+		areaBorderLineStyle.select(1);
+		assertEquals("Area_Border_LineStyle is first item", areaBorderLineStyle.getSelText(), areaBorderLineStyle.getItemText(1));
 
-		Area_Border_LineColor.select(1);
-		assertEquals("Area_Border_LineColor is first item", Area_Border_LineColor.getSelText(), Area_Border_LineColor.getItemText(1));
+		areaBorderLineColor.select(1);
+		assertEquals("Area_Border_LineColor is first item", areaBorderLineColor.getSelText(), areaBorderLineColor.getItemText(1));
 
 		// select Spacing to Contents
-		Area_Border_Sync.check();
-		assertTrue("Area_Border_Sync is checked", Area_Border_Sync.isChecked());
+		areaBorderSync.check();
+		assertTrue("Area_Border_Sync is checked", areaBorderSync.isChecked());
 
-		Area_Border_Mf_Left.setText("0.5");
-		assertTrue("Area_Border_Mf_Left is 0.5", Area_Border_Mf_Left.getText().startsWith("0.5"));
+		areaBorderMfLeft.setText("0.5");
+		assertTrue("Area_Border_Mf_Left is 0.5", areaBorderMfLeft.getText().startsWith("0.5"));
 
-		Area_Border_Mf_Right.setText("0.5");
-		assertTrue("Area_Border_Mf_Right is 0.5", Area_Border_Mf_Right.getText().startsWith("0.5"));
+		areaBorderMfRight.setText("0.5");
+		assertTrue("Area_Border_Mf_Right is 0.5", areaBorderMfRight.getText().startsWith("0.5"));
 
-		Area_Border_Mf_Top.setText("0.5");
-		assertTrue("Area_Border_Mf_Top is 0.5", Area_Border_Mf_Top.getText().startsWith("0.5"));
+		areaBorderMfTop.setText("0.5");
+		assertTrue("Area_Border_Mf_Top is 0.5", areaBorderMfTop.getText().startsWith("0.5"));
 
-		Area_Border_Mf_Bottom.setText("0.5");
-		assertTrue("Area_Border_Mf_Bottom is 0.5", Area_Border_Mf_Bottom.getText().startsWith("0.5"));
+		areaBorderMfBottom.setText("0.5");
+		assertTrue("Area_Border_Mf_Bottom is 0.5", areaBorderMfBottom.getText().startsWith("0.5"));
 
-		Area_Border_page.ok();
+		areaBorderpage.ok();
 
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableFontEffectsProperty.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableFontEffectsProperty.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableFontEffectsProperty.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sd/table/ChangeTableFontEffectsProperty.java Fri Sep  7 02:29:53 2012
@@ -55,56 +55,56 @@ public class ChangeTableFontEffectsPrope
 
 		// Create a new presentation document
 		app.dispatch("private:factory/simpress?slot=6686");
-		PresentationWizard.ok();
+		presentationWizard.ok();
 
 		// Insert a table
 		app.dispatch(".uno:InsertTable", 3);
-		InsertTable.ok();
+		insertTable.ok();
 
 		// Verify if the table toolbar is active
-		assertTrue("Table Toolbar exist", Table_Toolbar.exists(3));
+		assertTrue("Table Toolbar exist", tableToolbar.exists(3));
 
 		// open Table Properties Dialog
 		app.dispatch(".uno:TableDialog", 3);
-		EffectsPage.select();
+		effectsPage.select();
 		// select Font color
-		EffectsPage_Color.select(1);
-		assertEquals("EffectsPage_Color is black", EffectsPage_Color.getSelText(), "Black");
+		effectsPageColor.select(1);
+		assertEquals("EffectsPage_Color is black", effectsPageColor.getSelText(), "Black");
 
 		// select Relief
-		EffectsPage_Relief.select(0);
-		assertEquals("EffectsPage_Relief is no", EffectsPage_Relief.getSelText(), "(Without)");
-		EffectsPage_Outline.check();
-		assertTrue("EffectsPage_Outline is checked", EffectsPage_Outline.isChecked());
-		EffectsPage_Shadow.check();
-		assertTrue("EffectsPage_Shadow is checked", EffectsPage_Shadow.isChecked());
+		effectsPageRelief.select(0);
+		assertEquals("EffectsPage_Relief is no", effectsPageRelief.getSelText(), "(Without)");
+		effectsPageOutline.check();
+		assertTrue("EffectsPage_Outline is checked", effectsPageOutline.isChecked());
+		effectsPageShadow.check();
+		assertTrue("EffectsPage_Shadow is checked", effectsPageShadow.isChecked());
 
 		// select Overlining
-		EffectsPage_Overline.select(1);
-		assertEquals("EffectsPage_Overline is first item", EffectsPage_Overline.getSelText(), EffectsPage_Overline.getItemText(1));
-		EffectsPage_Overline_Color.select(1);
-		assertEquals("EffectsPage_Overline_Color is first item", EffectsPage_Overline_Color.getSelText(), EffectsPage_Overline_Color.getItemText(1));
+		effectsPageOverline.select(1);
+		assertEquals("EffectsPage_Overline is first item", effectsPageOverline.getSelText(), effectsPageOverline.getItemText(1));
+		effectsPageOverlineColor.select(1);
+		assertEquals("EffectsPage_Overline_Color is first item", effectsPageOverlineColor.getSelText(), effectsPageOverlineColor.getItemText(1));
 
 		// select Strikethrough
-		EffectsPage_Strikeout.select(1);
-		assertEquals("EffectsPage_Strikeout is first item", EffectsPage_Strikeout.getSelText(), EffectsPage_Strikeout.getItemText(1));
+		effectsPageStrikeout.select(1);
+		assertEquals("EffectsPage_Strikeout is first item", effectsPageStrikeout.getSelText(), effectsPageStrikeout.getItemText(1));
 
 		// select Underlining
-		EffectsPage_Underline.select(1);
-		assertEquals("EffectsPage_Underline is first item", EffectsPage_Underline.getSelText(), EffectsPage_Underline.getItemText(1));
-		EffectsPage_Underline_Color.select(1);
-		assertEquals("EffectsPage_Underline_Color is first item", EffectsPage_Underline_Color.getSelText(), EffectsPage_Underline_Color.getItemText(1));
+		effectsPageUnderline.select(1);
+		assertEquals("EffectsPage_Underline is first item", effectsPageUnderline.getSelText(), effectsPageUnderline.getItemText(1));
+		effectsPageUnderlineColor.select(1);
+		assertEquals("EffectsPage_Underline_Color is first item", effectsPageUnderlineColor.getSelText(), effectsPageUnderlineColor.getItemText(1));
 
 		// select individual workds
-		EffectsPage_InvidiualWords.check();
-		assertTrue("EffectsPage_InvidiualWords is checked", EffectsPage_InvidiualWords.isChecked());
+		effectsPageInvidiualWords.check();
+		assertTrue("EffectsPage_InvidiualWords is checked", effectsPageInvidiualWords.isChecked());
 
 		// select Emphasis Mark
 		// EffectsPage_Emphasis.select(1);
 		// assertEquals(EffectsPage_Emphasis.getSelText(), "Dot");
 		// EffectsPage_Position.select(1);
 		// assertEquals(EffectsPage_Position.getSelText(), "Below text");
-		EffectsPage.ok();
+		effectsPage.ok();
 
 	}
 }

Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/LongRun.java Fri Sep  7 02:29:53 2012
@@ -24,7 +24,7 @@ package testcase.gui.svt;
 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 java.awt.Rectangle;
@@ -45,7 +45,7 @@ import org.openoffice.test.common.Logger
 import org.openoffice.test.common.SystemUtil;
 import org.openoffice.test.common.Testspace;
 
-import testlib.gui.CalcUtil;
+import testlib.gui.SCTool;
 
 public class LongRun {
 
@@ -156,17 +156,17 @@ public class LongRun {
 		// Set the text style
 		writer.openContextMenu();
 		menuItem("Character...").select();
-		EffectsPage.select();
-		EffectsPage_Color.select("Magenta");
-		EffectsPage.ok();
+		effectsPage.select();
+		effectsPageColor.select("Magenta");
+		effectsPage.ok();
 		sleep(2);
 
 		// Save the text document
 		writer.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok();
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok();
 
 		// Close it by clicking main menu
 		writer.menuItem("File->Close").select();
@@ -190,13 +190,13 @@ public class LongRun {
 		String text = "Hello Openoffice";
 		writer.menuItem("File->New->Spreadsheet").select();
 		calc.waitForExistence(10, 2);
-		CalcUtil.selectRange("A65536");
+		SCTool.selectRange("A65536");
 		typeKeys(text);
 		calc.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok();
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok();
 		// Close it by clicking main menu
 		calc.menuItem("File->Close").select();
 		// openStartcenter();
@@ -204,7 +204,7 @@ public class LongRun {
 		writer.menuItem("File->Open...").select();
 		submitOpenDlg(saveTo);
 		calc.waitForExistence(10, 2);
-		Assert.assertEquals("The typed text is saved!", text, CalcUtil.getCellText("A65536"));
+		Assert.assertEquals("The typed text is saved!", text, SCTool.getCellText("A65536"));
 		calc.menuItem("File->Close").select();
 	}
 
@@ -212,7 +212,7 @@ public class LongRun {
 		String saveTo = getPath("temp/" + file);
 		String text = "Hello Openoffice";
 		writer.menuItem("File->New->Presentation").select();
-		PresentationWizard.ok();
+		presentationWizard.ok();
 		impress.waitForExistence(10, 2);
 		sleep(2);
 		impress.click(0.01, 0.01);
@@ -223,8 +223,8 @@ public class LongRun {
 		impress.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok();
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok();
 		// Close it by clicking main menu
 		impress.menuItem("File->Close").select();
 		// openStartcenter();
@@ -279,8 +279,8 @@ public class LongRun {
 		submitSaveDlg(saveTo);
 		// If the format is supported by OO1.0, ask whether to change to the
 		// latest format
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok(); // Keep the current format
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok(); // Keep the current format
 
 		// Close it by clicking main menu
 		draw.menuItem("File->Close").select();
@@ -314,12 +314,12 @@ public class LongRun {
 		sleep(3);
 
 		// Verify if the Elements window is active
-		assertTrue(math_ElementsWindow.exists(3));
+		assertTrue(mathElementsWindow.exists(3));
 
 		// Insert a formula
 		String text = "5 times 3 = 15";
 		typeText(text);
-		math_EditWindow.menuItem("Edit->Select All").select();
+		mathEditWindow.menuItem("Edit->Select All").select();
 		typeKeys("<$copy>");
 		sleep(1);
 
@@ -327,32 +327,32 @@ public class LongRun {
 		assertEquals("The typed formula into math", text, app.getClipboard());
 
 		// Save the formula
-		math_EditWindow.menuItem("File->Save As...").select();
+		mathEditWindow.menuItem("File->Save As...").select();
 		FileUtil.deleteFile(saveTo);
 		submitSaveDlg(saveTo);
 		// If the format is supported by OO1.0, ask whether to change to the
 		// latest format
-		if (AlienFormatDlg.exists(3))
-			AlienFormatDlg.ok(); // Keep the current format
+		if (alienFormatDlg.exists(3))
+			alienFormatDlg.ok(); // Keep the current format
 
 		// Close it by clicking main menu
-		math_EditWindow.menuItem("File->Close").select();
+		mathEditWindow.menuItem("File->Close").select();
 		// openStartcenter();
 
 		// Reopen the saved file
 		writer.menuItem("File->Open...").select();
 		submitOpenDlg(saveTo);
-		math_EditWindow.waitForExistence(10, 2);
+		mathEditWindow.waitForExistence(10, 2);
 
 		// Verify if the formula still exists in the file
-		math_EditWindow.menuItem("Edit->Select All").select();
+		mathEditWindow.menuItem("Edit->Select All").select();
 		typeKeys("<$copy>");
 		sleep(1);
 		assertEquals("The typed formula into math is saved", text, app.getClipboard());
 
 		// Close the file to avoid the app closing the Elements window
 		// automatically
-		math_EditWindow.menuItem("File->Close").select();
+		mathEditWindow.menuItem("File->Close").select();
 	}
 
 }



Mime
View raw message