Author: liuzhe
Date: Tue Aug 7 07:33:51 2012
New Revision: 1370129
URL: http://svn.apache.org/viewvc?rev=1370129&view=rev
Log:
#120477# - [VCLAuto patch] Fix unstable problems of automation scripts
Patch By: Li Lin Yi
Review By: Liu Zhe
Modified:
incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
incubator/ooo/trunk/main/test/testgui/data/sc/SortOptionsIncludeFormats.ods
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sw/table/Table.java
incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java
Modified:
incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
(original)
+++
incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
Tue Aug 7 07:33:51 2012
@@ -81,6 +81,18 @@ public class VclApp {
communicationManager.start();
}
+ public void start(boolean isCleanUserInstallation) { // Default to
clean user installation
+ if (openOffice != null) {
+ if (isCleanUserInstallation) {
+ openOffice.cleanUserInstallation();
+ }
+
+ openOffice.start();
+ }
+
+ communicationManager.start();
+ }
+
public OpenOffice getOpenOffice() {
return this.openOffice;
}
Modified:
incubator/ooo/trunk/main/test/testgui/data/sc/SortOptionsIncludeFormats.ods
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/data/sc/SortOptionsIncludeFormats.ods?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
(original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
Tue Aug 7 07:33:51 2012
@@ -47,8 +47,9 @@ public class SmokeTest {
@Before
public void setUp() throws Exception {
- app.getOpenOffice().cleanUserInstallation();
- app.start();
+// app.getOpenOffice().cleanUserInstallation();
+// app.start();
+ app.start(true); // Default to clean user installation
smoketestOutput = new File(oo.getUserInstallation(),
"user/temp");
}
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java
Tue Aug 7 07:33:51 2012
@@ -46,7 +46,7 @@ public class AddDeleteSymbolsFromCatalog
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// New a formula document
app.dispatch("private:factory/smath");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java
Tue Aug 7 07:33:51 2012
@@ -46,7 +46,7 @@ public class InputCharacterFromCatalogDl
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// New a formula document
app.dispatch("private:factory/smath");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java
Tue Aug 7 07:33:51 2012
@@ -48,7 +48,7 @@ public class CreateFormulaInDifferentWay
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// New a formula document
app.dispatch("private:factory/smath");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java
Tue Aug 7 07:33:51 2012
@@ -46,7 +46,7 @@ public class ChartDialogSetting {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// Create a new spreadsheet document
app.dispatch("private:factory/scalc");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/filter/Fitler.java
Tue Aug 7 07:33:51 2012
@@ -49,7 +49,7 @@ public class Fitler {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// Create a new spreadsheet document
app.dispatch("private:factory/scalc");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java
Tue Aug 7 07:33:51 2012
@@ -43,7 +43,7 @@ public class InsertSheet {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
app.dispatch("private:factory/scalc");
calc.waitForExistence(10, 3);
}
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java
Tue Aug 7 07:33:51 2012
@@ -51,7 +51,7 @@ public class SortDialogSetting {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// Create a new spreadsheet document
app.dispatch("private:factory/scalc");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java
Tue Aug 7 07:33:51 2012
@@ -49,7 +49,7 @@ public class SubtotalsFunctions {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
String file = prepareData("sc/SubtotalsSampleFile.ods");
app.dispatch(".uno:Open");
submitOpenDlg(file);
@@ -70,7 +70,10 @@ public class SubtotalsFunctions {
@Test
public void testAverage() {
SCSubTotalsGroupByListBox.select(4); // "Team"
- SCCalcSubTotalForColumns.click(10, 25);
+// SCCalcSubTotalForColumns.click(10, 25); // In different
platform, can not focus on same checkbox
+ SCCalcSubTotalForColumns.select(1);
+ SCCalcSubTotalForColumns.check(1); // "Code"
+ sleep(1);
SCCalcSubTotolsFuncionList.select(2); // "Average"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -87,7 +90,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testCountNumbersOnly() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(6); // "Count (numbers
only)"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -104,7 +109,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testMax() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(3); // "Max"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -121,7 +128,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testMin() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(4); // "Min"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -138,7 +147,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testProduct() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(5); // "Product"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -155,7 +166,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testStDevPPopulation() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(8); // "StDevP (Population)"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -172,7 +185,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testSum() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(0); // "Sum"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -189,7 +204,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testVarSample() {
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCCalcSubTotolsFuncionList.select(9); // "Var (Sample)"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -207,7 +224,9 @@ public class SubtotalsFunctions {
@Test
public void testDoNotSortOption() {
SCSubTotalsGroupByListBox.select(4); // "Team"
- SCCalcSubTotalForColumns.click(10, 25);
+// SCCalcSubTotalForColumns.click(10, 25);
+ SCCalcSubTotalForColumns.select(1);
+ SCCalcSubTotalForColumns.check(1); // "Code"
SCSubTotalsOptionsTabPage.select();
SCSubtotalsPreSortToGroupCheckBox.uncheck();
SCSubTotalsOptionsTabPage.ok();
@@ -247,14 +266,20 @@ public class SubtotalsFunctions {
public void testUsingAllGroup() {
SCSubTotalsGroup1Dialog.select();
SCSubTotalsGroupByListBox.select(1); // "Level"
- SCCalcSubTotalForColumns.click(10, 45);
+// SCCalcSubTotalForColumns.click(10, 45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCSubTotalsGroup2Dialog.select();
SCSubTotalsGroupByListBox.select(4); // "Team"
- SCCalcSubTotalForColumns.click(10, 25);
+// SCCalcSubTotalForColumns.click(10, 25);
+ SCCalcSubTotalForColumns.select(1);
+ SCCalcSubTotalForColumns.check(1); // "Code"
SCCalcSubTotolsFuncionList.select(3); // "Max"
SCSubTotalsGroup3Dialog.select();
SCSubTotalsGroupByListBox.select(5); // "Name"
- SCCalcSubTotalForColumns.click(10, 25);
+// SCCalcSubTotalForColumns.click(10, 25);
+ SCCalcSubTotalForColumns.select(1);
+ SCCalcSubTotalForColumns.check(1); // "Code"
SCSubTotalsGroup1Dialog.select();
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -275,7 +300,9 @@ public class SubtotalsFunctions {
*/
@Test
public void testRecalculateAfterRowDeleted() {
- SCCalcSubTotalForColumns.click(10,45);
+// SCCalcSubTotalForColumns.click(10,45);
+ SCCalcSubTotalForColumns.select(2);
+ SCCalcSubTotalForColumns.check(2); // "No."
SCSubTotalsGroup1Dialog.ok();
sleep(1);
@@ -303,7 +330,9 @@ public class SubtotalsFunctions {
@Test
public void testRecalculateWhenDataChanged() {
SCSubTotalsGroupByListBox.select(4); // "Team"
- SCCalcSubTotalForColumns.click(10,25);
+// SCCalcSubTotalForColumns.click(10,25);
+ SCCalcSubTotalForColumns.select(1);
+ SCCalcSubTotalForColumns.check(1); // "Code"
SCCalcSubTotolsFuncionList.select(2); // "Average"
SCSubTotalsGroup1Dialog.ok();
sleep(1);
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java
Tue Aug 7 07:33:51 2012
@@ -52,7 +52,7 @@ public class ValidityDateSupport1024Colu
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
}
@After
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java
Tue Aug 7 07:33:51 2012
@@ -41,7 +41,7 @@ public class ValidityDialogDefaultValue
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// New a spreadsheet, open Validity dialog
app.dispatch("private:factory/scalc");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java
Tue Aug 7 07:33:51 2012
@@ -52,7 +52,7 @@ public class ValidityDialogSetting {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
// New a spreadsheet, select cell range, open Validity dialog
app.dispatch("private:factory/scalc");
@@ -309,10 +309,15 @@ public class ValidityDialogSetting {
SC_ValidityCriteriaTabpage.select();
SC_ValidityCriteriaTabpage.ok();
- calc.rightClick(1, 1);
- typeKeys("<shift s>");
- typeKeys("<down><enter>"); // Choose a
- sleep(2); // if no sleep, error occur
+ // These codes are not stable: start
+// calc.rightClick(1, 1);
+// typeKeys("<shift s>");
+// 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();
+ typeKeys("a<enter>");
assertEquals("a",CalcUtil.getCellText("A1"));
CalcUtil.selectRange("B2");
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java
Tue Aug 7 07:33:51 2012
@@ -43,7 +43,7 @@ public class ValiditySampleFile {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
}
@After
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java
Tue Aug 7 07:33:51 2012
@@ -46,6 +46,7 @@ public class HeaderAndFooterSetting{
@Before
public void setUp() throws Exception {
+// app.start(true); // Bug 120476
app.start();
// New a impress, insert some slides
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
Tue Aug 7 07:33:51 2012
@@ -45,6 +45,7 @@ public class OpenDocumentWithHeaderFoote
@Before
public void setUp() throws Exception {
+// app.start(true); // Bug 120476
app.start();
}
Modified:
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sw/table/Table.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sw/table/Table.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
---
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sw/table/Table.java
(original)
+++
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/sw/table/Table.java
Tue Aug 7 07:33:51 2012
@@ -47,7 +47,7 @@ public class Table {
@Before
public void setUp() throws Exception {
- app.start();
+ app.start(true);
}
@After
@@ -75,7 +75,8 @@ public class Table {
// Convert table to text
app.dispatch(".uno:ConvertTableToText");
assertTrue("Convert Table to Text dialog pop up",
writer_ConvertTableToTextDlg.exists());
- typeKeys("<enter>");
+// typeKeys("<enter>");
+ writer_ConvertTableToTextDlg.ok(); // "Enter" does not
work on linux
// Verify if text is converted successfully
app.dispatch(".uno:SelectAll");
Modified: incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java?rev=1370129&r1=1370128&r2=1370129&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java
(original)
+++ incubator/ooo/trunk/main/test/testgui/source/testlib/gui/UIMap.java Tue Aug
7 07:33:51 2012
@@ -282,7 +282,7 @@ public class UIMap {
public static final VclButton DataPilotButton = button("59270");
public static final VclDockingWin DataPilotPanel =
dockingwin("3643260928");
public static final VclListBox SCSubTotalsGroupByListBox =
listbox("SC_HID_SC_SUBT_GROUP");
- public static final VclControl SCCalcSubTotalForColumns =
control("SC_HID_SC_SUBT_COLS");
+ public static final VclTreeListBox SCCalcSubTotalForColumns =
tree("SC_HID_SC_SUBT_COLS");
public static final VclTabPage SCSubTotalsGroup1Dialog =
tabpage("SC_HID_SCPAGE_SUBT_GROUP1");
public static final VclButton SCSubtotalsInsertPageBreakCheckBox =
button("sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK");
public static final VclButton SCSubtotalsCaseSensitiveCheckBox =
button("sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE");
