orca r4144 - in trunk: . test/keystrokes/oocalc

From: joanied svn gnome org
To: svn-commits-list gnome org
Subject: orca r4144 - in trunk: . test/keystrokes/oocalc
Date: Tue, 2 Sep 2008 04:42:17 +0000 (UTC)
Author: joanied
Date: Tue Sep  2 04:42:17 2008
New Revision: 4144
URL: http://svn.gnome.org/viewvc/orca?rev=4144&view=rev

Log:
* test/keystrokes/oocalc/bug_363801.py:
  test/keystrokes/oocalc/bug_363802.py:
  test/keystrokes/oocalc/bug_435307.py:
  test/keystrokes/oocalc/bug_356334.py:
  test/keystrokes/oocalc/bug_361167.py:
  test/keystrokes/oocalc/bug_363804.py:
  test/keystrokes/oocalc/bug_364407.py:
  test/keystrokes/oocalc/bug_364086.py:
  test/keystrokes/oocalc/bug_435852.py:
  test/keystrokes/oocalc/bug_433398.py
  Updated Calc regression tests to use utils.getOOoName() and
  KP_Insert rather than Insert.


Modified:
   trunk/ChangeLog
   trunk/test/keystrokes/oocalc/bug_356334.py
   trunk/test/keystrokes/oocalc/bug_361167.py
   trunk/test/keystrokes/oocalc/bug_363801.py
   trunk/test/keystrokes/oocalc/bug_363802.py
   trunk/test/keystrokes/oocalc/bug_363804.py
   trunk/test/keystrokes/oocalc/bug_364086.py
   trunk/test/keystrokes/oocalc/bug_364407.py
   trunk/test/keystrokes/oocalc/bug_433398.py
   trunk/test/keystrokes/oocalc/bug_435307.py
   trunk/test/keystrokes/oocalc/bug_435852.py

Modified: trunk/test/keystrokes/oocalc/bug_356334.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_356334.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_356334.py	Tue Sep  2 04:42:17 2008
@@ -13,7 +13,7 @@
 # 1. Start oocalc. There is a bug_356334.params file that will
 #    automatically load fruit.ods.
 #
-sequence.append(WaitForWindowActivate("fruit(.ods|) - OpenOffice.org Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Type Control-Home to position the text caret in cell A1.
@@ -27,7 +27,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Press the down arrow to move to cell A2",
-    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - OpenOffice.org Calc Frame fruit(.ods|) - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
      "     VISIBLE:  'Good in Pies Cell A2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2'"]))
 
@@ -35,9 +35,9 @@
 # 4. Type Insert-f to get text attributes on the current cell (A2).
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("f"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Type Insert-f to get text attributes on the current cell (A2)",
     ["SPEECH OUTPUT: 'size 16'",
@@ -52,7 +52,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Press the right arrow to move to cell B2",
-    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - OpenOffice.org Calc Frame fruit(.ods|) - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1",
      "SPEECH OUTPUT: 'Yes B2'"]))
 
@@ -60,9 +60,9 @@
 # 6. Type Insert-f to get text attributes on the current cell (B2).
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("f"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Type Insert-f to get text attributes on the current cell (B2)",
     ["SPEECH OUTPUT: 'size 10'",

Modified: trunk/test/keystrokes/oocalc/bug_361167.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_361167.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_361167.py	Tue Sep  2 04:42:17 2008
@@ -14,7 +14,7 @@
 # 1. Start oocalc. There is a bug_361167.params file that will
 #    automatically load fruit.ods.
 #
-sequence.append(WaitForWindowActivate("fruit - OpenOffice.org Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Type Control-Home to position the text caret in cell A1.
@@ -29,7 +29,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic where am I with no dynamic headers set", 
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
      "SPEECH OUTPUT: 'cell'",
      "SPEECH OUTPUT: 'column 1'",
@@ -40,9 +40,9 @@
 # 4. Type Insert-r to set the dynamic column headers to the first column.
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("r"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Set dynamic column headers",
     ["BRAILLE LINE:  'Dynamic column header set for row 1'",
@@ -53,9 +53,9 @@
 # 5. Type Insert-c to set the dynamic row headers to the first row.
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("c"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Set dynamic row headers",
     ["BRAILLE LINE:  'Dynamic row header set for column A'",
@@ -69,7 +69,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow to cell A2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table  Good in Pies Good in Pies Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table  Good in Pies Good in Pies Cell A2 '",
      "     VISIBLE:  'Good in Pies Cell A2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies Good in Pies A2'"]))
 
@@ -80,7 +80,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to cell B2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table  Apples Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table  Apples Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1",
      "SPEECH OUTPUT: 'Apples Yes B2'"]))
 
@@ -92,7 +92,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Basic where am I with dynamic headers set B2", 
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1",
      "SPEECH OUTPUT: 'cell'",
      "SPEECH OUTPUT: 'column 2'",
@@ -108,7 +108,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Down Arrow to cell B3",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table  Juiceable Yes Cell B3 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table  Juiceable Yes Cell B3 '",
      "     VISIBLE:  'Yes Cell B3 ', cursor=1",
      "SPEECH OUTPUT: 'Juiceable Yes B3'"]))
 
