You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2021/10/27 17:06:28 UTC
[openoffice] branch AOO42X updated: Fixed operation system ->
operating system
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new a3a3602 Fixed operation system -> operating system
a3a3602 is described below
commit a3a360289200107b11a7727eac89aa0d051dbd52
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Oct 27 19:03:38 2021 +0200
Fixed operation system -> operating system
(cherry picked from commit 2c9c3879af5ada9e92ad992096cfc0c875dbfded)
---
.../helpcontent2/source/text/scalc/01/04060104.xhp | 17 ++-
.../source/text/shared/01/online_update_dialog.xhp | 15 +--
.../jreproperties/src/main/java/JREProperties.java | 144 ++++++++++-----------
.../offapi/com/sun/star/ucb/XSimpleFileAccess3.idl | 10 +-
main/qadevOOo/runner/helper/OSHelper.java | 112 ++++++++--------
test/testgui/source/bvt/gui/BasicFunctionTest.java | 126 +++++++++---------
6 files changed, 211 insertions(+), 213 deletions(-)
diff --git a/main/helpcontent2/source/text/scalc/01/04060104.xhp b/main/helpcontent2/source/text/scalc/01/04060104.xhp
index 7423f24..1b8850e 100644
--- a/main/helpcontent2/source/text/scalc/01/04060104.xhp
+++ b/main/helpcontent2/source/text/scalc/01/04060104.xhp
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<helpdocument version="1.0">
-
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -10,21 +10,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
-
+
<meta>
<topic id="textscalc0104060104xml" indexer="include">
<title id="tit" xml-lang="en-US">Information Functions</title>
@@ -37,7 +36,7 @@
<bookmark_value>functions; information functions</bookmark_value>
</bookmark>
<paragraph role="heading" id="hd_id3147247" xml-lang="en-US" level="1" l10n="U" oldref="1">Information Functions</paragraph>
-<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="informationtext">This category contains the <emph>Information</emph> functions.
+<paragraph role="paragraph" id="par_id3147499" xml-lang="en-US" l10n="CHG" oldref="2"><variable id="informationtext">This category contains the <emph>Information</emph> functions.
</variable></paragraph>
<section id="howtoget">
<embed href="text/scalc/00/00000404.xhp#eikain"/>
@@ -256,7 +255,7 @@
<paragraph role="paragraph" id="par_id3994567" xml-lang="en-US" l10n="NEW">
<item type="input">=INFO("release")</item> returns the product release number of the %PRODUCTNAME in use.<comment>Do not translate "release"</comment></paragraph>
<paragraph role="paragraph" id="par_id2873622" xml-lang="en-US" l10n="NEW">
-<item type="input">=INFO(D5)</item> with cell <item type="literal">D5</item> containing a text string <item type="literal">system</item> returns the operation system type.<comment>Do not translate the hlp_literal system</comment></paragraph>
+<item type="input">=INFO(D5)</item> with cell <item type="literal">D5</item> containing a text string <item type="literal">system</item> returns the operating system type.<comment>Do not translate the hlp_literal system</comment></paragraph>
</section>
<section id="current">
<bookmark xml-lang="en-US" branch="index" id="bm_id3155625"><bookmark_value>CURRENT function</bookmark_value>
diff --git a/main/helpcontent2/source/text/shared/01/online_update_dialog.xhp b/main/helpcontent2/source/text/shared/01/online_update_dialog.xhp
index d2763d3..4f7a17c 100644
--- a/main/helpcontent2/source/text/shared/01/online_update_dialog.xhp
+++ b/main/helpcontent2/source/text/shared/01/online_update_dialog.xhp
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -11,22 +9,21 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
- <helpdocument version="1.0">
+<helpdocument version="1.0">
<meta>
<topic id="textshared01online_update_dialogxml" indexer="include" status="PUBLISH">
<title id="tit" xml-lang="en-US">Check for Updates</title>
@@ -39,7 +36,7 @@
<paragraph role="paragraph" id="par_id4799340" xml-lang="en-US" l10n="NEW">Once the download starts, you see a progress bar and three buttons on the dialog. You can pause and resume the download by clicking the Pause and Resume buttons. Click Cancel to abort the download and delete the partly downloaded file.</paragraph>
<paragraph role="paragraph" id="par_id1502121" xml-lang="en-US" l10n="NEW">By default, downloads will be stored to your desktop. You can change the folder where the downloaded file will be stored in <switchinline select="sys"><caseinline select="MAC">%PRODUCTNAME - Preferences</caseinline><defaultinline>Tools - Options</defaultinline></switchinline> - %PRODUCTNAME - Online Update.</paragraph>
<paragraph role="paragraph" id="par_id8266853" xml-lang="en-US" l10n="NEW">After the download is complete, you can click Install to start the installation of the update. You see a confirmation dialog, where you can choose to close %PRODUCTNAME.</paragraph>
-<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operation systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
+<paragraph role="note" id="par_id2871181" xml-lang="en-US" l10n="NEW">Under some operating systems, it may be required to manually go to the download folder, unzip the download file, and start the setup script.</paragraph>
<paragraph role="paragraph" id="par_id2733542" xml-lang="en-US" l10n="NEW">After installation of the update you can delete the download file to save space.</paragraph><comment>Download</comment>
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2" id="bm_id2517777" localize="false"/>
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD" id="bm_id4208807" localize="false"/><paragraph role="paragraph" id="par_id4238715" xml-lang="en-US" l10n="NEW"><ahelp hid="." visibility="hidden">Downloads and saves the update files to the desktop or a folder of your choice. Select the folder in %PRODUCTNAME - Online Update in the Options dialog box.</ahelp></paragraph><comment>Install</comment>
diff --git a/main/jvmfwk/java/jreproperties/src/main/java/JREProperties.java b/main/jvmfwk/java/jreproperties/src/main/java/JREProperties.java
index 080dbac..289b299 100644
--- a/main/jvmfwk/java/jreproperties/src/main/java/JREProperties.java
+++ b/main/jvmfwk/java/jreproperties/src/main/java/JREProperties.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,100 +7,100 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
import java.util.*;
import java.awt.*;
/** This class prints out the system properties.
- We cannot print the strings directly because of encoding issues. Since
- about 1.3.1 one can start java with the option -Dfile.encoding=UTF-8, but
- unfortunately this works only with later update - versions (for example,
- 1.3.1_07). Therefore we use this scheme. The property string has this form:
- name=value
+ We cannot print the strings directly because of encoding issues. Since
+ about 1.3.1 one can start java with the option -Dfile.encoding=UTF-8, but
+ unfortunately this works only with later update - versions (for example,
+ 1.3.1_07). Therefore we use this scheme. The property string has this form:
+ name=value
- Every character is cast to an integer which value is printed, followed by a
- space. If all characters of the string are printed, then a new line is printed.
+ Every character is cast to an integer which value is printed, followed by a
+ space. If all characters of the string are printed, then a new line is printed.
*/
public class JREProperties
{
- static public void main(String[] args)
- {
- try
- {
- boolean bNoAccess = false;
- if(args.length > 0)
- {
- if (args[0].equals("noaccessibility"))
- bNoAccess = true;
- }
+ static public void main(String[] args)
+ {
+ try
+ {
+ boolean bNoAccess = false;
+ if(args.length > 0)
+ {
+ if (args[0].equals("noaccessibility"))
+ bNoAccess = true;
+ }
- //Find out on what operation system we are running. On Windows 98
- //we must not call getDefaultToolkit, because the office may freeze
- //#i44608.
- boolean bW98 = false;
- String os = System.getProperty("os.name");
-
- if (os != null)
- {
- os = os.trim();
- if (os.equalsIgnoreCase("Windows 98") ||
- os.indexOf("Windows 98") != -1)
- bW98 = true;
- }
+ //Find out on what operating system we are running. On Windows 98
+ //we must not call getDefaultToolkit, because the office may freeze
+ //#i44608.
+ boolean bW98 = false;
+ String os = System.getProperty("os.name");
- //We need to be able to switch this part off because
- //it causes an exception if the DISPLAY variable has
- //a false value. Setting the noaccessibility argument
- //can be done by providing a sunjavaplugin.ini with
- //the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY
- //set to "1"
- if (bNoAccess == false && ! bW98)
- {
- try{
- //This line is needed to get the accessibility properties
- Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
- }
- catch(Throwable e)
- {
- System.err.println(e);
- }
- }
+ if (os != null)
+ {
+ os = os.trim();
+ if (os.equalsIgnoreCase("Windows 98") ||
+ os.indexOf("Windows 98") != -1)
+ bW98 = true;
+ }
+ //We need to be able to switch this part off because
+ //it causes an exception if the DISPLAY variable has
+ //a false value. Setting the noaccessibility argument
+ //can be done by providing a sunjavaplugin.ini with
+ //the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY
+ //set to "1"
+ if (bNoAccess == false && ! bW98)
+ {
+ try{
+ //This line is needed to get the accessibility properties
+ Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
+ }
+ catch(Throwable e)
+ {
+ System.err.println(e);
+ }
+ }
- Properties p = System.getProperties();
- Enumeration e = p.propertyNames();
- for (; e.hasMoreElements() ;) {
- String sProp = (String) e.nextElement();
- String sCompleteProp = sProp + "=" + p.getProperty(sProp);
- char[] arChars = new char[sCompleteProp.length()];
- sCompleteProp.getChars(0, sCompleteProp.length(), arChars, 0);
- for (int c = 0; c < arChars.length; c++) {
- System.out.print(String.valueOf((int) arChars[c]));
- System.out.print(" ");
- }
- System.out.print("\n");
- }
- }
- catch(Exception e)
- {
- System.err.println(e);
- }
- System.exit(0);
- }
+ Properties p = System.getProperties();
+ Enumeration e = p.propertyNames();
+ for (; e.hasMoreElements() ;) {
+ String sProp = (String) e.nextElement();
+ String sCompleteProp = sProp + "=" + p.getProperty(sProp);
+ char[] arChars = new char[sCompleteProp.length()];
+ sCompleteProp.getChars(0, sCompleteProp.length(), arChars, 0);
+ for (int c = 0; c < arChars.length; c++) {
+ System.out.print(String.valueOf((int) arChars[c]));
+ System.out.print(" ");
+ }
+ System.out.print("\n");
+ }
+ }
+ catch(Exception e)
+ {
+ System.err.println(e);
+ }
+ System.exit(0);
+ }
-
}
diff --git a/main/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl b/main/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
index daa4756..46a010b 100644
--- a/main/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
+++ b/main/offapi/com/sun/star/ucb/XSimpleFileAccess3.idl
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -62,7 +62,7 @@ published interface XSimpleFileAccess3 : com::sun::star::ucb::XSimpleFileAccess2
//-------------------------------------------------------------------------
/** Sets the "hidden" of a file according to the boolean parameter,
if the actual process has the right to do so and the used
- operation system supports this operation.
+ operating system supports this operation.
@param bHidden
true; "hidden" flag will be set, false; "hidden" flag will be reset
diff --git a/main/qadevOOo/runner/helper/OSHelper.java b/main/qadevOOo/runner/helper/OSHelper.java
index 8ab4dd7..1f68abe 100644
--- a/main/qadevOOo/runner/helper/OSHelper.java
+++ b/main/qadevOOo/runner/helper/OSHelper.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -24,61 +24,61 @@
package helper;
/**
- * Helper object, to identify the current Operation System.
+ * Helper object, to identify the current Operating System.
* @author ll93751
*/
public class OSHelper
{
- public static boolean isWindows()
- {
- String sOSName = System.getProperty("os.name");
- if (sOSName.toLowerCase().startsWith("windows"))
- {
- return true;
- }
- return false;
- }
- // not need
- // public static boolean isUnix()
- public static boolean isSolarisIntel()
- {
- if ( ( System.getProperty("os.name").toLowerCase().startsWith("solaris") ||
- System.getProperty("os.name").toLowerCase().startsWith("sunos") ) &&
- System.getProperty("os.arch").equals("x86"))
- {
- return true;
- }
- return false;
- }
- public static boolean isSolarisSparc()
- {
- if ( ( System.getProperty("os.name").toLowerCase().startsWith("solaris") ||
- System.getProperty("os.name").toLowerCase().startsWith("sunos") ) &&
- System.getProperty("os.arch").equals("sparc"))
- {
- return true;
- }
- return false;
- }
- public static boolean isLinuxIntel()
- {
- if (System.getProperty("os.name").toLowerCase().startsWith("linux") &&
- System.getProperty("os.arch").equals("i386"))
- {
- return true;
- }
- return false;
- }
+ public static boolean isWindows()
+ {
+ String sOSName = System.getProperty("os.name");
+ if (sOSName.toLowerCase().startsWith("windows"))
+ {
+ return true;
+ }
+ return false;
+ }
+ // not need
+ // public static boolean isUnix()
+ public static boolean isSolarisIntel()
+ {
+ if ( ( System.getProperty("os.name").toLowerCase().startsWith("solaris") ||
+ System.getProperty("os.name").toLowerCase().startsWith("sunos") ) &&
+ System.getProperty("os.arch").equals("x86"))
+ {
+ return true;
+ }
+ return false;
+ }
+ public static boolean isSolarisSparc()
+ {
+ if ( ( System.getProperty("os.name").toLowerCase().startsWith("solaris") ||
+ System.getProperty("os.name").toLowerCase().startsWith("sunos") ) &&
+ System.getProperty("os.arch").equals("sparc"))
+ {
+ return true;
+ }
+ return false;
+ }
+ public static boolean isLinuxIntel()
+ {
+ if (System.getProperty("os.name").toLowerCase().startsWith("linux") &&
+ System.getProperty("os.arch").equals("i386"))
+ {
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean isUnix()
+ {
+ if (isLinuxIntel() ||
+ isSolarisIntel() ||
+ isSolarisSparc())
+ {
+ return true;
+ }
+ return false;
+ }
- public static boolean isUnix()
- {
- if (isLinuxIntel() ||
- isSolarisIntel() ||
- isSolarisSparc())
- {
- return true;
- }
- return false;
- }
-
}
diff --git a/test/testgui/source/bvt/gui/BasicFunctionTest.java b/test/testgui/source/bvt/gui/BasicFunctionTest.java
index 767257b..e082eee 100644
--- a/test/testgui/source/bvt/gui/BasicFunctionTest.java
+++ b/test/testgui/source/bvt/gui/BasicFunctionTest.java
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,22 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
+
+
/**
- *
+ *
*/
package bvt.gui;
@@ -45,7 +47,7 @@ import org.openoffice.test.common.Logger;
import testlib.gui.SCTool;
/**
- *
+ *
*/
public class BasicFunctionTest {
@@ -61,13 +63,13 @@ public class BasicFunctionTest {
public static void afterClass() {
app.stop();
}
-
+
@Before
public void before() {
app.stop();
app.start();
}
-
+
@Test
public void smokeTest() {
@@ -87,7 +89,7 @@ public class BasicFunctionTest {
assertTrue("No Error", !smoketestlog.contains("error") && !testclosurelog.contains("error"));
}
-
+
@Test
public void testExportAsPDF() throws Exception {
String file = prepareData("bvt/pdf.odt");
@@ -103,7 +105,7 @@ public class BasicFunctionTest {
sleep(1);
String magic = FileUtil.readFileAsString(exportTo1).substring(0, 4);
assertEquals("PDF is exported?", "%PDF", magic);
-
+
button(".uno:ExportDirectToPDF").click();//Click via toolbar
submitSaveDlg(exportTo2);
sleep(1);
@@ -113,7 +115,7 @@ public class BasicFunctionTest {
/**
* Test the File -- Print Dialog show
- *
+ *
*/
@Test
public void testPrinter() {
@@ -122,13 +124,13 @@ public class BasicFunctionTest {
app.dispatch(".uno:PrinterSetup");
if (activeMsgBox.exists(2))
activeMsgBox.ok();
-
+
// PrintService[] ps = PrintServiceLookup.lookupPrintServices(null, null);
// String[] names = new String[ps.length];
// for (int i = 0; i < ps.length; i++) {
// names[i] = ps[i].getName();
// }
-//
+//
// assertArrayEquals("Printers Names", names, printerSetUpDlgPrinterNames.getItemsText());
assertTrue("Printer Setup dialog appears", printerSetUpDlg.exists(3));
printerSetUpDlg.cancel();
@@ -136,7 +138,7 @@ public class BasicFunctionTest {
/**
* Test the File -- Java Dialog show
- *
+ *
*/
// @Test
// public void testJavaDialog() {
@@ -163,7 +165,7 @@ public class BasicFunctionTest {
/**
* Test the Tools / Macros / Organize Dialogs" show
- *
+ *
*/
@Test
public void testRunMacro() {
@@ -182,7 +184,7 @@ public class BasicFunctionTest {
/**
* Test the About Dialog show
- *
+ *
*/
@Test
public void testHelp() {
@@ -197,7 +199,7 @@ public class BasicFunctionTest {
/**
* Test inserting a picture in text document
- *
+ *
* @throws Exception
*/
@@ -242,7 +244,7 @@ public class BasicFunctionTest {
// Verify if the picture is inserted successfully
Rectangle rectangle = GraphicsUtil.findRectangle(calc.getScreenRectangle(), 0xFF00FF00);
assertTrue("Green Picture is inserted?" + rectangle, rectangle != null && rectangle.getWidth() > 10);
-
+
SCTool.selectRange("C1");
// insert another picture
app.dispatch(".uno:InsertGraphic");
@@ -327,39 +329,39 @@ public class BasicFunctionTest {
findDlg.close();
sleep(1);
assertEquals(
- "Apache Awesome OpenOffice is comprised of six personal productivity applications: a word processor (and its web-authoring component), spreadsheet, presentation graphics, drawing, equation editor, and database. Awesome OpenOffice is released on Windows, Solaris, Linux and Macintosh operation systems, with more communities joining, including a mature FreeBSD port. Awesome OpenOffice is localized, supporting over 110 languages worldwide. ",
+ "Apache OpenOffice is comprised of six personal productivity applications: a word processor (and its web-authoring component), spreadsheet, presentation graphics, drawing, equation editor, and database. OpenOffice is released on Windows, Solaris, Linux and Macintosh operating systems, with more communities joining, including a mature FreeBSD port. OpenOffice is localized, supporting over 110 languages worldwide. ",
copyAll());
discard();
}
-
+
@Test
public void testFindFormulasAndValues() {
- open(prepareData("bvt/searchFormulasValues.ods"));
- calc.waitForExistence(10, 2);
-
- // Searching for 2003 by formula finds A2
- SCTool.selectRange("A1");
- app.dispatch(".uno:SearchDialog");
- findDlgFor.setText("2003");
- findDlgMore.click();
- findDlgCalcSearchIn.select("Formulas");
- findDlgFind.click();
- sleep(1);
- assertEquals("wrong cell found for formulas search", "A2", scInputBarPosition.getText());
- findDlg.close();
-
- // Searching for October by value finds A2
- SCTool.selectRange("A1");
- app.dispatch(".uno:SearchDialog");
- findDlgFor.setText("October");
- findDlgMore.click();
- findDlgCalcSearchIn.select("Values");
- findDlgFind.click();
- sleep(1);
- assertEquals("wrong cell found for values search", "A2", scInputBarPosition.getText());
- findDlg.close();
-
- discard();
+ open(prepareData("bvt/searchFormulasValues.ods"));
+ calc.waitForExistence(10, 2);
+
+ // Searching for 2003 by formula finds A2
+ SCTool.selectRange("A1");
+ app.dispatch(".uno:SearchDialog");
+ findDlgFor.setText("2003");
+ findDlgMore.click();
+ findDlgCalcSearchIn.select("Formulas");
+ findDlgFind.click();
+ sleep(1);
+ assertEquals("wrong cell found for formulas search", "A2", scInputBarPosition.getText());
+ findDlg.close();
+
+ // Searching for October by value finds A2
+ SCTool.selectRange("A1");
+ app.dispatch(".uno:SearchDialog");
+ findDlgFor.setText("October");
+ findDlgMore.click();
+ findDlgCalcSearchIn.select("Values");
+ findDlgFind.click();
+ sleep(1);
+ assertEquals("wrong cell found for values search", "A2", scInputBarPosition.getText());
+ findDlg.close();
+
+ discard();
}
@Test
@@ -479,7 +481,7 @@ public class BasicFunctionTest {
/**
* Test insert a chart in a draw document 1. New a draw document 2. Insert a
* chart 3. Check if the chart is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -502,7 +504,7 @@ public class BasicFunctionTest {
/**
* Test insert a chart in a text document 1. New a text document 2. Insert a
* chart 3. Check if the chart is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -525,7 +527,7 @@ public class BasicFunctionTest {
/**
* Test insert a chart in a spreadsheet document 1. New a spreadsheet
* document 2. Insert a chart 3. Check if the chart is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -549,7 +551,7 @@ public class BasicFunctionTest {
/**
* Test insert a chart in a presentation document 1. New a presentation
* document 2. Insert a chart 3. Check if the chart is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -571,7 +573,7 @@ public class BasicFunctionTest {
/**
* Test insert a table in a draw document 1. New a draw document 2. Insert a
* default table 3. Check if the table is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -591,7 +593,7 @@ public class BasicFunctionTest {
/**
* Test insert a table in a text document 1. New a text document 2. Insert a
* default table 3. Check if the table is inserted successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -613,7 +615,7 @@ public class BasicFunctionTest {
* Test insert a table in a presentation document 1. New a presentation
* document 2. Insert a default table 3. Check if the table is inserted
* successfully
- *
+ *
* @throws Exception
*/
@Test
@@ -635,7 +637,7 @@ public class BasicFunctionTest {
* Test insert a function in a spreadsheet document via Sum button 1. New a
* spreadsheet document 2. Insert a function via Sum button 3. Check if the
* result is correct
- *
+ *
* @throws Exception
*/
@Test
@@ -663,7 +665,7 @@ public class BasicFunctionTest {
* Test insert a function in a spreadsheet document via inputbar 1. New a
* spreadsheet document 2. Insert a function via inputbar: COS 3. Check if
* the result is correct
- *
+ *
* @throws Exception
*/
@Test
@@ -680,11 +682,11 @@ public class BasicFunctionTest {
SCTool.selectRange("D1");
scInputBarInput.inputKeys("=COS(A1)");
typeKeys("<enter>");
- sleep(1);
+ sleep(1);
// Verify if the calculated result is equal to the expected result
- String result = SCTool.getCellText("D1");
+ String result = SCTool.getCellText("D1");
sleep(1);
- assertEquals("The calculated result", expectedResult, result);
+ assertEquals("The calculated result", expectedResult, result);
discard();
}
@@ -692,7 +694,7 @@ public class BasicFunctionTest {
* Test insert a function in a spreadsheet document via Function Wizard
* Dialog 1. New a spreadsheet document 2. Insert a function via Function
* Wizard Dialog: ABS 3. Check if the result is correct
- *
+ *
* @throws Exception
*/
@Test
@@ -716,9 +718,9 @@ public class BasicFunctionTest {
scFunctionWizardDlg.ok();
sleep(1);
// Verify if the calculated result is equal to the expected result
- String result = SCTool.getCellText("B1");
+ String result = SCTool.getCellText("B1");
sleep(1);
- assertEquals("The calculated result", expectedResult, result);
+ assertEquals("The calculated result", expectedResult, result);
discard();
}
@@ -757,4 +759,4 @@ public class BasicFunctionTest {
discard();
}
-}
\ No newline at end of file
+}