You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by li...@apache.org on 2012/09/07 04:29:55 UTC
svn commit: r1381843 [5/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...
Copied: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java (from r1380113, incubator/ooo/trunk/test/testgui/source/testcase/gui/TestSample.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java?p2=incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java&p1=incubator/ooo/trunk/test/testgui/source/testcase/gui/TestSample.java&r1=1380113&r2=1381843&rev=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/TestSample.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java Fri Sep 7 02:29:53 2012
@@ -19,11 +19,11 @@
*
*************************************************************/
-package testcase.gui;
+package testcase.gui.svt;
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.io.File;
@@ -43,7 +43,7 @@ import org.openoffice.test.common.Condit
import org.openoffice.test.common.FileUtil;
import org.openoffice.test.common.Logger;
-import testlib.gui.ImpressUtil;
+import testlib.gui.SDTool;
@RunWith(Parameterized.class)
public class TestSample {
@@ -192,8 +192,8 @@ public class TestSample {
writer.menuItem("File->Save As...").select();
submitSaveDlg(saveTo);
- if (AlienFormatDlg.exists(3))
- AlienFormatDlg.ok();
+ if (alienFormatDlg.exists(3))
+ alienFormatDlg.ok();
sleep(2);
writer.waitForEnabled(120, 2);
@@ -223,15 +223,15 @@ public class TestSample {
calc.menuItem("File->Save As...").select();
submitSaveDlg(saveTo);
- if (AlienFormatDlg.exists(3))
- AlienFormatDlg.ok();
+ if (alienFormatDlg.exists(3))
+ alienFormatDlg.ok();
sleep(2);
new Condition() {
@Override
public boolean value() {
- if (MsgBox_AdditionalRowsNotSaved.exists()) {
- MsgBox_AdditionalRowsNotSaved.ok();
+ if (msgBox_AdditionalRowsNotSaved.exists()) {
+ msgBox_AdditionalRowsNotSaved.ok();
}
return calc.isEnabled();
}
@@ -255,17 +255,17 @@ public class TestSample {
public void testImpress() {
startcenter.menuItem("File->Open...").select();
submitOpenDlg(file.getAbsolutePath());
- handleBlocker(impress, ImpressSlideSorter, ImpressOutline, ImpressHandout);
+ handleBlocker(impress, impressSlideSorter, impressOutline, impressHandout);
sleep(10); // Wait. Crash maybe occurs when the file is shown!
- ImpressUtil.getCurView().menuItem("View->Normal").select();
+ SDTool.getActiveView().menuItem("View->Normal").select();
// Assert.assertTrue("File Passed:" + file,
// impress.getCaption().contains(file.getName()));
impress.menuItem("File->Save As...").select();
submitSaveDlg(saveTo);
- if (AlienFormatDlg.exists(3))
- AlienFormatDlg.ok();
+ if (alienFormatDlg.exists(3))
+ alienFormatDlg.ok();
sleep(2);
impress.waitForEnabled(120, 2);
impress.menuItem("File->Close").select();
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnNewSC.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnNewSC.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnNewSC.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnNewSC.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sc;
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.io.FileOutputStream;
@@ -44,7 +44,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 OperationOnNewSC {
@Rule
@@ -83,81 +83,81 @@ public class OperationOnNewSC {
for (int i = 0; i < 1000; i++) {
// Data Sort
app.dispatch("private:factory/scalc");
- CalcUtil.selectRange("A1");
+ SCTool.selectRange("A1");
typeKeys("3<down>2<down>5<down>1<down>6<down>4<down>10<down>8<down>9<down>7");
sleep(1);
app.dispatch(".uno:DataSort");
- SortOptionsPage.select();
- SortOptionsPage_RangeContainsColumnLabels.uncheck();
- SortPage.select();
- SortPage_By1.select(1); // "Column A"
- SortPage_Ascending1.check();
- SortPage.ok();
+ sortOptionsPage.select();
+ sortOptionsPageRangeContainsColumnLabels.uncheck();
+ sortPage.select();
+ sortPageBy1.select(1); // "Column A"
+ sortPageAscending1.check();
+ sortPage.ok();
sleep(5);
// Insert Sheet
app.dispatch(".uno:Insert");
- SCAfterCurrentSheet.check();
- SCNewSheetName.setText("Instant Filter");
- SCInsertSheetDlg.ok();
+ scAfterCurrentSheet.check();
+ scNewSheetName.setText("Instant Filter");
+ scInsertSheetDlg.ok();
sleep(5);
// Standard Filter
- CalcUtil.selectRange("A1");
+ SCTool.selectRange("A1");
typeKeys("A<down>1<down>2<down>3<down>1<down>2<down>3<down>1<down>2<down>3");
sleep(1);
- CalcUtil.selectRange("A1");
+ SCTool.selectRange("A1");
app.dispatch(".uno:DataFilterStandardFilter");
sleep(2);
- FilterValue1.setText("1");
- StandardFilterDlg.ok();
+ filterValue1.setText("1");
+ standardFilterDlg.ok();
sleep(5);
// Data Validate
app.dispatch(".uno:Insert");
- SCAfterCurrentSheet.check();
- SCNewSheetName.setText("Data Validate");
- SCInsertSheetDlg.ok();
+ scAfterCurrentSheet.check();
+ scNewSheetName.setText("Data Validate");
+ scInsertSheetDlg.ok();
sleep(5);
- CalcUtil.selectRange("B2:E5");
+ SCTool.selectRange("B2:E5");
sleep(2);
app.dispatch(".uno:Validation");
- SC_ValidityCriteriaTabpage.select();
- SC_ValidityCriteriaAllowList.select("Whole Numbers");
- SC_ValidityDecimalCompareOperator.select("greater than");
- SC_ValiditySourceInput.setText("1");
- SC_ValidityErrorAlertTabPage.select();
- SC_ValidityShowErrorMessage.check();
- SC_ValidityErrorMessageTitle.setText("Error");
- SC_ValidityErrorMessage.setText("Must greater than 1");
- SC_ValidityErrorAlertTabPage.ok();
+ scValidityCriteriaTabpage.select();
+ scValidityCriteriaAllowList.select("Whole Numbers");
+ scValidityDecimalCompareOperator.select("greater than");
+ scValiditySourceInput.setText("1");
+ scValidityErrorAlertTabPage.select();
+ scValidityShowErrorMessage.check();
+ scValidityErrorMessageTitle.setText("Error");
+ scValidityErrorMessage.setText("Must greater than 1");
+ scValidityErrorAlertTabPage.ok();
- CalcUtil.selectRange("B2");
+ SCTool.selectRange("B2");
typeKeys("0<enter>");
- ActiveMsgBox.ok();
+ activeMsgBox.ok();
sleep(1);
- CalcUtil.selectRange("E5");
+ SCTool.selectRange("E5");
typeKeys("1<enter>");
- ActiveMsgBox.ok();
+ activeMsgBox.ok();
sleep(1);
- CalcUtil.selectRange("E2");
+ SCTool.selectRange("E2");
typeKeys("2<enter>");
sleep(5);
// Input cells, insert pics and chart
app.dispatch(".uno:Insert");
- SCBeforeCurrentSheet.check();
- SCNewSheetName.setText("InsertObjects");
- SCInsertSheetDlg.ok();
+ scBeforeCurrentSheet.check();
+ scNewSheetName.setText("InsertObjects");
+ scInsertSheetDlg.ok();
sleep(5);
calc.menuItem("Insert->Picture->From File...").select();
sleep(2);
- FilePicker_Path.setText(pic);
+ filePickerPath.setText(pic);
sleep(1);
- FilePicker_Open.click();
+ filePickerOpen.click();
sleep(5);
typeKeys("<esc>");
sleep(5);
@@ -167,8 +167,8 @@ public class OperationOnNewSC {
calc.menuItem("File->Save As...").select();
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
- if (ActiveMsgBox.exists()) {
- ActiveMsgBox.yes();
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
sleep(2);
}
calc.menuItem("File->Close").select();
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnSampleFile.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnSampleFile.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnSampleFile.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/OperationOnSampleFile.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sc;
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.io.FileOutputStream;
@@ -43,7 +43,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 OperationOnSampleFile {
@Rule
@@ -86,16 +86,16 @@ public class OperationOnSampleFile {
// Insert Chart
app.dispatch(".uno:Insert");
- SCAfterCurrentSheet.check();
- SCNewSheetName.setText("Instant Chart");
- SCInsertSheetDlg.ok();
+ scAfterCurrentSheet.check();
+ scNewSheetName.setText("Instant Chart");
+ scInsertSheetDlg.ok();
sleep(5);
inputCells(inputStr);
sleep(2);
- CalcUtil.selectRange("A1:C5");
+ SCTool.selectRange("A1:C5");
calc.menuItem("Insert->Chart...").select();
sleep(1);
- Chart_Wizard.ok();
+ chartWizard.ok();
sleep(5);
calc.typeKeys("<esc>");
sleep(5);
@@ -106,15 +106,15 @@ public class OperationOnSampleFile {
// Insert Graphic and Fontwork
app.dispatch(".uno:Insert");
- SCAfterCurrentSheet.check();
- SCNewSheetName.setText("Instant Graphic and fontwork");
- SCInsertSheetDlg.ok();
+ scAfterCurrentSheet.check();
+ scNewSheetName.setText("Instant Graphic and fontwork");
+ scInsertSheetDlg.ok();
sleep(5);
calc.menuItem("Insert->Picture->From File...").select();
sleep(2);
- FilePicker_Path.setText(pic);
+ filePickerPath.setText(pic);
sleep(1);
- FilePicker_Open.click();
+ filePickerOpen.click();
sleep(5);
calc.typeKeys("<esc>");
sleep(2);
@@ -123,14 +123,14 @@ public class OperationOnSampleFile {
app.dispatch(".uno:FontworkGalleryFloater");
sleep(2);
typeKeys("<right>");
- FontworkGalleryDlg.ok();
+ fontworkGalleryDlg.ok();
sleep(2);
calc.typeKeys("<esc>");
sleep(2);
// Close file
calc.menuItem("File->Close").select();
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
HashMap<String, Object> perfData = SystemUtil.getProcessPerfData(pid);
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/SwitchFilesContainingChart.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/SwitchFilesContainingChart.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/SwitchFilesContainingChart.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sc/SwitchFilesContainingChart.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sc;
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.io.FileOutputStream;
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/DragOLEObject.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/DragOLEObject.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/DragOLEObject.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/DragOLEObject.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sd;
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.io.FileOutputStream;
@@ -104,7 +104,7 @@ public class DragOLEObject {
sleep(5);
impress.menuItem("File->Close").select();
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
HashMap<String, Object> perfData = SystemUtil.getProcessPerfData(pid);
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/OperationOnNewSD.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/OperationOnNewSD.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/OperationOnNewSD.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/OperationOnNewSD.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sd;
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.io.FileOutputStream;
@@ -79,7 +79,7 @@ public class OperationOnNewSD {
for (int i = 0; i < 1000; i++) {
// Create a new SD
app.dispatch("private:factory/simpress?slot=6686");
- PresentationWizard.ok();
+ presentationWizard.ok();
sleep(2);
// Create a new slide
@@ -89,10 +89,10 @@ public class OperationOnNewSD {
// Insert a table
app.dispatch(".uno:InsertTable", 3);
sleep(2);
- NumberofCol.setText("5");
- NumberofRow.setText("4");
+ numberofCol.setText("5");
+ numberofRow.setText("4");
sleep(2);
- InsertTable.ok();
+ insertTable.ok();
impress.typeKeys("<enter>");
impress.typeKeys("2");
impress.typeKeys("<right>");
@@ -107,9 +107,9 @@ public class OperationOnNewSD {
sleep(2);
impress.menuItem("Insert->Picture->From File...").select();
sleep(2);
- FilePicker_Path.setText(pic);
+ filePickerPath.setText(pic);
sleep(1);
- FilePicker_Open.click();
+ filePickerOpen.click();
sleep(5);
impress.typeKeys("<esc>");
sleep(2);
@@ -117,24 +117,24 @@ public class OperationOnNewSD {
// Insert Slides from External Sample files
impress.menuItem("Insert->File...").select();
sleep(2);
- FilePicker_Path.setText(externalFile);
- FilePicker_Open.click();
+ filePickerPath.setText(externalFile);
+ filePickerOpen.click();
sleep(2);
- InsertSlideObjects.ok();
+ insertSlideObjects.ok();
sleep(2);
- ActiveMsgBox.yes();
+ activeMsgBox.yes();
sleep(20);
// Slide Screen Show Settings
impress.menuItem("Slide Show->Slide Transition...").select();
sleep(2);
- ImpressSlideTransitions.select("Uncover Up");
+ impressSlideTransitions.select("Uncover Up");
sleep(2);
- SlideShowSpeed.select("Slow");
+ slideShowSpeed.select("Slow");
sleep(5);
- SlideAutoAfter.check();
+ slideAutoAfter.check();
sleep(2);
- ApplyToAllSlides.click();
+ applyToAllSlides.click();
sleep(2);
impress.menuItem("Slide Show->Slide Show").select();
sleep(70);
@@ -146,8 +146,8 @@ public class OperationOnNewSD {
impress.menuItem("File->Save As...").select();
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
- if (ActiveMsgBox.exists()) {
- ActiveMsgBox.yes();
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
sleep(2);
}
impress.menuItem("File->Close").select();
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/SwitchDiffViewsOnOdpFile.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/SwitchDiffViewsOnOdpFile.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/SwitchDiffViewsOnOdpFile.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sd/SwitchDiffViewsOnOdpFile.java Fri Sep 7 02:29:53 2012
@@ -27,7 +27,7 @@ package testcase.gui.svt.sd;
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.io.FileOutputStream;
@@ -83,20 +83,20 @@ public class SwitchDiffViewsOnOdpFile {
impress.menuItem("View->Outline").select();
sleep(2);
- ImpressOutline.menuItem("View->Slide Sorter").select();
+ impressOutline.menuItem("View->Slide Sorter").select();
sleep(10);
- ImpressSlideSorter.menuItem("View->Notes Page").select();
+ impressSlideSorter.menuItem("View->Notes Page").select();
sleep(2);
- ImpressHandoutView.menuItem("View->Master->Slide Master").select();
+ impressHandoutView.menuItem("View->Master->Slide Master").select();
sleep(2);
impress.menuItem("View->Master->Notes Master").select();
sleep(2);
- ImpressHandoutView.menuItem("View->Normal").select();
+ impressHandoutView.menuItem("View->Normal").select();
sleep(2);
impress.menuItem("File->Close").select();
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
HashMap<String, Object> perfData = SystemUtil.getProcessPerfData(pid);
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnNewSW.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnNewSW.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnNewSW.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnNewSW.java Fri Sep 7 02:29:53 2012
@@ -25,7 +25,7 @@
package testcase.gui.svt.sw;
import static org.openoffice.test.vcl.Tester.*;
-import static testlib.gui.AppUtil.*;
+import static testlib.gui.AppTool.*;
import static testlib.gui.UIMap.*;
import java.io.FileOutputStream;
@@ -81,7 +81,7 @@ public class OperationOnNewSW {
app.dispatch(".uno:SelectAll");
writer.menuItem("Format->Bullets and Numbering...").select();
sleep(3);
- Bullet.ok();
+ bulletPage.ok();
writer.typeKeys("<ctrl z");
sleep(1);
writer.typeKeys("<ctrl y>");
@@ -95,10 +95,10 @@ public class OperationOnNewSW {
sleep(2);
writer.menuItem("Tools->Spelling and Grammar...").select();
sleep(2);
- SuggestionList.select(0);
- Change.click();
+ spellcheckDlgSuggestionList.select(0);
+ spellcheckDlgChange.click();
sleep(2);
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
// Create Header and Footer
@@ -118,7 +118,7 @@ public class OperationOnNewSW {
// Insert Frame and change anchor
writer.menuItem("Insert->Frame...").select();
sleep(2);
- writer_FrameDlg.ok();
+ writerFrameDlg.ok();
writer.menuItem("Format->Anchor->To Page").select();
sleep(2);
writer.menuItem("Format->Anchor->To Paragraph").select();
@@ -141,12 +141,12 @@ public class OperationOnNewSW {
for (int k = 0; k < 2; k++) {
writer.typeKeys("<shift down>");
}
- if (!StyleAndFormattingDlg.exists()) {
+ if (!styleAndFormattingDlg.exists()) {
app.dispatch(".uno:DesignerDialog");
sleep(2);
}
- StyleAndFormattingList.doubleClick(0.5, 0.25);
+ styleAndFormattingList.doubleClick(0.5, 0.25);
sleep(2);
writer.typeKeys("<down>");
writer.typeKeys("<right>");
@@ -154,13 +154,13 @@ public class OperationOnNewSW {
for (int k = 0; k < 2; k++) {
writer.typeKeys("<shift down>");
}
- StyleAndFormattingList.doubleClick(0.5, 0.3);
+ styleAndFormattingList.doubleClick(0.5, 0.3);
sleep(2);
writer.typeKeys("<ctrl home>");
sleep(2);
writer.menuItem("Insert->Indexes and Tables->Indexes and Tables...").select();
sleep(2);
- InsertIndexDlg.ok();
+ insertIndexDlg.ok();
sleep(2);
writer.typeKeys("<ctrl end>");
@@ -169,8 +169,8 @@ public class OperationOnNewSW {
writer.menuItem("File->Save As...").select();
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
- if (ActiveMsgBox.exists()) {
- ActiveMsgBox.yes();
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
sleep(2);
}
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample1.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample1.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample1.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample1.java Fri Sep 7 02:29:53 2012
@@ -26,7 +26,7 @@ package testcase.gui.svt.sw;
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.io.FileOutputStream;
@@ -91,7 +91,7 @@ public class OperationOnSample1 {
writer.menuItem("Table->Split Cells").select();
sleep(2);
- Writer_SplitCellDlg.ok();
+ writerSplitCellDlg.ok();
sleep(2);
writer.typeKeys("<shift down>");
@@ -106,21 +106,21 @@ public class OperationOnSample1 {
writer.typeKeys("<enter>");
// writer.menuItem("Table->Insert->Rows...").select();
app.dispatch(".uno:InsertRowDialog");
- Writer_InsertRowsDlg.ok();
+ writerInsertRowsDlg.ok();
sleep(2);
writer.menuItem("Table->Delete->Rows").select();
sleep(2);
app.dispatch(".uno:InsertColumnDialog");
- Writer_InsertColumnsDlg.ok();
+ writerInsertColumnsDlg.ok();
sleep(2);
writer.menuItem("Table->Delete->Columns").select();
sleep(2);
writer.menuItem("File->Close").select();
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
HashMap<String, Object> perfData = SystemUtil.getProcessPerfData(pid);
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample2.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample2.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample2.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/sw/OperationOnSample2.java Fri Sep 7 02:29:53 2012
@@ -26,7 +26,7 @@ package testcase.gui.svt.sw;
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.io.FileOutputStream;
@@ -92,12 +92,12 @@ public class OperationOnSample2 {
app.dispatch(".uno:SelectAll");
sleep(2);
writer.menuItem("Format->Paragraph...").select();
- AlignmentTabPage.select();
- Right.check();
+ alignPage.select();
+ alignPageRight.check();
sleep(2);
- VerticalAlignment.select("Bottom");
+ alignPageVerticalAlign.select("Bottom");
sleep(2);
- AlignmentTabPage.ok();
+ alignPage.ok();
sleep(2);
writer.typeKeys("<ctrl end>");
sleep(5);
@@ -105,9 +105,9 @@ public class OperationOnSample2 {
// Insert Picture from file
writer.menuItem("Insert->Picture->From File...").select();
sleep(2);
- FilePicker_Path.setText(pic);
+ filePickerPath.setText(pic);
sleep(1);
- FilePicker_Open.click();
+ filePickerOpen.click();
sleep(5);
writer.typeKeys("<esc>");
sleep(2);
@@ -117,7 +117,7 @@ public class OperationOnSample2 {
// sleep(2);
app.dispatch(".uno:InsertObject");
sleep(2);
- InsertObject.ok();
+ insertObject.ok();
sleep(10);
typeKeys("<esc>");
sleep(5);
@@ -136,7 +136,7 @@ public class OperationOnSample2 {
// Close file
writer.menuItem("File->Close").select();
- ActiveMsgBox.no();
+ activeMsgBox.no();
sleep(2);
HashMap<String, Object> perfData = SystemUtil.getProcessPerfData(pid);
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/sw/table/TableGeneral.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/sw/table/TableGeneral.java?rev=1381843&r1=1381842&r2=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/sw/table/TableGeneral.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/sw/table/TableGeneral.java Fri Sep 7 02:29:53 2012
@@ -2,7 +2,7 @@ package testcase.gui.sw.table;
import static org.junit.Assert.*;
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;
@@ -29,7 +29,7 @@ public class TableGeneral {
// Insert a table
app.dispatch(".uno:InsertTable");
- assertTrue("Insert Table dialog pop up", writer_InsertTable.exists());
+ assertTrue("Insert Table dialog pop up", writerInsertTable.exists());
}
@After
@@ -41,23 +41,23 @@ public class TableGeneral {
// Test setting table size in text document
public void testTableSize() throws Exception {
- SWTableSizeColBox.focus();
+ swTableSizeColBox.focus();
typeKeys("<delete>");
typeKeys("3");
- SWTableSizeRowBox.focus();
+ swTableSizeRowBox.focus();
typeKeys("<delete>");
typeKeys("4");
- writer_InsertTable.ok();
+ writerInsertTable.ok();
writer.focus(); // verify how many rows in the table
- assertNotNull(StatusBar.getItemTextById(8));
+ assertNotNull(statusBar.getItemTextById(8));
for (int i = 0; i < 3; i++) {
typeKeys("<down>");
- assertNotNull(StatusBar.getItemTextById(8));
+ assertNotNull(statusBar.getItemTextById(8));
}
typeKeys("<down>");
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
// Test setting table cell background in text document
@@ -66,18 +66,18 @@ public class TableGeneral {
@Ignore
// bug120378
public void testTableBackground() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
writer.focus();
// set table cell background
app.dispatch(".uno:TableDialog");
- SWTableBackground.select();
+ swTableBackground.select();
assertTrue("Table background property dialog pop up",
- SWTableBackground.exists());
+ swTableBackground.exists());
;
- SWTableBackgroundColor.focus();
- SWTableBackgroundColor.click(50, 50);
- SWTableBackground.ok();
+ swTableBackgroundColor.focus();
+ swTableBackgroundColor.click(50, 50);
+ swTableBackground.ok();
// verify table cell background color
writer.focus();
// select the cell which is filled with color
@@ -85,31 +85,31 @@ public class TableGeneral {
typeKeys("<ctrl c>");
app.dispatch("private:factory/simpress?slot=6686");
- PresentationWizard.ok();
+ presentationWizard.ok();
typeKeys("<ctrl v>");
// enable table cell area format dialog
app.dispatch(".uno:FormatArea");
sleep(1);
- assertEquals("Light red", SDTable_BACGColorListbox.getSelText());
+ assertEquals("Light red", sdTableBACGColorListbox.getSelText());
// close table cell area format dialog
- SDTable_BACGColorArea.cancel();
+ sdTableBACGColorArea.cancel();
}
// Test setting table border in text document
@Test
public void testTableBorder() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// set table border as none
writer.focus();
app.dispatch(".uno:TableDialog");
- SWTableBorder.select();
+ swTableBorder.select();
assertTrue("Table border property dialog pop up",
- SWTableBorder.exists());
+ swTableBorder.exists());
;
- SWTableBorderLineArrange.click(10, 10);
- SWTableBorder.ok();
+ swTableBorderLineArrange.click(10, 10);
+ swTableBorder.ok();
}
// Test setting table border line style,line color,spacing to content in
@@ -117,77 +117,77 @@ public class TableGeneral {
@Test
public void testTableBorderLineStyle() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
writer.focus();
app.dispatch(".uno:TableDialog");
- SWTableBorder.select();
+ swTableBorder.select();
assertTrue("Table border property dialog pop up",
- SWTableBorder.exists());
+ swTableBorder.exists());
;
- SWTableBorderLineStyle.select(8); // set line style
- SWTableBorderLineColor.select(5); // set line color
- SWTableSTCLeft.focus(); // set spacing to content
+ swTableBorderLineStyle.select(8); // set line style
+ swTableBorderLineColor.select(5); // set line color
+ swTableSTCLeft.focus(); // set spacing to content
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("0.5"); // set spacing to content
- SWTableShadow.click(40, 10); // set table shadow
- SWTableShadowSize.focus();
+ swTableShadow.click(40, 10); // set table shadow
+ swTableShadowSize.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("2");
- SWTableShadowColor.select(5);
- SWTableBorder.ok();
+ swTableShadowColor.select(5);
+ swTableBorder.ok();
writer.focus(); // verify the setting property of table
app.dispatch(".uno:TableDialog");
- SWTableBorder.select();
- assertEquals("2.60 pt", SWTableBorderLineStyle.getItemText(8));
- assertEquals("Magenta", SWTableBorderLineColor.getItemText(5));
- assertEquals("0.50\"", SWTableSTCLeft.getText());
- assertEquals("0.50\"", SWTableSTCRight.getText());
- assertEquals("0.50\"", SWTableSTCTop.getText());
- assertEquals("0.50\"", SWTableSTCBottom.getText());
- assertEquals("1.97\"", SWTableShadowSize.getText());
- assertEquals("Magenta", SWTableShadowColor.getItemText(5));
- assertTrue("SWTableSTC_SYNC", SWTableSTC_SYNC.isChecked());
- SWTableBorder.close();
+ swTableBorder.select();
+ assertEquals("2.60 pt", swTableBorderLineStyle.getItemText(8));
+ assertEquals("Magenta", swTableBorderLineColor.getItemText(5));
+ assertEquals("0.50\"", swTableSTCLeft.getText());
+ assertEquals("0.50\"", swTableSTCRight.getText());
+ assertEquals("0.50\"", swTableSTCTop.getText());
+ assertEquals("0.50\"", swTableSTCBottom.getText());
+ assertEquals("1.97\"", swTableShadowSize.getText());
+ assertEquals("Magenta", swTableShadowColor.getItemText(5));
+ assertTrue("SWTableSTC_SYNC", swTableSTCSYNC.isChecked());
+ swTableBorder.close();
// uncheck Synchronize box and set spacing to content
writer.focus();
app.dispatch(".uno:TableDialog");
- SWTableBorder.select();
- SWTableSTC_SYNC.uncheck();
- SWTableSTCLeft.focus();// set left spacing to content
+ swTableBorder.select();
+ swTableSTCSYNC.uncheck();
+ swTableSTCLeft.focus();// set left spacing to content
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("0.5");
- SWTableSTCRight.focus();// set right spacing to content
+ swTableSTCRight.focus();// set right spacing to content
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("0.8");
- SWTableSTCTop.focus();// set top spacing to content
+ swTableSTCTop.focus();// set top spacing to content
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("1.0");
- SWTableSTCBottom.focus();// set bottom spacing to content
+ swTableSTCBottom.focus();// set bottom spacing to content
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("2");
- SWTableBorder.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ swTableBorder.ok();
+ assertNotNull(statusBar.getItemTextById(8));
writer.focus(); // verify the setting value of spacing to content for
// tabel
app.dispatch(".uno:TableDialog");
- SWTableBorder.select();
- assertEquals("0.50\"", SWTableSTCLeft.getText());
- assertEquals("0.80\"", SWTableSTCRight.getText());
- assertEquals("1.00\"", SWTableSTCTop.getText());
- assertEquals("1.97\"", SWTableSTCBottom.getText());
- assertFalse("SWTableSTC_SYNC", SWTableSTC_SYNC.isChecked());
- SWTableBorder.close();
+ swTableBorder.select();
+ assertEquals("0.50\"", swTableSTCLeft.getText());
+ assertEquals("0.80\"", swTableSTCRight.getText());
+ assertEquals("1.00\"", swTableSTCTop.getText());
+ assertEquals("1.97\"", swTableSTCBottom.getText());
+ assertFalse("SWTableSTC_SYNC", swTableSTCSYNC.isChecked());
+ swTableBorder.close();
}
// create table with auto format
@@ -196,15 +196,15 @@ public class TableGeneral {
public void testTableAutoFormat() throws Exception {
// create table with auto format
button("sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT").click();
- assertTrue("Table auto format dialog pop up", SWTableAutoFMT.exists());
- SWTableAutoFormat_Listbox.select(3);
- SWTableAutoFMT.ok();
+ assertTrue("Table auto format dialog pop up", swTableAutoFMT.exists());
+ swTableAutoFormatListbox.select(3);
+ swTableAutoFMT.ok();
// verify the auto format is that just selected
button("sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT").click();
- assertEquals("Blue", SWTableAutoFormat_Listbox.getSelText());
- SWTableAutoFMT.close();
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ assertEquals("Blue", swTableAutoFormatListbox.getSelText());
+ swTableAutoFMT.close();
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
}
@@ -212,38 +212,38 @@ public class TableGeneral {
@Test
public void testTableRowHeight() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// set row height
writer.focus();
writer.openContextMenu();
- SWTable_RowHeightMenu.select();
- assertTrue(SWTable_SetRowHeight_Dialog.exists());
- SWTable_SetRowHeight.focus();
+ swTableRowHeightMenu.select();
+ assertTrue(swTableSetRowHeightDialog.exists());
+ swTableSetRowHeight.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("0.5");
- SWTable_SetRowHeight_Dialog.ok();
+ swTableSetRowHeightDialog.ok();
// verify row height
writer.focus();
writer.openContextMenu();
- SWTable_RowHeightMenu.select();
- assertTrue(SWTable_SetRowHeight_Dialog.exists());
- assertEquals("0.50\"", SWTable_SetRowHeight.getText());
- SWTable_SetRowHeight_Dialog.close();
+ swTableRowHeightMenu.select();
+ assertTrue(swTableSetRowHeightDialog.exists());
+ assertEquals("0.50\"", swTableSetRowHeight.getText());
+ swTableSetRowHeightDialog.close();
}
// select row
@Test
public void testTableSelectRow() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// select row
writer.focus();
writer.openContextMenu();
- SWTable_SelectRowMenu.select();
+ swTableSelectRowMenu.select();
// verify select one row successfully
typeKeys("<ctrl c>");
@@ -252,85 +252,85 @@ public class TableGeneral {
typeKeys("<enter>");
typeKeys("<ctrl v>");
typeKeys("<up>");
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
}
// insert row and verify how many row inserted
@Test
public void testTableInsertRow() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
writer.focus();
writer.openContextMenu();
- SWTable_InsertRowMenu.select();
+ swTableInsertRowMenu.select();
assertTrue("SWTable_InsertRow Dialog pop up",
- SWTable_InsertRow.exists());
- SWTable_InsertRow_Column_SetNumber.focus();
+ swTableInsertRow.exists());
+ swTableInsertRowColumnSetNumber.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("3");
- SWTable_InsertRow.ok();
+ swTableInsertRow.ok();
writer.focus(); // verify how many rows in the table
- assertNotNull(StatusBar.getItemTextById(8));
+ assertNotNull(statusBar.getItemTextById(8));
for (int i = 0; i < 4; i++) {
typeKeys("<down>");
- assertNotNull(StatusBar.getItemTextById(8));
+ assertNotNull(statusBar.getItemTextById(8));
}
typeKeys("<down>");
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
// delete row and verify row
@Test
public void testTableRowDelete() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// delete row
writer.focus();
writer.openContextMenu();
- SWTable_RowDleteMenu.select();
+ swTableRowDleteMenu.select();
// verify whether delete row
writer.focus();
- assertNotNull(StatusBar.getItemTextById(8));
+ assertNotNull(statusBar.getItemTextById(8));
typeKeys("<down>");
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
// set column width and verify
@Test
public void testTableColumnWidth() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// set column width
writer.focus();
writer.openContextMenu();
- SWTable_ColumnWidthMenu.select();
- SWTable_SetColumnWidth.focus();
+ swTableColumnWidthMenu.select();
+ swTableSetColumnWidth.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("2");
- SWTable_SetColumnDialog.ok();
+ swTableSetColumnDialog.ok();
// verify column width
writer.focus();
writer.openContextMenu();
- SWTable_ColumnWidthMenu.select();
- assertEquals("2.00\"", SWTable_SetColumnWidth.getText());
+ swTableColumnWidthMenu.select();
+ assertEquals("2.00\"", swTableSetColumnWidth.getText());
}
// select column and verify
@Test
public void testTableColumnSelect() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
writer.focus();
writer.openContextMenu();
- SWTable_ColumnSelectMenu.select();
+ swTableColumnSelectMenu.select();
// verify select one column
typeKeys("<ctrl c>");
@@ -339,86 +339,86 @@ public class TableGeneral {
typeKeys("<enter>");
typeKeys("<ctrl v>");
typeKeys("<up>");
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
}
// insert column and verify
@Test
public void testTableColumnInsert() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// insert column
writer.focus();
writer.openContextMenu();
- SWTable_ColumnInsertMenu.select();
- SWTable_InsertRow_Column_SetNumber.focus();
+ swTableColumnInsertMenu.select();
+ swTableInsertRowColumnSetNumber.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("3");
- SWTable_InsertColumn.ok();
+ swTableInsertColumn.ok();
// verify insert column successfully
writer.focus();
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
for (int i = 0; i < 9; i++) {
typeKeys("<right>");
sleep(1);
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
}
typeKeys("<right>");
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
// delete column and verify whether delete or not
public void testTableColumnDelete() throws Exception {
- writer_InsertTable.ok();
- assertNotNull(StatusBar.getItemTextById(8));
+ writerInsertTable.ok();
+ assertNotNull(statusBar.getItemTextById(8));
// delete column
writer.focus();
writer.openContextMenu();
- SWTable_ColumnDeleteMenu.select();
+ swTableColumnDeleteMenu.select();
// verify delete column
writer.focus();
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
for (int i = 0; i < 7; i++) {
typeKeys("<right>");
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
}
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
// split cell
@Test
public void testTableCellSplit() throws Exception {
- writer_InsertTable.ok();
- assertTrue(Table_Toolbar.exists());
+ writerInsertTable.ok();
+ assertTrue(tableToolbar.exists());
for (int k = 0; k < 2; k++) {
writer.focus();
writer.openContextMenu();
- SWTable_CellSplitMenu.select();
- SWTable_CellSplitNumber.focus();
+ swTableCellSplitMenu.select();
+ swTableCellSplitNumber.focus();
typeKeys("<ctrl a>");
typeKeys("<delete>");
typeKeys("2");
if (k == 0) {
- SWTable_CellSplitDialog.ok(); // split table cell horizontally
+ swTableCellSplitDialog.ok(); // split table cell horizontally
} else {
- SWTable_CellSplitVERT_Button.check(); // split table cell
+ swTableCellSplitVERTButton.check(); // split table cell
// vertically
- SWTable_CellSplitDialog.ok();
+ swTableCellSplitDialog.ok();
}
}
// verify cell split successfully
writer.focus();
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
for (int i = 0; i < 7; i++) {
typeKeys("<right>");
- assertTrue(Table_Toolbar.exists());
+ assertTrue(tableToolbar.exists());
}
sleep(1);
- assertFalse(Table_Toolbar.exists());
+ assertFalse(tableToolbar.exists());
}
/**
@@ -428,16 +428,16 @@ public class TableGeneral {
*/
@Test
public void testConvertTableToText() throws Exception {
- writer_InsertTable.ok();
+ writerInsertTable.ok();
writer.focus();
typeKeys("1<right>2<right>3<right>4");
sleep(1);
// Convert table to text
app.dispatch(".uno:ConvertTableToText");
- assertTrue("Convert Table to Text dialog pop up", writer_ConvertTableToTextDlg.exists());
+ assertTrue("Convert Table to Text dialog pop up", writerConvertTableToTextDlg.exists());
// typeKeys("<enter>");
- writer_ConvertTableToTextDlg.ok(); // "Enter" does not work on linux
+ writerConvertTableToTextDlg.ok(); // "Enter" does not work on linux
// Verify if text is converted successfully
app.dispatch(".uno:SelectAll");
Copied: incubator/ooo/trunk/test/testgui/source/testlib/gui/AppTool.java (from r1380113, incubator/ooo/trunk/test/testgui/source/testlib/gui/AppUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testlib/gui/AppTool.java?p2=incubator/ooo/trunk/test/testgui/source/testlib/gui/AppTool.java&p1=incubator/ooo/trunk/test/testgui/source/testlib/gui/AppUtil.java&r1=1380113&r2=1381843&rev=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testlib/gui/AppUtil.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testlib/gui/AppTool.java Fri Sep 7 02:29:53 2012
@@ -21,6 +21,9 @@
package testlib.gui;
+import static org.openoffice.test.common.Testspace.*;
+import static org.openoffice.test.vcl.Tester.*;
+import static testlib.gui.AppTool.*;
import static testlib.gui.UIMap.*;
import org.openoffice.test.common.Condition;
@@ -30,7 +33,7 @@ import org.openoffice.test.common.Testsp
import org.openoffice.test.vcl.Tester;
import org.openoffice.test.vcl.widgets.VclWindow;
-public class AppUtil extends Tester {
+public class AppTool extends Tester {
static {
Testspace.getFile("temp").mkdirs();
// TODO move these shortcut into a file
@@ -56,6 +59,59 @@ public class AppUtil extends Tester {
}
}
+ public static void newTextDocument() {
+ app.dispatch("private:factory/swriter");
+ writer.waitForExistence(10, 2);
+ sleep(1);
+ }
+
+ public static void newSpreadsheet() {
+ app.dispatch("private:factory/scalc");
+ calc.waitForExistence(10, 2);
+ sleep(1);
+ }
+
+ public static void newPresentation() {
+ app.dispatch("private:factory/simpress");
+ impress.waitForExistence(10, 2);
+ sleep(1);
+ }
+
+ public static void newDrawing() {
+ app.dispatch("private:factory/sdraw");
+ draw.waitForExistence(10, 2);
+ sleep(1);
+ }
+
+ public static void newFormula() {
+ app.dispatch("private:factory/smath");
+ mathEditWindow.waitForExistence(10, 2);
+ sleep(1);
+ }
+
+ public static void open(String path) {
+ app.dispatch(".uno:Open");
+ submitOpenDlg(getPath(path));
+ }
+
+ public static void saveAs(String path) {
+ app.dispatch(".uno:SaveAs");
+ submitSaveDlg(getPath(path));
+ if (alienFormatDlg.exists(3))
+ alienFormatDlg.ok();
+ app.waitSlot(5 * 60); // 10 minutes
+ }
+
+ public static void close() {
+ app.dispatch(".uno:CloseDoc");
+ }
+
+ public static void discard() {
+ app.dispatch(".uno:CloseDoc");
+ if (activeMsgBox.exists(2))
+ activeMsgBox.no();
+ }
+
public static void typeKeys(String keys) {
Tester.typeKeys(keys);
}
@@ -71,18 +127,29 @@ public class AppUtil extends Tester {
}
+ public static String copyAll() {
+ app.setClipboard(".d.i.r.t.y.");
+ try {
+ app.dispatch(".uno:SelectAll");
+ } catch (Exception e) {
+ app.dispatch(".uno:Select");
+ }
+ app.dispatch(".uno:Copy");
+ return app.getClipboard();
+ }
+
public static void submitOpenDlg(String path) {
- FilePicker_Path.setText(path);
- FilePicker_Open.click();
+ filePickerPath.setText(path);
+ filePickerOpen.click();
sleep(1);
}
public static void submitSaveDlg(String path) {
- FileSave_Path.setText(path);
+ fileSavePath.setText(path);
String extName = FileUtil.getFileExtName(path).toLowerCase();
- String[] filters = FileSave_FileType.getItemsText();
+ String[] filters = fileSaveFileType.getItemsText();
int i = 0;
for (; i < filters.length; i++) {
String f = filters[i];
@@ -95,16 +162,16 @@ public class AppUtil extends Tester {
if (i == filters.length)
throw new RuntimeException("Can't find the supported doc format!");
- FileSave_FileType.select(i);
- FileSave_Save.click();
+ fileSaveFileType.select(i);
+ fileSaveSave.click();
sleep(1);
}
public static void submitSaveDlg(String path, String ext) {
- FileSave_Path.setText(path);
+ fileSavePath.setText(path);
if (ext != null) {
// change filter
- String[] filters = FileSave_FileType.getItemsText();
+ String[] filters = fileSaveFileType.getItemsText();
int i = 0;
for (; i < filters.length; i++) {
String f = filters[i];
@@ -117,7 +184,7 @@ public class AppUtil extends Tester {
if (i == filters.length)
throw new RuntimeException("Can't find the supported doc format!");
}
- FileSave_FileType.click();
+ fileSaveFileType.click();
sleep(1);
}
@@ -125,12 +192,12 @@ public class AppUtil extends Tester {
new Condition() {
@Override
public boolean value() {
- if (ActiveMsgBox.exists()) {
+ if (activeMsgBox.exists()) {
try {
- ActiveMsgBox.ok();
+ activeMsgBox.ok();
} catch (Exception e) {
try {
- ActiveMsgBox.yes();
+ activeMsgBox.yes();
} catch (Exception e1) {
}
}
@@ -148,12 +215,12 @@ public class AppUtil extends Tester {
if (!shown)
return false;
- if (ActiveMsgBox.exists(2)) {
+ if (activeMsgBox.exists(2)) {
try {
- ActiveMsgBox.ok();
+ activeMsgBox.ok();
} catch (Exception e) {
try {
- ActiveMsgBox.yes();
+ activeMsgBox.yes();
} catch (Exception e1) {
}
}
Copied: incubator/ooo/trunk/test/testgui/source/testlib/gui/SCTool.java (from r1380113, incubator/ooo/trunk/test/testgui/source/testlib/gui/CalcUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testlib/gui/SCTool.java?p2=incubator/ooo/trunk/test/testgui/source/testlib/gui/SCTool.java&p1=incubator/ooo/trunk/test/testgui/source/testlib/gui/CalcUtil.java&r1=1380113&r2=1381843&rev=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testlib/gui/CalcUtil.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testlib/gui/SCTool.java Fri Sep 7 02:29:53 2012
@@ -28,9 +28,9 @@ import java.lang.reflect.Array;
import java.util.StringTokenizer;
import java.util.logging.Logger;
-public class CalcUtil {
+public class SCTool {
- private static Logger LOG = Logger.getLogger(CalcUtil.class.getName());
+ private static Logger LOG = Logger.getLogger(SCTool.class.getName());
/**
* Select a range.
@@ -39,8 +39,8 @@ public class CalcUtil {
* e.g. Sheet1.A10, Sheet1.A11:B30, A11, A30:B45
*/
public static void selectRange(String range) {
- SC_InputBar_Position.click(0.5, 0.5);
- SC_InputBar_Position.setText(range);
+ scInputBarPosition.click(0.5, 0.5);
+ scInputBarPosition.setText(range);
typeKeys("<enter>");
sleep(1);
}
@@ -55,7 +55,7 @@ public class CalcUtil {
public static String getCellInput(String cell) {
if (cell != null)
selectRange(cell);
- String caption = SC_InputBar_Input.getCaption();
+ String caption = scInputBarInput.getCaption();
// Fix: When formulaEdit's caption is blank, the hook will return the
// document window's caption
// So if it's document window caption, return ""
Copied: incubator/ooo/trunk/test/testgui/source/testlib/gui/SDTool.java (from r1380113, incubator/ooo/trunk/test/testgui/source/testlib/gui/ImpressUtil.java)
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testlib/gui/SDTool.java?p2=incubator/ooo/trunk/test/testgui/source/testlib/gui/SDTool.java&p1=incubator/ooo/trunk/test/testgui/source/testlib/gui/ImpressUtil.java&r1=1380113&r2=1381843&rev=1381843&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testlib/gui/ImpressUtil.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testlib/gui/SDTool.java Fri Sep 7 02:29:53 2012
@@ -25,10 +25,10 @@ import static testlib.gui.UIMap.*;
import org.openoffice.test.vcl.widgets.VclWindow;
-public class ImpressUtil {
+public class SDTool {
- public static VclWindow getCurView() {
- VclWindow[] views = new VclWindow[] { impress, ImpressOutline, ImpressSlideSorter, ImpressHandout };
+ public static VclWindow getActiveView() {
+ VclWindow[] views = new VclWindow[] { impress, impressOutline, impressSlideSorter, impressHandout };
for (VclWindow w : views) {
if (w.exists()) {
return w;