@@ -119,7 +119,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Right Arrow to cell C3",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table  Pears Yes Cell C3 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table  Pears Yes Cell C3 '",
      "     VISIBLE:  'Yes Cell C3 ', cursor=1",
      "SPEECH OUTPUT: 'Pears Yes C3'"]))
 
@@ -130,8 +130,8 @@
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
-    "Basic where am I with dynamic headers set C3", 
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell C3 '",
+    "Basic where am I with dynamic headers set C3",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell C3 '",
      "     VISIBLE:  'Yes Cell C3 ', cursor=1",
      "SPEECH OUTPUT: 'cell'",
      "SPEECH OUTPUT: 'column 3'",
@@ -147,7 +147,7 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Up Arrow to cell C2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table  Good in Pies No Cell C2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table  Good in Pies No Cell C2 '",
      "     VISIBLE:  'No Cell C2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies No C2'"]))
 

Modified: trunk/test/keystrokes/oocalc/bug_363801.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_363801.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_363801.py	Tue Sep  2 04:42:17 2008
@@ -13,7 +13,7 @@
 # 1. Start oocalc. There is a bug_361167.params file that will
 #    automatically load fruit.ods.
 #
-sequence.append(WaitForWindowActivate("fruit - OpenOffice.org Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Type Control-Home to position the text caret in cell A1.
@@ -24,9 +24,9 @@
 # 3. Type Insert-r to set the dynamical column headers to the first column.
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("r"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Type Insert-r to set the dynamical column headers to the first column",
     ["BRAILLE LINE:  'Dynamic column header set for row 1'",
@@ -37,9 +37,9 @@
 # 4. Type Insert-c to set the dynamical row headers to the first row.
 #
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyPressAction (0, 106,"Insert"))      # Press Insert
+sequence.append(KeyPressAction(0, None, "KP_Insert"))
 sequence.append(KeyComboAction("c"))
-sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
+sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 sequence.append(utils.AssertPresentationAction(
     "Type Insert-c to set the dynamical row headers to the first row.",
     ["BRAILLE LINE:  'Dynamic row header set for column A'",

Modified: trunk/test/keystrokes/oocalc/bug_363802.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_363802.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_363802.py	Tue Sep  2 04:42:17 2008
@@ -22,7 +22,7 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-Home to position the text caret in cell A1",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
      "SPEECH OUTPUT: ' A1'"]))
 
@@ -33,7 +33,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Press the down arrow to move to cell A2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
      "     VISIBLE:  'Good in Pies Cell A2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2'"]))
 
@@ -44,7 +44,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Press the right arrow to move to cell B2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1", 
      "SPEECH OUTPUT: 'Yes B2'"]))
 
@@ -55,7 +55,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Press the down arrow to move to cell B3",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B3 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B3 '",
      "     VISIBLE:  'Yes Cell B3 ', cursor=1", 
      "SPEECH OUTPUT: 'Yes B3'"]))
 
