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/08/28 08:08:21 UTC
svn commit: r1377981 - in /incubator/ooo/trunk/main/test:
testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
testgui/source/testcase/gui/BVTFileType.java
testgui/source/testcase/gui/BVTFunction.java
testgui/source/testcase/gui/SmokeTest.java
Author: liuzhe
Date: Tue Aug 28 06:08:20 2012
New Revision: 1377981
URL: http://svn.apache.org/viewvc?rev=1377981&view=rev
Log:
#120732 - [VCLAuto patch] Fixed problems: Screenshot is not valid. Some scripts are not stable. Add load/new documents interface.
Patch by: Li Lin Yi <li...@gmail.com>
Review by: Liu Zhe <al...@gmail.com>
Modified:
incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFileType.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFunction.java
incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
Modified: incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java?rev=1377981&r1=1377980&r2=1377981&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java (original)
+++ incubator/ooo/trunk/main/test/testcommon/source/org/openoffice/test/vcl/widgets/VclApp.java Tue Aug 28 06:08:20 2012
@@ -85,7 +85,7 @@ public class VclApp {
public void start(boolean isCleanUserInstallation) { // Default to clean user installation
if (openOffice != null) {
if (isCleanUserInstallation) {
- openOffice.kill();
+ OpenOffice.killAll();
openOffice.cleanUserInstallation();
openOffice.start();
SystemUtil.sleep(10);
Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFileType.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFileType.java?rev=1377981&r1=1377980&r2=1377981&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFileType.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFileType.java Tue Aug 28 06:08:20 2012
@@ -24,15 +24,32 @@
*/
package testcase.gui;
-import static org.openoffice.test.common.Testspace.*;
-import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.*;
-import static testlib.gui.AppUtil.*;
-import static testlib.gui.UIMap.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.openoffice.test.common.Testspace.getPath;
+import static org.openoffice.test.common.Testspace.prepareData;
+import static org.openoffice.test.vcl.Tester.sleep;
+import static org.openoffice.test.vcl.Tester.typeText;
+import static testlib.gui.AppUtil.openStartcenter;
+import static testlib.gui.AppUtil.submitOpenDlg;
+import static testlib.gui.AppUtil.submitSaveDlg;
+import static testlib.gui.AppUtil.typeKeys;
+import static testlib.gui.UIMap.AlienFormatDlg;
+import static testlib.gui.UIMap.EffectsPage;
+import static testlib.gui.UIMap.EffectsPage_Color;
+import static testlib.gui.UIMap.PresentationWizard;
+import static testlib.gui.UIMap.app;
+import static testlib.gui.UIMap.calc;
+import static testlib.gui.UIMap.draw;
+import static testlib.gui.UIMap.impress;
+import static testlib.gui.UIMap.math_EditWindow;
+import static testlib.gui.UIMap.math_ElementsWindow;
+import static testlib.gui.UIMap.writer;
import java.awt.Rectangle;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Rule;
@@ -56,9 +73,9 @@ public class BVTFileType {
app.start(true);
}
- @After
- public void tearDown() throws Exception {
-
+ @AfterClass
+ public void afterClass() throws Exception {
+ app.close();
}
/**
Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFunction.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFunction.java?rev=1377981&r1=1377980&r2=1377981&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFunction.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/BVTFunction.java Tue Aug 28 06:08:20 2012
@@ -24,16 +24,73 @@
*/
package testcase.gui;
-import static org.openoffice.test.common.Testspace.*;
-import static org.junit.Assert.*;
-import static org.openoffice.test.vcl.Tester.*;
-import static testlib.gui.AppUtil.*;
-import static testlib.gui.UIMap.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.openoffice.test.common.Testspace.getPath;
+import static org.openoffice.test.common.Testspace.prepareData;
+import static org.openoffice.test.vcl.Tester.sleep;
+import static testlib.gui.AppUtil.submitOpenDlg;
+import static testlib.gui.AppUtil.submitSaveDlg;
+import static testlib.gui.AppUtil.typeKeys;
+import static testlib.gui.UIMap.AboutDialog;
+import static testlib.gui.UIMap.Chart_Wizard;
+import static testlib.gui.UIMap.FileSave;
+import static testlib.gui.UIMap.FileSave_FileType;
+import static testlib.gui.UIMap.File_PrintDlg;
+import static testlib.gui.UIMap.FillSeriesDlg;
+import static testlib.gui.UIMap.FindDlg;
+import static testlib.gui.UIMap.FindDlg_Find;
+import static testlib.gui.UIMap.FindDlg_FindAll;
+import static testlib.gui.UIMap.FindDlg_For;
+import static testlib.gui.UIMap.FindDlg_ReplaceAll;
+import static testlib.gui.UIMap.FindDlg_ReplaceWith;
+import static testlib.gui.UIMap.InsertTable;
+import static testlib.gui.UIMap.MacroDialogsPage;
+import static testlib.gui.UIMap.PDFGeneralPage;
+import static testlib.gui.UIMap.PresentationWizard;
+import static testlib.gui.UIMap.SC_FunctionWizardDlg;
+import static testlib.gui.UIMap.SC_FunctionWizardDlg_Edit1;
+import static testlib.gui.UIMap.SC_FunctionWizardDlg_FunctionList;
+import static testlib.gui.UIMap.SC_FunctionWizardDlg_Next;
+import static testlib.gui.UIMap.SC_InputBar_Input;
+import static testlib.gui.UIMap.SC_InputBar_Sum;
+import static testlib.gui.UIMap.SlideShow;
+import static testlib.gui.UIMap.SortOptionsPage;
+import static testlib.gui.UIMap.SortOptionsPage_CustomSortOrder;
+import static testlib.gui.UIMap.SortOptionsPage_CustomSortOrderList;
+import static testlib.gui.UIMap.SortOptionsPage_RangeContainsColumnLabels;
+import static testlib.gui.UIMap.SortPage;
+import static testlib.gui.UIMap.SortPage_Ascending3;
+import static testlib.gui.UIMap.SortPage_By1;
+import static testlib.gui.UIMap.SortPage_By2;
+import static testlib.gui.UIMap.SortPage_By3;
+import static testlib.gui.UIMap.SortPage_Descending1;
+import static testlib.gui.UIMap.SortPage_Descending2;
+import static testlib.gui.UIMap.SortPage_Descending3;
+import static testlib.gui.UIMap.SortWarningDlg_Current;
+import static testlib.gui.UIMap.Table_Toolbar;
+import static testlib.gui.UIMap.Wizards_AgendaDialog;
+import static testlib.gui.UIMap.Wizards_AgendaDialog_FinishButton;
+import static testlib.gui.UIMap.app;
+import static testlib.gui.UIMap.button;
+import static testlib.gui.UIMap.calc;
+import static testlib.gui.UIMap.chart;
+import static testlib.gui.UIMap.draw;
+import static testlib.gui.UIMap.impress;
+import static testlib.gui.UIMap.msgbox;
+import static testlib.gui.UIMap.oo;
+import static testlib.gui.UIMap.toolbox;
+import static testlib.gui.UIMap.writer;
+import static testlib.gui.UIMap.writer_InsertTable;
import java.awt.Rectangle;
import java.io.File;
-import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -56,9 +113,9 @@ public class BVTFunction {
app.start(true);
}
- @After
- public void tearDown() throws Exception {
-
+ @AfterClass
+ public void afterClass() throws Exception {
+ app.close();
}
@Test
Modified: incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java?rev=1377981&r1=1377980&r2=1377981&view=diff
==============================================================================
--- incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java (original)
+++ incubator/ooo/trunk/main/test/testgui/source/testcase/gui/SmokeTest.java Tue Aug 28 06:08:20 2012
@@ -32,6 +32,7 @@ import static testlib.gui.UIMap.*;
import java.io.File;
import org.junit.After;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -53,9 +54,9 @@ public class SmokeTest {
smoketestOutput = new File(oo.getUserInstallation(), "user/temp");
}
- @After
- public void tearDown() throws Exception {
-
+ @AfterClass
+ public void afterClass() throws Exception {
+ app.close();
}
@Test