Author: wanglf
Date: Thu Oct 25 06:39:11 2012
New Revision: 1401985
URL: http://svn.apache.org/viewvc?rev=1401985&view=rev
Log:
fix problems in test scripts
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/formula/importexport/CreateFormulaInDifferentWays.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/filter/Fitler.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/HeaderAndFooterSetting.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/formula/importexport/CreateFormulaInDifferentWays.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/formula/importexport/CreateFormulaInDifferentWays.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testgui/source/fvt/gui/formula/importexport/CreateFormulaInDifferentWays.java
(original)
+++
incubator/ooo/trunk/test/testgui/source/fvt/gui/formula/importexport/CreateFormulaInDifferentWays.java
Thu Oct 25 06:39:11 2012
@@ -56,7 +56,7 @@ public class CreateFormulaInDifferentWay
@After
public void tearDown() throws Exception {
-
+ app.stop();
}
/**
@@ -111,6 +111,11 @@ public class CreateFormulaInDifferentWay
submitSaveDlg(saveTo);
// Close and reopen it
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
app.dispatch(".uno:Open");
@@ -164,6 +169,11 @@ public class CreateFormulaInDifferentWay
submitSaveDlg(saveTo);
// Close and reopen it
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
app.dispatch(".uno:Open");
Modified: incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/filter/Fitler.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/filter/Fitler.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/filter/Fitler.java
(original)
+++ incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/filter/Fitler.java Thu
Oct 25 06:39:11 2012
@@ -63,6 +63,7 @@ public class Fitler {
* Verify 2+ won't be treated as 2
*/
@Ignore("Bug #120076")
+ @Test
public void testAutoFilterWithPlusSign() {
String expect = "2+";
SCTool.selectRange("A1");
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java
(original)
+++
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/sort/SortDialogSetting.java
Thu Oct 25 06:39:11 2012
@@ -59,7 +59,7 @@ public class SortDialogSetting {
@After
public void tearDown() throws Exception {
-
+ app.stop();
}
/**
@@ -99,6 +99,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -226,6 +231,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -280,6 +290,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -344,6 +359,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -387,6 +407,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -505,6 +530,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -623,6 +653,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -680,6 +715,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -765,6 +805,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -837,6 +882,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
@@ -928,6 +978,11 @@ public class SortDialogSetting {
app.dispatch(".uno:SaveAs");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
openStartcenter();
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
(original)
+++
incubator/ooo/trunk/test/testgui/source/fvt/gui/sc/validity/ValidityDialogSetting.java
Thu Oct 25 06:39:11 2012
@@ -52,7 +52,7 @@ public class ValidityDialogSetting {
@After
public void tearDown() throws Exception {
-
+ app.stop();
}
/**
@@ -238,7 +238,7 @@ public class ValidityDialogSetting {
@Test
public void testAllowLessThanTextLength() {
- app.dispatch(".uno:Validation");
+// app.dispatch(".uno:Validation");
scValidityCriteriaTabpage.select();
scValidityCriteriaAllowList.select(7); // "Text length"
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/HeaderAndFooterSetting.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/HeaderAndFooterSetting.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/HeaderAndFooterSetting.java
(original)
+++
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/HeaderAndFooterSetting.java
Thu Oct 25 06:39:11 2012
@@ -64,7 +64,7 @@ public class HeaderAndFooterSetting {
@After
public void tearDown() throws Exception {
-
+ app.stop();
}
/**
@@ -546,6 +546,11 @@ public class HeaderAndFooterSetting {
String saveTo = getPath("temp/" + "hello.odp");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
// Reopen this file
@@ -553,7 +558,7 @@ public class HeaderAndFooterSetting {
app.dispatch(".uno:Open");
String openFrom = getPath("temp/" + "hello.odp");
submitOpenDlg(openFrom);
-
+ sleep(5);
// check after reopen
app.dispatch(".uno:HeaderAndFooter");
sdHeaderAndFooterOnNotesTabPage.select();
@@ -599,6 +604,11 @@ public class HeaderAndFooterSetting {
String saveTo = getPath("temp/" + "hello.odp");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ sleep(5);
app.dispatch(".uno:CloseDoc");
// Reopen this file
@@ -606,7 +616,7 @@ public class HeaderAndFooterSetting {
app.dispatch(".uno:Open");
String openFrom = getPath("temp/" + "hello.odp");
submitOpenDlg(openFrom);
-
+ sleep(5);
// check after reopen
app.dispatch(".uno:HeaderAndFooter");
assertEquals("Fix Date: 20120329",
sdFixedDateAndTimeOnSlideInput.getText());
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
---
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
(original)
+++
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/headerandfooter/OpenDocumentWithHeaderFooter.java
Thu Oct 25 06:39:11 2012
@@ -26,6 +26,7 @@ package fvt.gui.sd.headerandfooter;
import static org.junit.Assert.*;
import static org.openoffice.test.common.Testspace.*;
+import static org.openoffice.test.vcl.Tester.sleep;
import static testlib.gui.AppTool.*;
import static testlib.gui.UIMap.*;
@@ -48,6 +49,7 @@ public class OpenDocumentWithHeaderFoote
@After
public void tearDown() throws Exception {
+ app.stop();
}
@@ -81,13 +83,17 @@ public class OpenDocumentWithHeaderFoote
String saveTo2 = getPath("temp/" + "AOO3.4HeaderFooter.odp");
FileUtil.deleteFile(saveTo2);
submitSaveDlg(saveTo2);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
app.dispatch(".uno:CloseDoc");
openStartcenter();
app.dispatch(".uno:Open");
String openFrom2 = getPath("temp/" + "AOO3.4HeaderFooter.odp");
submitOpenDlg(openFrom2);
-
+ sleep(3);
app.dispatch(".uno:HeaderAndFooter");
assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
// end-save to odp and reopen
@@ -122,7 +128,12 @@ public class OpenDocumentWithHeaderFoote
String saveTo = getPath("temp/" + "gfdd.ppt");
FileUtil.deleteFile(saveTo);
submitSaveDlg(saveTo);
- if (alienFormatDlg.exists(3))
+ sleep(5);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
+ if (alienFormatDlg.exists())
alienFormatDlg.ok();
app.dispatch(".uno:CloseDoc");
@@ -130,7 +141,7 @@ public class OpenDocumentWithHeaderFoote
app.dispatch(".uno:Open");
String openFrom = getPath("temp/" + "gfdd.ppt");
submitOpenDlg(openFrom);
-
+ sleep(5);
app.dispatch(".uno:HeaderAndFooter");
assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
// end-save to ppt and reopen
@@ -146,13 +157,17 @@ public class OpenDocumentWithHeaderFoote
String saveTo2 = getPath("temp/" + "gfdd.odp");
FileUtil.deleteFile(saveTo2);
submitSaveDlg(saveTo2);
+ if (activeMsgBox.exists()) {
+ activeMsgBox.yes();
+ sleep(2);
+ }
app.dispatch(".uno:CloseDoc");
openStartcenter();
app.dispatch(".uno:Open");
String openFrom2 = getPath("temp/" + "gfdd.odp");
submitOpenDlg(openFrom2);
-
+ sleep(3);
app.dispatch(".uno:HeaderAndFooter");
assertEquals(false, sdSlideNumAsFooterOnSlide.isChecked());
// end-save to odp and reopen
Modified:
incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java?rev=1401985&r1=1401984&r2=1401985&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
(original)
+++ incubator/ooo/trunk/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
Thu Oct 25 06:39:11 2012
@@ -58,7 +58,7 @@ public class ShapeTypes {
@After
public void tearDown() throws Exception {
- app.close();
+ app.stop();
}
/**