@@ -66,7 +66,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Press the right arrow to move to cell C3",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell C3 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell C3 '",
      "     VISIBLE:  'Yes Cell C3 ', cursor=1",
      "SPEECH OUTPUT: 'Yes C3'"]))
 
@@ -77,7 +77,7 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Press the up arrow to move to cell C2",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table No Cell C2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table No Cell C2 '",
      "     VISIBLE:  'No Cell C2 ', cursor=1",
      "SPEECH OUTPUT: 'No C2'"]))
 

Modified: trunk/test/keystrokes/oocalc/bug_363804.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_363804.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_363804.py	Tue Sep  2 04:42:17 2008
@@ -9,24 +9,11 @@
 
 sequence = MacroSequence()
 
-
-######################################################################
-# Redefine this if you're working with a nightly build of OOo.  It is
-# the string that appears in the window title.  For example, instead of
-#"OpenOffice.org" you might have "OOo-dev".  
-#
-OO_NAME="OpenOffice.org"
-
 ######################################################################
 # Start oocalc. There is a bug_361167.params file that will
 # automatically load fruit.ods.
 #
-#sequence.append(WaitForWindowActivate("fruit - " + OO_NAME + " Calc",None))
-sequence.append(WaitAction("focus:",
-                           None,
-                           None,
-                           pyatspi.ROLE_TABLE,
-                           30000))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # Type Control-Home to position the text caret in cell A1.
@@ -41,16 +28,9 @@
 ######################################################################
 # Press the down arrow to move to cell A2.
 #
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(WaitAction("object:active-descendant-changed",
-                           None,
-                           None,
-                           pyatspi.ROLE_TABLE,
-                           5000))
 sequence.append(utils.AssertPresentationAction(
     "Down to A2 - speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
      "     VISIBLE:  'Good in Pies Cell A2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies A2'"]))
 
@@ -66,7 +46,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Right to B2 - speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1",
      "SPEECH OUTPUT: 'Yes B2'"]))
 
@@ -82,7 +62,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Control Home to A1 - speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
      "SPEECH OUTPUT: ' A1'"]))
 
@@ -124,7 +104,7 @@
 # Type Alt-o to press the OK button and reload the Orca user settings.
 #
 sequence.append(KeyComboAction("<Alt>o"))
-sequence.append(WaitForWindowActivate("fruit - " + OO_NAME + " Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # Type Control-Home to position the text caret in cell A1.
@@ -143,7 +123,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Down to A2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Good in Pies Cell A2 '",
      "     VISIBLE:  'Good in Pies Cell A2 ', cursor=1",
      "SPEECH OUTPUT: 'Good in Pies'"]))
 
@@ -159,7 +139,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Right to B2 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Yes Cell B2 '",
      "     VISIBLE:  'Yes Cell B2 ', cursor=1",
      "SPEECH OUTPUT: 'Yes'"]))
 
@@ -175,7 +155,7 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "Control+Home to A1 - don't speak cell coordinates",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
      "SPEECH OUTPUT: 'blank'"]))
 

Modified: trunk/test/keystrokes/oocalc/bug_364086.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_364086.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_364086.py	Tue Sep  2 04:42:17 2008
@@ -13,8 +13,7 @@
 ######################################################################
 # 1. Start oocalc.
 #
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Calc",None))
-sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Enter Alt-f, right arrow, down arrow and Return.
@@ -34,19 +33,13 @@
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "File->New->Spreadsheet",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame'",
-     "     VISIBLE:  'Untitled2 - OpenOffice.org Calc ', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane Panel'",
-     "     VISIBLE:  'Panel', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+    ["BUG? - Shouldn't we also be saying the cell? And the 'grayed' bit is probably not desirable.",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame'",
+     "     VISIBLE:  'Untitled[ ]*2 - OpenOffice.org Calc ', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
-     "     VISIBLE:  'Cell A1 ', cursor=1",
-     "SPEECH OUTPUT: 'Untitled2 - OpenOffice.org Calc frame'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'panel'",
-     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
-     "SPEECH OUTPUT: ' A1'"]))
+     "SPEECH OUTPUT: 'Untitled[ ]*2 - " + utils.getOOoName("Calc") + " frame'",
+     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'"]))
 
 ######################################################################
 # 3. Type "hello" (without the quotes), followed by Return.
