Kaydet (Commit) 858b4d17 authored tarafından Liu Zhe's avatar Liu Zhe

#120477# - [VCLAuto patch] Fix unstable problems of automation scripts

Patch By: Li Lin Yi
Review By: Liu Zhe
üst 26e91b07
......@@ -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;
}
......
......@@ -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");
}
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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");
......
......@@ -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);
}
......
......@@ -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");
......
......@@ -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);
......
......@@ -52,7 +52,7 @@ public class ValidityDateSupport1024Columns {
@Before
public void setUp() throws Exception {
app.start();
app.start(true);
}
@After
......
......@@ -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");
......
......@@ -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");
......
......@@ -43,7 +43,7 @@ public class ValiditySampleFile {
@Before
public void setUp() throws Exception {
app.start();
app.start(true);
}
@After
......
......@@ -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
......
......@@ -45,6 +45,7 @@ public class OpenDocumentWithHeaderFooter {
@Before
public void setUp() throws Exception {
// app.start(true); // Bug 120476
app.start();
}
......
......@@ -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");
......
......@@ -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");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment