[orca] More OOo 3.3-related regression test updates
- From: Joanmarie Diggs <joanied src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [orca] More OOo 3.3-related regression test updates
- Date: Sun, 18 Jul 2010 00:18:55 +0000 (UTC)
commit acf3d80ba52a74624af1da32c13633e48bb31e4d
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date: Sat Jul 17 18:12:53 2010 -0400
More OOo 3.3-related regression test updates
test/keystrokes/oocalc/bug_356334.py | 4 +-
test/keystrokes/oocalc/bug_361167.py | 22 ++--
test/keystrokes/oocalc/bug_363801.py | 14 ++-
test/keystrokes/oocalc/bug_363802.py | 14 +-
test/keystrokes/oocalc/bug_363804.py | 6 +-
test/keystrokes/oocalc/bug_363804b.py | 6 +-
test/keystrokes/oocalc/bug_364086.py | 16 ++--
test/keystrokes/oocalc/bug_364407.py | 28 ++---
test/keystrokes/oocalc/bug_433398.py | 16 ++-
test/keystrokes/oocalc/bug_435307.py | 15 ++-
test/keystrokes/oocalc/bug_435852.py | 8 +-
test/keystrokes/oowriter/bug_342602.py | 13 +-
test/keystrokes/oowriter/bug_350219.py | 16 ++--
test/keystrokes/oowriter/bug_353268.py | 6 +-
test/keystrokes/oowriter/bug_355733.py | 8 +-
test/keystrokes/oowriter/bug_361624.py | 2 -
test/keystrokes/oowriter/bug_361747.py | 5 +-
test/keystrokes/oowriter/bug_362979.py | 6 +-
test/keystrokes/oowriter/bug_364765.py | 8 +-
test/keystrokes/oowriter/bug_382418.py | 19 ++--
test/keystrokes/oowriter/bug_385828.py | 2 +-
test/keystrokes/oowriter/bug_413909.py | 40 ++++----
test/keystrokes/oowriter/bug_430402.py | 10 +-
test/keystrokes/oowriter/bug_450210.py | 2 +-
test/keystrokes/oowriter/bug_546941.py | 4 +-
test/keystrokes/oowriter/toolbar-buttons.py | 158 +++++++++++++++++++--------
test/keystrokes/oowriter/word-navigation.py | 66 ++++++------
27 files changed, 293 insertions(+), 221 deletions(-)
---
diff --git a/test/keystrokes/oocalc/bug_356334.py b/test/keystrokes/oocalc/bug_356334.py
index f0cedab..a28530c 100644
--- a/test/keystrokes/oocalc/bug_356334.py
+++ b/test/keystrokes/oocalc/bug_356334.py
@@ -27,7 +27,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Press the down arrow to move to 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 '",
+ ["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'"]))
@@ -52,7 +52,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Press the right arrow to move to 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 '",
+ ["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'"]))
diff --git a/test/keystrokes/oocalc/bug_361167.py b/test/keystrokes/oocalc/bug_361167.py
index 3611a87..d01625b 100644
--- a/test/keystrokes/oocalc/bug_361167.py
+++ b/test/keystrokes/oocalc/bug_361167.py
@@ -29,7 +29,7 @@ sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic where am I with no dynamic headers set",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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 column 1 row 1 blank'"]))
@@ -55,7 +55,9 @@ sequence.append(KeyComboAction("c"))
sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(utils.AssertPresentationAction(
"Set dynamic row headers",
- ["BRAILLE LINE: 'Dynamic row header set for column A'",
+ ["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",
+ "BRAILLE LINE: 'Dynamic row header set for column A'",
" VISIBLE: 'Dynamic row header set for colum', cursor=0",
"SPEECH OUTPUT: 'Dynamic row header set for column A'"]))
@@ -66,7 +68,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow to 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 '",
+ ["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",
+ "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'"]))
@@ -77,7 +81,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to cell B2",
- ["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 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 Good in Pies Apples Yes Cell B2 '",
" VISIBLE: 'Yes Cell B2 ', cursor=1",
"SPEECH OUTPUT: 'Apples Yes B2'"]))
@@ -89,7 +93,7 @@ sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Basic where am I with dynamic headers set B2",
- ["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 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 Good in Pies Apples Yes Cell B2 '",
" VISIBLE: 'Yes Cell B2 ', cursor=1",
"SPEECH OUTPUT: 'cell column 2 Apples row 2 Good in Pies Yes'"]))
@@ -100,7 +104,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Down Arrow to 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 Apples 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 Apples Yes Cell B3 '",
" VISIBLE: 'Yes Cell B3 ', cursor=1",
"SPEECH OUTPUT: 'Juiceable Yes B3'"]))
@@ -111,7 +115,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to cell C3",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Juiceable 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 Juiceable Pears Yes Cell C3 '",
" VISIBLE: 'Yes Cell C3 ', cursor=1",
"SPEECH OUTPUT: 'Pears Yes C3'"]))
@@ -123,7 +127,7 @@ 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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table Juiceable 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 Juiceable Pears Yes Cell C3 '",
" VISIBLE: 'Yes Cell C3 ', cursor=1",
"SPEECH OUTPUT: 'cell column 3 Pears row 3 Juiceable Yes'"]))
@@ -134,7 +138,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Up Arrow to 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 Pears 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 Pears No Cell C2 '",
" VISIBLE: 'No Cell C2 ', cursor=1",
"SPEECH OUTPUT: 'Good in Pies No C2'"]))
diff --git a/test/keystrokes/oocalc/bug_363801.py b/test/keystrokes/oocalc/bug_363801.py
index ab867f7..bd9bf7b 100644
--- a/test/keystrokes/oocalc/bug_363801.py
+++ b/test/keystrokes/oocalc/bug_363801.py
@@ -10,7 +10,7 @@ import utils
sequence = MacroSequence()
######################################################################
-# 1. Start oocalc. There is a bug_361167.params file that will
+# 1. Start oocalc. There is a bug_363801.params file that will
# automatically load fruit.ods.
#
sequence.append(PauseAction(3000))
@@ -42,7 +42,9 @@ sequence.append(KeyComboAction("c"))
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'",
+ ["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",
+ "BRAILLE LINE: 'Dynamic row header set for column A'",
" VISIBLE: 'Dynamic row header set for colum', cursor=0",
"SPEECH OUTPUT: 'Dynamic row header set for column A'"]))
@@ -57,8 +59,12 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
sequence.append(PauseAction(3000))
sequence.append(utils.AssertPresentationAction(
"Type Insert-r twice to clear the dynamical column headers",
- ["BRAILLE LINE: 'Dynamic column header set for row 1'",
+ ["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",
+ "BRAILLE LINE: 'Dynamic column header set for row 1'",
" VISIBLE: 'Dynamic column header set for ro', cursor=0",
+ "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",
"BRAILLE LINE: 'Dynamic column header cleared.'",
" VISIBLE: 'Dynamic column header cleared.', cursor=0",
"SPEECH OUTPUT: 'Dynamic column header set for row 1'",
@@ -77,6 +83,8 @@ sequence.append(utils.AssertPresentationAction(
"Type Insert-c twice to clear the dynamical row headers",
["BRAILLE LINE: 'Dynamic row header set for column A'",
" VISIBLE: 'Dynamic row header set for colum', cursor=0",
+ "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",
"BRAILLE LINE: 'Dynamic row header cleared.'",
" VISIBLE: 'Dynamic row header cleared.', cursor=0",
"SPEECH OUTPUT: 'Dynamic row header set for column A'",
diff --git a/test/keystrokes/oocalc/bug_363802.py b/test/keystrokes/oocalc/bug_363802.py
index a502078..304f20b 100644
--- a/test/keystrokes/oocalc/bug_363802.py
+++ b/test/keystrokes/oocalc/bug_363802.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
# 1. Start oocalc. There is a bug_363802.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.
@@ -22,7 +22,7 @@ sequence.append(utils.StartRecordingAction())
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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Press the down arrow to move to 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 '",
+ ["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(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Press the right arrow to move to 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 '",
+ ["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(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Press the down arrow to move to 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 '",
+ ["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(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Press the right arrow to move to 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 '",
+ ["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(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Press the up arrow to move to 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 '",
+ ["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'"]))
diff --git a/test/keystrokes/oocalc/bug_363804.py b/test/keystrokes/oocalc/bug_363804.py
index b4ffea1..d06f5d7 100644
--- a/test/keystrokes/oocalc/bug_363804.py
+++ b/test/keystrokes/oocalc/bug_363804.py
@@ -37,7 +37,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Down to A2 - speak cell coordinates",
- ["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 '",
+ ["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'"]))
@@ -53,7 +53,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Right to B2 - speak cell coordinates",
- ["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 '",
+ ["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'"]))
@@ -69,7 +69,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Control Home to A1 - speak cell coordinates",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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'"]))
diff --git a/test/keystrokes/oocalc/bug_363804b.py b/test/keystrokes/oocalc/bug_363804b.py
index a278e0b..363f1a9 100644
--- a/test/keystrokes/oocalc/bug_363804b.py
+++ b/test/keystrokes/oocalc/bug_363804b.py
@@ -37,7 +37,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Down to A2 - don't speak cell coordinates",
- ["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 '",
+ ["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.'"]))
@@ -53,7 +53,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Right to B2 - don't speak cell coordinates",
- ["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 '",
+ ["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.'"]))
@@ -69,7 +69,7 @@ sequence.append(WaitAction("object:active-descendant-changed",
5000))
sequence.append(utils.AssertPresentationAction(
"Control+Home to A1 - don't speak cell coordinates",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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.'"]))
diff --git a/test/keystrokes/oocalc/bug_364086.py b/test/keystrokes/oocalc/bug_364086.py
index f5cae2c..aad54d0 100644
--- a/test/keystrokes/oocalc/bug_364086.py
+++ b/test/keystrokes/oocalc/bug_364086.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oocalc.
#
-sequence.append(PauseAction(3000))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Calc"), None))
######################################################################
# 2. Enter Alt-f, right arrow, down arrow and Return.
@@ -34,11 +34,11 @@ sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
sequence.append(utils.AssertPresentationAction(
"File->New->Spreadsheet",
["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'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame'",
+ " VISIBLE: 'Untitled 2 - " + utils.getOOoName("Calc") + " (Frame|)', 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",
- "SPEECH OUTPUT: 'Untitled[ ]*2 - " + utils.getOOoName("Calc") + " frame'",
+ "SPEECH OUTPUT: 'Untitled 2 - " + utils.getOOoName("Calc") + " frame'",
"SPEECH OUTPUT: 'Sheet Sheet1 table grayed'"]))
######################################################################
@@ -50,11 +50,11 @@ sequence.append(KeyComboAction("Return"))
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 Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+ ["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 '",
+ "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 Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("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'",
diff --git a/test/keystrokes/oocalc/bug_364407.py b/test/keystrokes/oocalc/bug_364407.py
index 16d5d78..8bc5134 100644
--- a/test/keystrokes/oocalc/bug_364407.py
+++ b/test/keystrokes/oocalc/bug_364407.py
@@ -16,7 +16,6 @@ sequence.append(PauseAction(3000))
######################################################################
# 2. Enter Alt-f, right arrow, down arrow and Return.
-# (File->New->Spreadsheet).
#
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU))
@@ -33,28 +32,24 @@ sequence.append(WaitForFocus("Sheet Sheet1", acc_role=pyatspi.ROLE_TABLE))
sequence.append(utils.AssertPresentationAction(
"File->New->Spreadsheet",
["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'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame'",
+ " VISIBLE: 'Untitled 2 - " + utils.getOOoName("Calc") + " (Frame|)', 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",
- "SPEECH OUTPUT: 'Untitled[ ]*2 - " + utils.getOOoName("Calc") + " frame'",
+ "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.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Calc Frame Untitled2 - OpenOffice.org Calc RootPane ToolBar A1 $l'
-# VISIBLE: 'A1 $l', cursor=2
-# SPEECH OUTPUT: ''
-#
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift><Control>t"))
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 Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Calc") + " RootPane ToolBar List'",
- " VISIBLE: 'List', cursor=1",
- "SPEECH OUTPUT: 'Move to cell'"]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Calc") + " Frame Untitled 2 - " + utils.getOOoName("Calc") + " RootPane ToolBar A1 \$l'",
+ " VISIBLE: 'A1 \$l', cursor=1",
+ "SPEECH OUTPUT: 'text A1'"]))
######################################################################
# 4. Type right arrow twice and backspace twice to remove the current
@@ -68,17 +63,14 @@ sequence.append(KeyComboAction("BackSpace"))
######################################################################
# 5. 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 ScrollPane Document view3 Sheet Sheet1 Table Cell C3 '
-# VISIBLE: 'Cell C3 ', cursor=1
-# SPEECH OUTPUT: ' C3'
-#
+sequence.append(TypeAction("c3"))
+sequence.append(PauseAction(3000))
sequence.append(utils.StartRecordingAction())
-sequence.append(TypeAction("c3", 0, 1000))
sequence.append(KeyComboAction("Return"))
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 Untitled[ ]*2 - " + utils.getOOoName("Calc") + " Frame Untitled[ ]*2 - " + utils.getOOoName("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 Cell C3 '",
" VISIBLE: 'Cell C3 ', cursor=1",
"SPEECH OUTPUT: 'C3'"]))
diff --git a/test/keystrokes/oocalc/bug_433398.py b/test/keystrokes/oocalc/bug_433398.py
index 7a67937..d2a50c2 100644
--- a/test/keystrokes/oocalc/bug_433398.py
+++ b/test/keystrokes/oocalc/bug_433398.py
@@ -40,7 +40,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Type down arrow to get to the Freeze menu item [1]",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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: 'Freeze'"]))
@@ -51,9 +51,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Type Return to check it",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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'"]))
@@ -74,7 +74,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Type down arrow to get to the Freeze menu item [2]",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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: 'Freeze checked'"]))
@@ -89,12 +89,14 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Type Return to uncheck it",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+ ["BUG? - Our 'text does not fit feature might need some tweaking. In this case the contents are not too long. False positive likely due to the height",
+ "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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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'"]))
+ "SPEECH OUTPUT: 'Apples B1.'",
+ "SPEECH OUTPUT: '6 characters too long'"]))
######################################################################
# 10. Enter Alt-f, Alt-c to close the Calc spreadsheet window.
diff --git a/test/keystrokes/oocalc/bug_435307.py b/test/keystrokes/oocalc/bug_435307.py
index 77385cc..88667ad 100644
--- a/test/keystrokes/oocalc/bug_435307.py
+++ b/test/keystrokes/oocalc/bug_435307.py
@@ -40,12 +40,12 @@ sequence.append(KeyComboAction("<Alt>f"))
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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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'"]))
+ "SPEECH OUTPUT: 'Apples B1.'"]))
######################################################################
# 6. Type Alt-w to bring up the Windows menu.
@@ -60,13 +60,14 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(utils.AssertPresentationAction(
"Type Alt-f to select the Freeze menu item [2]",
- ["BRAILLE LINE: 'soffice Application fruit(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("Calc") + " RootPane ScrollPane Document view3 Sheet Sheet1 Table'",
+ ["BUG? - Our 'text does not fit feature might need some tweaking. In this case the contents are not too long. False positive likely due to the height",
+ "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(.ods|) - " + utils.getOOoName("Calc") + " Frame fruit(.ods|) - " + utils.getOOoName("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'"]))
-
+ "SPEECH OUTPUT: 'Apples B1.'",
+ "SPEECH OUTPUT: '6 characters too long'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close the Calc spreadsheet window.
diff --git a/test/keystrokes/oocalc/bug_435852.py b/test/keystrokes/oocalc/bug_435852.py
index 7e5638f..7054e0f 100644
--- a/test/keystrokes/oocalc/bug_435852.py
+++ b/test/keystrokes/oocalc/bug_435852.py
@@ -43,7 +43,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(utils.AssertPresentationAction(
"Enter right arrow to move to 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 '",
+ ["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'"]))
@@ -54,7 +54,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"Enter down arrow to move to 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 '",
+ ["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'"]))
@@ -65,7 +65,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Left"))
sequence.append(utils.AssertPresentationAction(
"Enter left arrow to move to 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 '",
+ ["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'"]))
@@ -76,7 +76,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"Enter up arrow to move to 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 '",
+ ["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'"]))
diff --git a/test/keystrokes/oowriter/bug_342602.py b/test/keystrokes/oowriter/bug_342602.py
index 60c4781..95d7940 100644
--- a/test/keystrokes/oowriter/bug_342602.py
+++ b/test/keystrokes/oowriter/bug_342602.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -49,7 +49,7 @@ sequence.append(WaitForFocus("Name", acc_role=pyatspi.ROLE_TEXT))
# 4. Enter Return (Insert a table with the default parameters - 2x2).
#
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -61,7 +61,7 @@ sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Move to cell B1",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table Paragraph'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table Paragraph'",
" VISIBLE: 'Paragraph', cursor=1",
"SPEECH OUTPUT: 'blank'",
"SPEECH OUTPUT: 'Cell B1'"]))
@@ -74,7 +74,7 @@ sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Move back to cell A1",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table A Paragraph'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table A Paragraph'",
" VISIBLE: 'A Paragraph', cursor=1",
"SPEECH OUTPUT: 'A'",
"SPEECH OUTPUT: 'Cell A1'"]))
@@ -103,8 +103,9 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 9. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+
sequence.append(PauseAction(3000))
sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oowriter/bug_350219.py b/test/keystrokes/oowriter/bug_350219.py
index 894458a..f5eef7f 100644
--- a/test/keystrokes/oowriter/bug_350219.py
+++ b/test/keystrokes/oowriter/bug_350219.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,19 +26,19 @@ sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"New text document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame'",
- " VISIBLE: 'Untitled[ ]*2 - *",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame'",
+ " VISIBLE: 'Untitled 2 - *",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view \$l'",
" VISIBLE: ' $l', cursor=1",
- "SPEECH OUTPUT: 'Untitled[ ]*2 - " + utils.getOOoName("Writer") + " frame'",
+ "SPEECH OUTPUT: 'Untitled 2 - " + utils.getOOoName("Writer") + " frame'",
"SPEECH OUTPUT: 'blank'"]))
######################################################################
-# 3. Enter Alt-f, Alt-c to close the Writer application.
+# 3. Enter Alt-f, Alt-c to close document 2
#
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU))
@@ -47,7 +47,7 @@ sequence.append(KeyComboAction("<Alt>c"))
######################################################################
# 4. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/oowriter/bug_353268.py b/test/keystrokes/oowriter/bug_353268.py
index 76482e8..8d46f05 100644
--- a/test/keystrokes/oowriter/bug_353268.py
+++ b/test/keystrokes/oowriter/bug_353268.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -47,9 +47,9 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Return to top of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
"SPEECH OUTPUT: 'Line 1'"]))
diff --git a/test/keystrokes/oowriter/bug_355733.py b/test/keystrokes/oowriter/bug_355733.py
index a0cd0d1..052c4b9 100644
--- a/test/keystrokes/oowriter/bug_355733.py
+++ b/test/keystrokes/oowriter/bug_355733.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -56,9 +56,9 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Return to top of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
"SPEECH OUTPUT: 'Line 1'"]))
diff --git a/test/keystrokes/oowriter/bug_361624.py b/test/keystrokes/oowriter/bug_361624.py
index 357608b..1f31db2 100644
--- a/test/keystrokes/oowriter/bug_361624.py
+++ b/test/keystrokes/oowriter/bug_361624.py
@@ -29,8 +29,6 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_8", 3000))
sequence.append(utils.AssertPresentationAction(
"Read first line in flat review mode",
-# [[[TODO: WDW - StarOffice 8 doesn't give the scrollbar. DEV300_m25 does.]]]
-#
["BRAILLE LINE: 'panel EFFector Vol. 19, No. 38 October Intercept Personal $l'",
" VISIBLE: 'EFFector Vol. 19, No. 38 Octobe', cursor=1",
"SPEECH OUTPUT: 'panel EFFector Vol. 19, No. 38 October Intercept Personal ",
diff --git a/test/keystrokes/oowriter/bug_361747.py b/test/keystrokes/oowriter/bug_361747.py
index 72750e7..e35258d 100644
--- a/test/keystrokes/oowriter/bug_361747.py
+++ b/test/keystrokes/oowriter/bug_361747.py
@@ -116,9 +116,12 @@ sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
#
sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("Discard", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-
sequence.append(KeyComboAction("Return"))
+sequence.append(KeyComboAction("<Alt>f"))
+sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU))
+sequence.append(KeyComboAction("<Alt>c"))
+
######################################################################
# 11. Wait for things to get back to normal.
#
diff --git a/test/keystrokes/oowriter/bug_362979.py b/test/keystrokes/oowriter/bug_362979.py
index 0a4d26f..181e183 100644
--- a/test/keystrokes/oowriter/bug_362979.py
+++ b/test/keystrokes/oowriter/bug_362979.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -77,7 +77,7 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Move cursor to start of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view â?¢Line 1 \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view â?¢Line 1 \$l'",
" VISIBLE: 'â?¢Line 1 \$l', cursor=2",
"SPEECH OUTPUT: 'â?¢Line 1'"]))
@@ -116,7 +116,7 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 12. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/oowriter/bug_364765.py b/test/keystrokes/oowriter/bug_364765.py
index 8d6f48e..41e5855 100644
--- a/test/keystrokes/oowriter/bug_364765.py
+++ b/test/keystrokes/oowriter/bug_364765.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -30,9 +30,9 @@ sequence.append(TypeAction("w"))
sequence.append(WaitForFocus("Letter...", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(utils.AssertPresentationAction(
"Press W to open the Wizards submenu",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*1 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*1 - " + utils.getOOoName("Writer") + " RootPane MenuBar Wizards Menu'",
+ ["BRAILLE LINE: 'soffice Application Untitled 1 - " + utils.getOOoName("Writer") + " Frame Untitled 1 - " + utils.getOOoName("Writer") + " RootPane MenuBar Wizards Menu'",
" VISIBLE: 'Wizards Menu', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*1 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*1 - " + utils.getOOoName("Writer") + " RootPane MenuBar File Menu Letter...'",
+ "BRAILLE LINE: 'soffice Application Untitled 1 - " + utils.getOOoName("Writer") + " Frame Untitled 1 - " + utils.getOOoName("Writer") + " RootPane MenuBar File Menu Letter...'",
" VISIBLE: 'Letter...', cursor=1",
"SPEECH OUTPUT: 'Wizards menu'",
"SPEECH OUTPUT: 'Letter...'"]))
@@ -45,7 +45,7 @@ sequence.append(KeyComboAction("Escape"))
sequence.append(WaitForFocus("Wizards", acc_role=pyatspi.ROLE_MENU))
sequence.append(utils.AssertPresentationAction(
"Press Escape to close the Wizards submenu",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*1 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*1 - " + utils.getOOoName("Writer") + " RootPane MenuBar Wizards Menu'",
+ ["BRAILLE LINE: 'soffice Application Untitled 1 - " + utils.getOOoName("Writer") + " Frame Untitled 1 - " + utils.getOOoName("Writer") + " RootPane MenuBar Wizards Menu'",
" VISIBLE: 'Wizards Menu', cursor=1",
"SPEECH OUTPUT: 'Wizards menu'"]))
diff --git a/test/keystrokes/oowriter/bug_382418.py b/test/keystrokes/oowriter/bug_382418.py
index f210707..2601c37 100644
--- a/test/keystrokes/oowriter/bug_382418.py
+++ b/test/keystrokes/oowriter/bug_382418.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -25,7 +25,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -64,13 +64,10 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Type Control-Home to move to start of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Line 1 \$l'",
" VISIBLE: 'Line 1 $l', cursor=1",
-# [[[TODO: WDW - StarOffice 8 gives us this. DEV300_m25 does not.]]]
-#
-# "SPEECH OUTPUT: 'leaving table.'",
"SPEECH OUTPUT: 'Line 1'"]))
######################################################################
@@ -81,9 +78,8 @@ sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Type a down arrow to enter the table",
-# [[[TODO: WDW - StarOffice 8 gives us this. DEV300_m25 does not.]]]
-#
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table Paragraph'",
+
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view Table1-1 Table Paragraph'",
" VISIBLE: 'Paragraph', cursor=1",
"SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
"SPEECH OUTPUT: 'blank'",
@@ -110,8 +106,9 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 10. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+
sequence.append(PauseAction(3000))
sequence.append(utils.AssertionSummaryAction())
diff --git a/test/keystrokes/oowriter/bug_385828.py b/test/keystrokes/oowriter/bug_385828.py
index abf9c57..6a0dcb2 100644
--- a/test/keystrokes/oowriter/bug_385828.py
+++ b/test/keystrokes/oowriter/bug_385828.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_413909.py b/test/keystrokes/oowriter/bug_413909.py
index 436e020..5fb8573 100644
--- a/test/keystrokes/oowriter/bug_413909.py
+++ b/test/keystrokes/oowriter/bug_413909.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -51,9 +51,9 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Type Control-Home to move to the start of the document",
- ["BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ ["BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=1",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=1",
"SPEECH OUTPUT: 'The quuuiick brown fox'"]))
@@ -66,35 +66,35 @@ sequence.append(KeyComboAction("F7"))
sequence.append(WaitForFocus("Change", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(utils.AssertPresentationAction(
"Enter F7 to bring up the spell checking dialog",
- ["BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ ["BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=2",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=3",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=4",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=5",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=23",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=14",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=15",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=16",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=17",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=18",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=19",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=20",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=21",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=22",
- "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled[ ]*2", "The quuuiick brown fox \$l") + "'",
+ "BRAILLE LINE: '" + utils.getOOoBrailleLine("Writer", "Untitled 2", "The quuuiick brown fox \$l") + "'",
" VISIBLE: 'The quuuiick brown fox $l', cursor=23",
"BRAILLE LINE: 'soffice Application Spelling: " + language + " Dialog'",
" VISIBLE: 'Spelling: " + language + " Dialog', cursor=1",
@@ -129,7 +129,7 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 9. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/oowriter/bug_430402.py b/test/keystrokes/oowriter/bug_430402.py
index 23ba38b..c49546e 100644
--- a/test/keystrokes/oowriter/bug_430402.py
+++ b/test/keystrokes/oowriter/bug_430402.py
@@ -13,7 +13,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -26,7 +26,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
sequence.append(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled[ ]*2 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 2 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -61,9 +61,9 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Type Control-Home to move to start of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view The quick \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view The quick \$l'",
" VISIBLE: 'The quick $l', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view The quick \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view The quick \$l'",
" VISIBLE: 'The quick $l', cursor=1",
"SPEECH OUTPUT: 'The quick'"]))
@@ -98,7 +98,7 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 8. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/oowriter/bug_450210.py b/test/keystrokes/oowriter/bug_450210.py
index cf57307..efc5afa 100644
--- a/test/keystrokes/oowriter/bug_450210.py
+++ b/test/keystrokes/oowriter/bug_450210.py
@@ -12,7 +12,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/bug_546941.py b/test/keystrokes/oowriter/bug_546941.py
index 5af40a0..4bbeb8e 100644
--- a/test/keystrokes/oowriter/bug_546941.py
+++ b/test/keystrokes/oowriter/bug_546941.py
@@ -14,7 +14,7 @@ sequence = MacroSequence()
######################################################################
# 1. Start oowriter.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"),None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"),None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -97,7 +97,7 @@ sequence.append(KeyComboAction("Return"))
######################################################################
# 11. Wait for things to get back to normal.
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
diff --git a/test/keystrokes/oowriter/toolbar-buttons.py b/test/keystrokes/oowriter/toolbar-buttons.py
index da8996a..b70e076 100644
--- a/test/keystrokes/oowriter/toolbar-buttons.py
+++ b/test/keystrokes/oowriter/toolbar-buttons.py
@@ -10,7 +10,7 @@ sequence = MacroSequence()
######################################################################
# Start Writer
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -28,9 +28,9 @@ sequence.append(KeyComboAction("F6"))
sequence.append(WaitForFocus("File", acc_role=pyatspi.ROLE_MENU))
sequence.append(utils.AssertPresentationAction(
"F6 to menu bar",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane MenuBar'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane MenuBar'",
" VISIBLE: 'MenuBar', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane File Menu'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane File Menu'",
" VISIBLE: 'File Menu', cursor=1",
"SPEECH OUTPUT: 'menu bar'",
"SPEECH OUTPUT: 'File menu'"]))
@@ -40,10 +40,10 @@ sequence.append(KeyComboAction("F6"))
sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(utils.AssertPresentationAction(
"F6 to Standard toolbar",
- ["BUG? - We should not be saying 'off' for this button and the buttons that follow.",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar'",
+ ["KNOWN ISSUE - We should not be saying 'off' for this button and the buttons that follow. This is a side effect of our work-around for OOo exposing toggle buttons to us as push buttons. They fixed that bug in OOo 3.3 dev. Once 3.3 is released, we should remove our work-around.",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar'",
" VISIBLE: 'Standard ToolBar', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar New Button'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar New Button'",
" VISIBLE: 'New Button', cursor=1",
"SPEECH OUTPUT: 'Standard tool bar'",
"SPEECH OUTPUT: 'New off'"]))
@@ -53,14 +53,15 @@ sequence.append(KeyComboAction("<Control>F1"))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Control F1 to show Tooltip.",
- ["BUG? - We're presenting nothing."]))
+ ["BUG? - We're presenting nothing in braille.",
+ "SPEECH OUTPUT: 'Creates a new OOo-dev document.'",]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Open", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to Open button",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar Open Button'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar Open Button'",
" VISIBLE: 'Open Button', cursor=1",
"SPEECH OUTPUT: 'Open off'"]))
@@ -69,7 +70,7 @@ sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
sequence.append(utils.AssertPresentationAction(
"Right Arrow to Save button",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar Save Button'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Standard ToolBar Save Button'",
" VISIBLE: 'Save Button', cursor=1",
"SPEECH OUTPUT: 'Save off grayed'"]))
@@ -82,19 +83,19 @@ sequence.append(KeyComboAction("F6"))
sequence.append(WaitForFocus("Styles and Formatting", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
sequence.append(utils.AssertPresentationAction(
"F6 to Formatting Toolbar",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar'",
" VISIBLE: 'Formatting ToolBar', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar & y Styles and Formatting ToggleButton'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar & y Styles and Formatting ToggleButton'",
" VISIBLE: '& y Styles and Formatting Toggle', cursor=1",
"SPEECH OUTPUT: 'Formatting tool bar'",
- "SPEECH OUTPUT: 'Styles and Formatting'"]))
+ "SPEECH OUTPUT: 'Styles and Formatting off'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Apply Style", acc_role=pyatspi.ROLE_PANEL))
sequence.append(utils.AssertPresentationAction(
"Right to Apply Style",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel'",
" VISIBLE: 'Apply Style Panel', cursor=1",
"SPEECH OUTPUT: 'Apply Style panel'"]))
@@ -102,7 +103,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return to activate Apply Style",
- ["BUG? - We're presenting nothing. Should we be indicating focus?"]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "SPEECH OUTPUT: 'text Default selected'"]))
######################################################################
# Down Arrow to change the selection without expanding the list first
@@ -111,13 +114,24 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. Down in Apply Style (Collapsed)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=10",
+ "SPEECH OUTPUT: 'Heading 1'",
+ "SPEECH OUTPUT: 'selected'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"2. Down in Apply Style (Collapsed)",
- ["BUG? - We're presenting nothing."]))
+ ["BUG? - Why aren't we speaking anything?? This bug is present here and in several tests that follow.",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 2 \$l'",
+ " VISIBLE: 'Heading 2 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 2 \$l'",
+ " VISIBLE: 'Heading 2 \$l', cursor=1"]))
######################################################################
# Alt Down Arrow to expand the list. Then Down Arrow some.
@@ -132,13 +146,19 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. Down in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 3 \$l'",
+ " VISIBLE: 'Heading 3 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 3 \$l'",
+ " VISIBLE: 'Heading 3 \$l', cursor=1"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"2. Down in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Text body \$l'",
+ " VISIBLE: 'Text body \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Text body \$l'",
+ " VISIBLE: 'Text body \$l', cursor=1"]))
######################################################################
# Up Arrow to restore the original style.
@@ -147,25 +167,41 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"1. Up in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 3 \$l'",
+ " VISIBLE: 'Heading 3 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 3 \$l'",
+ " VISIBLE: 'Heading 3 \$l', cursor=1"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"2. Up in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 2 \$l'",
+ " VISIBLE: 'Heading 2 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 2 \$l'",
+ " VISIBLE: 'Heading 2 \$l', cursor=1"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"3. Up in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"4. Up in Apply Style (Expanded)",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "SPEECH OUTPUT: 'Default'",
+ "SPEECH OUTPUT: 'selected'"]))
######################################################################
# Tab off of this item and then Shift+Tab back. That seems to get us
@@ -178,10 +214,14 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return to activate Apply Style - Take 2",
- ["BUG? - Spacing issue with the Combobox in this and the following assertions",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboDefault \$l Apply Style List Default ListItem'",
- " VISIBLE: 'Default ListItem', cursor=1",
- "SPEECH OUTPUT: 'Default'"]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l Combo'",
+ " VISIBLE: 'Default \$l Combo', cursor=8",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "SPEECH OUTPUT: 'Default combo box'",
+ "SPEECH OUTPUT: 'text Default selected'"]))
######################################################################
# Down Arrow to change the selection without expanding the list first
@@ -190,15 +230,28 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. Down in Apply Style (Collapsed) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 1 \$l Apply Style List Heading 1 ListItem'",
+ ["BUG? - We're crazy-chatty here. Why?",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=10",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Heading 1 \$l'",
+ " VISIBLE: 'Heading 1 \$l', cursor=10",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 1 \$l Apply Style List Heading 1 ListItem'",
" VISIBLE: 'Heading 1 ListItem', cursor=1",
+ "SPEECH OUTPUT: 'Heading 1'",
+ "SPEECH OUTPUT: 'Heading 1'",
+ "SPEECH OUTPUT: 'selected'",
+ "SPEECH OUTPUT: 'selected'",
"SPEECH OUTPUT: 'Heading 1'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"2. Down in Apply Style (Collapsed) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 2 \$l Apply Style List Heading 2 ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 2 \$l Apply Style List Heading 2 ListItem'",
" VISIBLE: 'Heading 2 ListItem', cursor=1",
"SPEECH OUTPUT: 'Heading 2'"]))
@@ -215,7 +268,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"1. Down in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 3 \$l Apply Style List Heading 3 ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 3 \$l Apply Style List Heading 3 ListItem'",
" VISIBLE: 'Heading 3 ListItem', cursor=1",
"SPEECH OUTPUT: 'Heading 3'"]))
@@ -223,7 +276,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(utils.AssertPresentationAction(
"2. Down in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboText body \$l Apply Style List Text body ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboText body \$l Apply Style List Text body ListItem'",
" VISIBLE: 'Text body ListItem', cursor=1",
"SPEECH OUTPUT: 'Text body'"]))
@@ -234,7 +287,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"1. Up in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 3 \$l Apply Style List Heading 3 ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 3 \$l Apply Style List Heading 3 ListItem'",
" VISIBLE: 'Heading 3 ListItem', cursor=1",
"SPEECH OUTPUT: 'Heading 3'"]))
@@ -242,7 +295,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"2. Up in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 2 \$l Apply Style List Heading 2 ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 2 \$l Apply Style List Heading 2 ListItem'",
" VISIBLE: 'Heading 2 ListItem', cursor=1",
"SPEECH OUTPUT: 'Heading 2'"]))
@@ -250,7 +303,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"3. Up in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 1 \$l Apply Style List Heading 1 ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboHeading 1 \$l Apply Style List Heading 1 ListItem'",
" VISIBLE: 'Heading 1 ListItem', cursor=1",
"SPEECH OUTPUT: 'Heading 1'"]))
@@ -258,8 +311,16 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
sequence.append(utils.AssertPresentationAction(
"4. Up in Apply Style (Expanded) - Take 2",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboDefault \$l Apply Style List Default ListItem'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel Default \$l'",
+ " VISIBLE: 'Default \$l', cursor=8",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Apply Style Panel ComboDefault $l Apply Style List Default ListItem'",
" VISIBLE: 'Default ListItem', cursor=1",
+ "SPEECH OUTPUT: 'Default'",
+ "SPEECH OUTPUT: 'Default'",
+ "SPEECH OUTPUT: 'selected'",
+ "SPEECH OUTPUT: 'selected'",
"SPEECH OUTPUT: 'Default'"]))
######################################################################
@@ -277,12 +338,12 @@ sequence.append(WaitForFocus("Font Size", acc_role=pyatspi.ROLE_PANEL))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Bold", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(WaitForFocus("Bold", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Tab to Bold",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Bold Button'",
- " VISIBLE: 'Bold Button', cursor=1",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar & y Bold ToggleButton'",
+ " VISIBLE: '& y Bold ToggleButton', cursor=1",
"SPEECH OUTPUT: 'Bold off'"]))
######################################################################
@@ -292,29 +353,31 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return to toggle Bold on",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar &=y Bold ToggleButton'",
+ " VISIBLE: '&=y Bold ToggleButton', cursor=1",
+ "SPEECH OUTPUT: 'Bold on'"]))
######################################################################
# Tab off of this item and then Shift+Tab back.
#
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Italic", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(WaitForFocus("Italic", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Tab to Italic",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Italic Button'",
- " VISIBLE: 'Italic Button', cursor=1",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar & y Italic ToggleButton'",
+ " VISIBLE: '& y Italic ToggleButton', cursor=1",
"SPEECH OUTPUT: 'Italic off'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
-sequence.append(WaitForFocus("Bold", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(WaitForFocus("Bold", acc_role=pyatspi.ROLE_TOGGLE_BUTTON))
sequence.append(PauseAction(1000))
sequence.append(utils.AssertPresentationAction(
"Shift Tab to Bold",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar Bold Button'",
- " VISIBLE: 'Bold Button', cursor=1",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar &=y Bold ToggleButton'",
+ " VISIBLE: '&=y Bold ToggleButton', cursor=1",
"SPEECH OUTPUT: 'Bold on'"]))
######################################################################
@@ -324,12 +387,15 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(utils.AssertPresentationAction(
"Return to toggle Bold off",
- ["BUG? - We're presenting nothing."]))
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane Formatting ToolBar & y Bold ToggleButton'",
+ " VISIBLE: '& y Bold ToggleButton', cursor=1",
+ "SPEECH OUTPUT: 'Bold off'"]))
######################################################################
-# Press F6 to move focus back in the document.
+# Press F6 twice to move focus back in the document.
#
sequence.append(KeyComboAction("F6"))
+sequence.append(KeyComboAction("F6"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
diff --git a/test/keystrokes/oowriter/word-navigation.py b/test/keystrokes/oowriter/word-navigation.py
index e7ac571..1b577e6 100644
--- a/test/keystrokes/oowriter/word-navigation.py
+++ b/test/keystrokes/oowriter/word-navigation.py
@@ -10,7 +10,7 @@ sequence = MacroSequence()
######################################################################
# Start Writer
#
-sequence.append(WaitForWindowActivate("Untitled[ ]*1 - " + utils.getOOoName("Writer"), None))
+sequence.append(WaitForWindowActivate("Untitled 1 - " + utils.getOOoName("Writer"), None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
@@ -37,9 +37,9 @@ sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(utils.AssertPresentationAction(
"Top of document",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=1",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=1",
"SPEECH OUTPUT: 'This is a test.'"]))
@@ -50,7 +50,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(utils.AssertPresentationAction(
"1. Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=6",
"SPEECH OUTPUT: 'is '"]))
@@ -58,7 +58,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(utils.AssertPresentationAction(
"2. Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=9",
"SPEECH OUTPUT: 'a '"]))
@@ -66,7 +66,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(utils.AssertPresentationAction(
"3. Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=11",
"SPEECH OUTPUT: 'test.'"]))
@@ -74,7 +74,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(utils.AssertPresentationAction(
"4. Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
"SPEECH OUTPUT: 'dot'"]))
@@ -82,13 +82,13 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(utils.AssertPresentationAction(
"5. Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=16",
"BRAILLE LINE: 'So is this. \$l'",
" VISIBLE: 'So is this. \$l', cursor=1",
"BRAILLE LINE: 'So is this. \$l'",
" VISIBLE: 'So is this. \$l', cursor=1",
- "SPEECH OUTPUT: 'newline'",
+ "SPEECH OUTPUT: 'blank'",
"SPEECH OUTPUT: 'So '"]))
sequence.append(utils.StartRecordingAction())
@@ -114,20 +114,20 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"2. Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=16",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=16",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
- "SPEECH OUTPUT: 'newline'",
+ "SPEECH OUTPUT: 'blank'",
"SPEECH OUTPUT: 'dot'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"3. Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=11",
"SPEECH OUTPUT: 'test.'"]))
@@ -135,7 +135,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"4. Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=9",
"SPEECH OUTPUT: 'a '"]))
@@ -143,7 +143,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"5. Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=6",
"SPEECH OUTPUT: 'is '"]))
@@ -151,7 +151,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Left"))
sequence.append(utils.AssertPresentationAction(
"6. Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=1",
"SPEECH OUTPUT: 'This '"]))
@@ -162,7 +162,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"1. Select Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=6",
"SPEECH OUTPUT: 'This '",
"SPEECH OUTPUT: 'selected'"]))
@@ -171,7 +171,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"2. Select Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=9",
"SPEECH OUTPUT: 'is '",
"SPEECH OUTPUT: 'selected'"]))
@@ -180,7 +180,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"3. Select Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=11",
"SPEECH OUTPUT: 'a '",
"SPEECH OUTPUT: 'selected'"]))
@@ -189,7 +189,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"4. Select Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
"SPEECH OUTPUT: 'test'",
"SPEECH OUTPUT: 'selected'"]))
@@ -202,7 +202,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'So is this. \$l', cursor=1",
"BRAILLE LINE: 'So is this. \$l'",
" VISIBLE: 'So is this. \$l', cursor=1",
- "SPEECH OUTPUT: 'newline'"]))
+ "SPEECH OUTPUT: 'blank'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
@@ -229,9 +229,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"2. Unselect Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
"SPEECH OUTPUT: 'dot'",
"SPEECH OUTPUT: 'unselected'"]))
@@ -240,7 +240,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"3. Unselect Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=11",
"SPEECH OUTPUT: 'test'",
"SPEECH OUTPUT: 'unselected'"]))
@@ -249,7 +249,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"4. Unselect Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=9",
"SPEECH OUTPUT: 'a '",
"SPEECH OUTPUT: 'unselected'"]))
@@ -258,7 +258,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"5. Unselect Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=6",
"SPEECH OUTPUT: 'is '",
"SPEECH OUTPUT: 'unselected'"]))
@@ -267,7 +267,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"6. Unselect Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=1",
"SPEECH OUTPUT: 'This '",
"SPEECH OUTPUT: 'unselected'"]))
@@ -333,9 +333,9 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"5. Select Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
- "BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ "BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
"SPEECH OUTPUT: 'dot'",
"SPEECH OUTPUT: 'selected'"]))
@@ -344,7 +344,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Left"))
sequence.append(utils.AssertPresentationAction(
"6. Select Previous Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=11",
"SPEECH OUTPUT: 'test'",
"SPEECH OUTPUT: 'selected'"]))
@@ -356,7 +356,7 @@ sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
sequence.append(utils.AssertPresentationAction(
"1. Unselect Next Word",
- ["BRAILLE LINE: 'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
+ ["BRAILLE LINE: 'soffice Application Untitled 2 - " + utils.getOOoName("Writer") + " Frame Untitled 2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view This is a test. \$l'",
" VISIBLE: 'This is a test. \$l', cursor=15",
"SPEECH OUTPUT: 'test'",
"SPEECH OUTPUT: 'unselected'"]))
@@ -370,7 +370,7 @@ sequence.append(utils.AssertPresentationAction(
" VISIBLE: 'So is this. \$l', cursor=1",
"BRAILLE LINE: 'So is this. \$l'",
" VISIBLE: 'So is this. \$l', cursor=1",
- "SPEECH OUTPUT: 'newline'"]))
+ "SPEECH OUTPUT: 'blank'"]))
sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control><Shift>Right"))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