@@ -57,10 +50,13 @@
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Type 'hello' (without the quotes), followed by Return",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+     "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A2 '",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A2 '",
      "     VISIBLE:  'Cell A2 ', cursor=1",
+     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: ' A1'",
      "SPEECH OUTPUT: ' A2'"]))
 

Modified: trunk/test/keystrokes/oocalc/bug_364407.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_364407.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_364407.py	Tue Sep  2 04:42:17 2008
@@ -12,8 +12,7 @@
 ######################################################################
 # 1. Start oocalc.
 #
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Calc",None))
-sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Enter Alt-f, right arrow, down arrow and Return.
@@ -33,20 +32,13 @@
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "File->New->Spreadsheet",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame'",
-     "     VISIBLE:  'Untitled2 - OpenOffice.org Calc ', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane Panel'",
-     "     VISIBLE:  'Panel', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+    ["BUG? - Shouldn't we also be saying the cell? And the 'grayed' bit is probably not desirable.",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame'",
+     "     VISIBLE:  'Untitled[ ]*2 - OpenOffice.org Calc ', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
-     "     VISIBLE:  'Cell A1 ', cursor=1",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Untitled2 - OpenOffice.org Calc frame'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'panel'",
-     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
-     "SPEECH OUTPUT: ' A1'"]))
+     "SPEECH OUTPUT: 'Untitled[ ]*2 - " + utils.getOOoName("Calc") + " frame'",
+     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'"]))
 
 ######################################################################
 # 3. Type Control-Shift-t to give focus to the spreadsheet cell locator.
@@ -60,7 +52,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_LIST))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-Shift-t to give focus to the spreadsheet cell locator",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar List'",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ToolBar List'",
      "     VISIBLE:  'List', cursor=1",
      "SPEECH OUTPUT: 'Move to cell'"]))
 
@@ -86,21 +78,11 @@
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Type 'c3' followed by Return to jump to cell C3 in the spreadsheet",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c $l'",
-     "     VISIBLE:  'c $l', cursor=2",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c $l'",
-     "     VISIBLE:  'c $l', cursor=2",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c3 $l'",
-     "     VISIBLE:  'c3 $l', cursor=3",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c3 $l'",
-     "     VISIBLE:  'c3 $l', cursor=3",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar c3 $l'",
-     "     VISIBLE:  'c3 $l', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
-     "     VISIBLE:  'Cell A1 ', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+     "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
+     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '",
      "     VISIBLE:  'Cell C3 ', cursor=1",
-     "SPEECH OUTPUT: ' A1'",
+     "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: ' C3'"]))
 
 ######################################################################

Modified: trunk/test/keystrokes/oocalc/bug_433398.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_433398.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_433398.py	Tue Sep  2 04:42:17 2008
@@ -13,7 +13,7 @@
 # 1. Start oocalc. There is a bug_361167.params file that will
 #    automatically load fruit.ods.
 #
-sequence.append(WaitForWindowActivate("fruit - OpenOffice.org Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Type Control-Home to position the text caret in cell A1.
@@ -40,7 +40,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type down arrow to get to the Freeze menu item [1]",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane MenuBar Freeze'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane MenuBar Freeze'",
      "     VISIBLE:  'Freeze', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Freeze'"]))
@@ -52,9 +52,9 @@
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Type Return to check it",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view4 Sheet Sheet1 Table'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view4 Sheet Sheet1 Table Apples Cell B1 '",
+     "BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table Apples Cell B1 '",
      "     VISIBLE:  'Apples Cell B1 ', cursor=1",
      "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: 'Apples B1'"]))
@@ -75,7 +75,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Type down arrow to get to the Freeze menu item [2]",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane MenuBar <x> Freeze'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane MenuBar <x> Freeze'",
      "     VISIBLE:  '<x> Freeze', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Freeze checked'"]))
@@ -91,9 +91,9 @@
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
     "Type Return to uncheck it",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Apples Cell B1 '",
