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/10 16:41:39 UTC
svn commit: r1382892 - in /incubator/ooo/trunk/test: build.xml
testgui/source/testcase/gui/svt/TestSample.java
Author: liuzhe
Date: Mon Sep 10 14:41:39 2012
New Revision: 1382892
URL: http://svn.apache.org/viewvc?rev=1382892&view=rev
Log:
Fix BVT break on Mac: Sometimes build.xml can remove the installed build.
Modified:
incubator/ooo/trunk/test/build.xml
incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java
Modified: incubator/ooo/trunk/test/build.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/build.xml?rev=1382892&r1=1382891&r2=1382892&view=diff
==============================================================================
--- incubator/ooo/trunk/test/build.xml (original)
+++ incubator/ooo/trunk/test/build.xml Mon Sep 10 14:41:39 2012
@@ -232,8 +232,8 @@
<target name="install.build" unless="install.build.skip" description="Install the build to the local">
<property name="openoffice.install.dir" value="${testspace}/install/aoo" />
- <property name="openoffice.install.temp" value="${testspace}/install/temp" />
- <delete dir="${openoffice.install.temp}"/>
+ <property name="openoffice.install.temp" value="${testspace}/install/temp" />
+ <delete dir="${openoffice.install.temp}" failonerror="false"/>
<mkdir dir="${openoffice.install.temp}" />
<unzip dest="${openoffice.install.temp}">
<fileset dir="${openoffice.pack.dir}">
@@ -248,16 +248,16 @@
<exec dir="${openoffice.install.temp}" executable="tar" failifexecutionfails="false">
<arg line="-zxpf ${gz.files}" />
</exec>
- <pathconvert property="openoffice.root.dir" pathsep=" " setonempty="false">
+ <pathconvert property="openoffice.root.dir" pathsep=" " setonempty="false">
<path>
<dirset dir="${openoffice.install.temp}">
<include name="*"/>
</dirset>
</path>
</pathconvert>
- <delete dir="${openoffice.install.dir}"/>
- <move file="${openoffice.root.dir}" tofile="${openoffice.install.dir}"/>
- <delete dir="${openoffice.install.temp}"/>
+ <delete dir="${openoffice.install.dir}" failonerror="false"/>
+ <move file="${openoffice.root.dir}" tofile="${openoffice.install.dir}" failonerror="false"/>
+ <delete dir="${openoffice.install.temp}" failonerror="false"/>
<pathconvert property="openoffice.bin" pathsep=" " setonempty="false">
<path>
<fileset dir="${openoffice.install.dir}" includes="**/*/soffice.bin" followsymlinks="false" />
Modified: incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java?rev=1382892&r1=1382891&r2=1382892&view=diff
==============================================================================
--- incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java (original)
+++ incubator/ooo/trunk/test/testgui/source/testcase/gui/svt/TestSample.java Mon Sep 10 14:41:39 2012
@@ -182,33 +182,26 @@ public class TestSample {
}
public void testWriter() {
- startcenter.menuItem("File->Open...").select();
- submitOpenDlg(file.getAbsolutePath());
+ open(file.getAbsolutePath());
handleBlocker(writer);
sleep(10);
// Assert.assertTrue("File Passed:" + file,
// writer.getCaption().contains(file.getName()));
-
- writer.menuItem("File->Save As...").select();
- submitSaveDlg(saveTo);
+ saveAs(saveTo);
if (alienFormatDlg.exists(3))
alienFormatDlg.ok();
sleep(2);
writer.waitForEnabled(120, 2);
-
- writer.menuItem("File->Close").select();
-
- openStartcenter();
- // Reopen the saved file
- startcenter.menuItem("File->Open...").select();
- submitOpenDlg(saveTo);
+ close();
+
+ open(saveTo);
handleBlocker(writer);
sleep(10);
// Assert.assertTrue("File Passed:" + file,
// writer.getCaption().contains(file.getName()));
- writer.menuItem("File->Close").select();
+ close();
passed = true;
}