Index: testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java =================================================================== --- testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java (revision 1368795) +++ testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java (working copy) @@ -81,6 +81,18 @@ communicationManager.start(); } + public void start(boolean isCleanUserInstallation) { // Default to clean user installation + if (isCleanUserInstallation) { + openOffice.cleanUserInstallation(); + } + + if (openOffice != null) { + openOffice.start(); + } + + communicationManager.start(); + } + public OpenOffice getOpenOffice() { return this.openOffice; } Index: testgui/data/sc/SortOptionsIncludeFormats.ods =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java =================================================================== --- testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java (revision 1368795) +++ testgui/source/testcase/gui/formula/catalog/AddDeleteSymbolsFromCatalog.java (working copy) @@ -46,7 +46,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a formula document app.dispatch("private:factory/smath"); Index: testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java =================================================================== --- testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java (revision 1368795) +++ testgui/source/testcase/gui/formula/catalog/InputCharacterFromCatalogDlg.java (working copy) @@ -46,7 +46,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a formula document app.dispatch("private:factory/smath"); Index: testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java =================================================================== --- testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java (revision 1368795) +++ testgui/source/testcase/gui/formula/importexport/CreateFormulaInDifferentWays.java (working copy) @@ -48,7 +48,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a formula document app.dispatch("private:factory/smath"); Index: testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java =================================================================== --- testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java (revision 1368795) +++ testgui/source/testcase/gui/sc/chart/ChartDialogSetting.java (working copy) @@ -46,7 +46,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // Create a new spreadsheet document app.dispatch("private:factory/scalc"); Index: testgui/source/testcase/gui/sc/filter/Fitler.java =================================================================== --- testgui/source/testcase/gui/sc/filter/Fitler.java (revision 1368795) +++ testgui/source/testcase/gui/sc/filter/Fitler.java (working copy) @@ -49,7 +49,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // Create a new spreadsheet document app.dispatch("private:factory/scalc"); Index: testgui/source/testcase/gui/sc/sheet/InsertSheet.java =================================================================== --- testgui/source/testcase/gui/sc/sheet/InsertSheet.java (revision 1368795) +++ testgui/source/testcase/gui/sc/sheet/InsertSheet.java (working copy) @@ -43,7 +43,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); app.dispatch("private:factory/scalc"); calc.waitForExistence(10, 3); } Index: testgui/source/testcase/gui/sc/sort/SortDialogSetting.java =================================================================== --- testgui/source/testcase/gui/sc/sort/SortDialogSetting.java (revision 1368795) +++ testgui/source/testcase/gui/sc/sort/SortDialogSetting.java (working copy) @@ -51,7 +51,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // Create a new spreadsheet document app.dispatch("private:factory/scalc"); Index: testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java =================================================================== --- testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java (revision 1368795) +++ testgui/source/testcase/gui/sc/subtotals/SubtotalsFunctions.java (working copy) @@ -49,7 +49,7 @@ @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 @@ @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 @@ */ @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 @@ */ @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 @@ */ @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 @@ */ @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 @@ */ @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 @@ */ @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 @@ */ @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 @@ @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 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 @@ */ @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 @@ @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); Index: testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java =================================================================== --- testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java (revision 1368795) +++ testgui/source/testcase/gui/sc/validity/ValidityDateSupport1024Columns.java (working copy) @@ -52,7 +52,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); } @After Index: testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java =================================================================== --- testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java (revision 1368795) +++ testgui/source/testcase/gui/sc/validity/ValidityDialogDefaultValue.java (working copy) @@ -41,7 +41,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); // New a spreadsheet, open Validity dialog app.dispatch("private:factory/scalc"); Index: testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java =================================================================== --- testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java (revision 1368795) +++ testgui/source/testcase/gui/sc/validity/ValidityDialogSetting.java (working copy) @@ -52,7 +52,7 @@ @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 @@ SC_ValidityCriteriaTabpage.select(); SC_ValidityCriteriaTabpage.ok(); - calc.rightClick(1, 1); - typeKeys(""); - typeKeys(""); // Choose a - sleep(2); // if no sleep, error occur + // These codes are not stable: start +// calc.rightClick(1, 1); +// typeKeys(""); +// typeKeys(""); // Choose a +// sleep(2); // if no sleep, error occur + // These codes are not stable: end + CalcUtil.selectRange("A1"); + SC_InputBar_Input.activate(); + typeKeys("a"); assertEquals("a",CalcUtil.getCellText("A1")); CalcUtil.selectRange("B2"); Index: testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java =================================================================== --- testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java (revision 1368795) +++ testgui/source/testcase/gui/sc/validity/ValiditySampleFile.java (working copy) @@ -43,7 +43,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); } @After Index: testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java =================================================================== --- testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java (revision 1368795) +++ testgui/source/testcase/gui/sd/headerandfooter/HeaderAndFooterSetting.java (working copy) @@ -46,6 +46,7 @@ @Before public void setUp() throws Exception { +// app.start(true); // Bug 120476 app.start(); // New a impress, insert some slides Index: testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java =================================================================== --- testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java (revision 1368795) +++ testgui/source/testcase/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java (working copy) @@ -45,6 +45,7 @@ @Before public void setUp() throws Exception { +// app.start(true); // Bug 120476 app.start(); } Index: testgui/source/testcase/gui/SmokeTest.java =================================================================== --- testgui/source/testcase/gui/SmokeTest.java (revision 1368795) +++ testgui/source/testcase/gui/SmokeTest.java (working copy) @@ -47,8 +47,9 @@ @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"); } Index: testgui/source/testcase/gui/sw/table/Table.java =================================================================== --- testgui/source/testcase/gui/sw/table/Table.java (revision 1368795) +++ testgui/source/testcase/gui/sw/table/Table.java (working copy) @@ -47,7 +47,7 @@ @Before public void setUp() throws Exception { - app.start(); + app.start(true); } @After @@ -75,7 +75,8 @@ // Convert table to text app.dispatch(".uno:ConvertTableToText"); assertTrue("Convert Table to Text dialog pop up", writer_ConvertTableToTextDlg.exists()); - typeKeys(""); +// typeKeys(""); + writer_ConvertTableToTextDlg.ok(); // "Enter" does not work on linux // Verify if text is converted successfully app.dispatch(".uno:SelectAll"); Index: testgui/source/testlib/gui/UIMap.java =================================================================== --- testgui/source/testlib/gui/UIMap.java (revision 1368795) +++ testgui/source/testlib/gui/UIMap.java (working copy) @@ -282,7 +282,7 @@ 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");