diff options
author | Liu Zhe <liuzhe@apache.org> | 2012-08-07 06:33:51 +0000 |
---|---|---|
committer | Liu Zhe <liuzhe@apache.org> | 2012-08-07 06:33:51 +0000 |
commit | 858b4d17086a901c4b4aa49d0917545adda4c3d8 (patch) | |
tree | f73f10a511a3938fe0be973ae9c12ae1721d9fe5 /test | |
parent | 26e91b07a559692b4f8acdd04f5bd28d0daa68b3 (diff) |
#120477# - [VCLAuto patch] Fix unstable problems of automation scripts
Patch By: Li Lin Yi
Review By: Liu Zhe
Notes
Notes:
ignore: vclauto
Diffstat (limited to 'test')
19 files changed, 85 insertions, 35 deletions
diff --git a/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java b/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java index 42993df3ed20..2452b2d4ffc9 100644 --- a/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java +++ b/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java @@ -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; } diff --git a/test/testgui/data/sc/SortOptionsIncludeFormats.ods b/test/testgui/data/sc/SortOptionsIncludeFormats.ods Binary files differindex d028d788fa1a..bbf913de22b1 100644 --- a/test/testgui/data/sc/SortOptionsIncludeFormats.ods +++ b/test/testgui/data/sc/SortOptionsIncludeFormats.ods diff --git a/test/testgui/source/testcase/gui/SmokeTest.java b/test/testgui/source/testcase/gui/SmokeTest.java index 6477bd38c611..494fb373748a 100644 --- a/test/testgui/source/testcase/gui/SmokeTest.java +++ b/test/testgui/source/testcase/gui/SmokeTest.java @@ -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"); } diff --git a/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java b/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java index 02c4d235a2a5..84058242c01c 100644 --- a/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java +++ b/test/testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java b/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java index 52a6c07fcd03..3fbba1c8c570 100644 --- a/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java +++ b/test/testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java @@ -46,7 +46,7 @@ public class InputCharacterFromCatalogDlg { @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a formula document app.dispatch("private:factory/smath"); diff --git a/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java b/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java index 06181e6ea3d2..32eb35506084 100644 --- a/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java +++ b/test/testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java @@ -48,7 +48,7 @@ public class CreateFormulaInDifferentWays { @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a formula document app.dispatch("private:factory/smath"); diff --git a/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java b/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java index c9849ea62523..f4cb54f8a628 100644 --- a/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java +++ b/test/testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/sc/filter/Fitler.java b/test/testgui/source/testcase/gui/sc/filter/Fitler.java index 859f17fcad72..93ff617f0735 100644 --- a/test/testgui/source/testcase/gui/sc/filter/Fitler.java +++ b/test/testgui/source/testcase/gui/sc/filter/Fitler.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java b/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java index 3692e00c1878..a0d57f30490c 100644 --- a/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java +++ b/test/testgui/source/testcase/gui/sc/sheet/InsertSheet.java @@ -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); } diff --git a/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java b/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java index 8ca7efb7b96a..a21a9be9de0a 100644 --- a/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java +++ b/test/testgui/source/testcase/gui/sc/sort/SortDialogSetting.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java b/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java index 86c58430eeba..721cfb5bdc73 100644 --- a/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java +++ b/test/testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java @@ -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); diff --git a/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java b/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java index 541acd0119f7..47977affd32b 100644 --- a/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java +++ b/test/testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java @@ -52,7 +52,7 @@ public class ValidityDateSupport1024Columns { @Before public void setUp() throws Exception { - app.start(); + app.start(true); } @After diff --git a/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java b/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java index 59fdeb3ef014..71bdff40dc64 100644 --- a/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java +++ b/test/testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java b/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java index 6efa049cd923..635e20238690 100644 --- a/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java +++ b/test/testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java @@ -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"); diff --git a/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java b/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java index 774d2b4f5260..970ab383f281 100644 --- a/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java +++ b/test/testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java @@ -43,7 +43,7 @@ public class ValiditySampleFile { @Before public void setUp() throws Exception { - app.start(); + app.start(true); } @After diff --git a/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java b/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java index fcdc9a30414d..91fccc2a2d8c 100644 --- a/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java +++ b/test/testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java @@ -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 diff --git a/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java b/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java index aba15bdb9a14..5f46d4d6a2d7 100644 --- a/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java +++ b/test/testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java @@ -45,6 +45,7 @@ public class OpenDocumentWithHeaderFooter { @Before public void setUp() throws Exception { +// app.start(true); // Bug 120476 app.start(); } diff --git a/test/testgui/source/testcase/gui/sw/table/Table.java b/test/testgui/source/testcase/gui/sw/table/Table.java index 4d80df4bb37d..93316aec69a3 100644 --- a/test/testgui/source/testcase/gui/sw/table/Table.java +++ b/test/testgui/source/testcase/gui/sw/table/Table.java @@ -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"); diff --git a/test/testgui/source/testlib/gui/UIMap.java b/test/testgui/source/testlib/gui/UIMap.java index 7857b1507081..94618f39a5bb 100644 --- a/test/testgui/source/testlib/gui/UIMap.java +++ b/test/testgui/source/testlib/gui/UIMap.java @@ -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"); |