+     "BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Apples Cell B1 '",
      "     VISIBLE:  'Apples Cell B1 ', cursor=1",
      "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: 'Apples B1'"]))

Modified: trunk/test/keystrokes/oocalc/bug_435307.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_435307.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_435307.py	Tue Sep  2 04:42:17 2008
@@ -14,7 +14,7 @@
 # 1. Start oocalc. There is a bug_435307.params file that will
 #    automatically load fruit.ods.
 #
-sequence.append(WaitForWindowActivate("fruit - OpenOffice.org Calc",None))
+sequence.append(PauseAction(3000))
 
 ######################################################################
 # 2. Type Control-Home to position the text caret in cell A1.
@@ -40,9 +40,9 @@
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 sequence.append(utils.AssertPresentationAction(
     "Type Alt-f to select the Freeze menu item [1]",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view4 Sheet Sheet1 Table'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view4 Sheet Sheet1 Table Apples Cell B1 '",
+     "BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view4 Sheet Sheet1 Table Apples Cell B1 '",
      "     VISIBLE:  'Apples Cell B1 ', cursor=1",
      "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: 'Apples B1'"]))
@@ -60,13 +60,14 @@
 sequence.append(KeyComboAction("<Alt>f"))
 sequence.append(utils.AssertPresentationAction(
     "Type Alt-f to select the Freeze menu item [2]",
-    ["BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+    ["BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
      "     VISIBLE:  'Sheet Sheet1 Table', cursor=1",
-     "BRAILLE LINE:  'soffice Application fruit - OpenOffice.org Calc Frame fruit - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Apples Cell B1 '",
+     "BRAILLE LINE:  'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Apples Cell B1 '",
      "     VISIBLE:  'Apples Cell B1 ', cursor=1",
      "SPEECH OUTPUT: 'Sheet Sheet1 table grayed'",
      "SPEECH OUTPUT: 'Apples B1'"]))
 
+
 ######################################################################
 # 8. Enter Alt-f, Alt-c to close the Calc spreadsheet window.
 #

Modified: trunk/test/keystrokes/oocalc/bug_435852.py
==============================================================================
--- trunk/test/keystrokes/oocalc/bug_435852.py	(original)
+++ trunk/test/keystrokes/oocalc/bug_435852.py	Tue Sep  2 04:42:17 2008
@@ -12,8 +12,7 @@
 ######################################################################
 # 1. Start oocalc.
 #
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Calc",None))
-sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Calc"), None))
 
 ######################################################################
 # 2. Enter Alt-f, right arrow, down arrow and Return.
@@ -29,7 +28,7 @@
 sequence.append(WaitForFocus("Spreadsheet", acc_role=pyatspi.ROLE_MENU_ITEM))
 
 sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled2 - OpenOffice.org Calc",None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Calc"), None))
 sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
 
 ######################################################################
@@ -44,7 +43,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Enter right arrow to move to cell B1",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell B1 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell B1 '",
      "     VISIBLE:  'Cell B1 ', cursor=1",
      "SPEECH OUTPUT: ' B1'"]))
 
@@ -55,7 +54,7 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Enter down arrow to move to cell B2",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell B2 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell B2 '",
      "     VISIBLE:  'Cell B2 ', cursor=1",
      "SPEECH OUTPUT: ' B2'"]))
 
@@ -66,7 +65,7 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "Enter left arrow to move to cell A2",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A2 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A2 '",
      "     VISIBLE:  'Cell A2 ', cursor=1",
      "SPEECH OUTPUT: ' A2'"]))
 
@@ -77,7 +76,7 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "Enter up arrow to move to cell A1",
-    ["BRAILLE LINE:  'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Cell A1 '",
      "     VISIBLE:  'Cell A1 ', cursor=1",
      "SPEECH OUTPUT: ' A1'"]))
 
@@ -88,7 +87,7 @@
 sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU))
 
 sequence.append(KeyComboAction("<Alt>c"))
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Calc",None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Calc"), None))
 
 ######################################################################
 # 9. Wait for things to get back to normal.
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]