[orca/gnome-2-28] Update oowriter tests to match OOo-dev 3.2.0 DEV300m56 (Build:9419)

[William Walker <wwalker src gnome org>]

commit 5f9a6eb45e1f6f00082a064ef9b12bcf10cb26ee
Author: Willie Walker <william walker sun com>
Date:   Sun Sep 6 12:26:01 2009 -0400

    Update oowriter tests to match OOo-dev 3.2.0 DEV300m56 (Build:9419)

 test/keystrokes/oowriter/bug_385828.py             |    2 +-
 test/keystrokes/oowriter/bug_435201.py             |    4 ----
 .../oowriter/table_cells_structural_navigation1.py |    6 +++++-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/test/keystrokes/oowriter/bug_385828.py b/test/keystrokes/oowriter/bug_385828.py
index a928be9..5f8e5ef 100644
--- a/test/keystrokes/oowriter/bug_385828.py
+++ b/test/keystrokes/oowriter/bug_385828.py
@@ -44,7 +44,7 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  ' \$l', cursor=1",
      "SPEECH OUTPUT: 'frame 1 unfocused dialog'",
      "SPEECH OUTPUT: 'Agenda Wizard Please choose the page design for the agenda 1. Page design 2. General information 3. Headings to include 4. Names 5. Agenda items 6. Name and location'",
-     "SPEECH OUTPUT: 'Page design label'"]))
+     "SPEECH OUTPUT: 'Page design'"]))
 
 ######################################################################
 # 5. Press Escape to put focus back in the document.
diff --git a/test/keystrokes/oowriter/bug_435201.py b/test/keystrokes/oowriter/bug_435201.py
index d5a3d4f..cd6c062 100644
--- a/test/keystrokes/oowriter/bug_435201.py
+++ b/test/keystrokes/oowriter/bug_435201.py
@@ -62,8 +62,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Now old lady, you have one last ', cursor=1",
      "BRAILLE LINE:  'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject  \$l'",
      "     VISIBLE:  'Now old lady, you have one last ', cursor=1",
-     "BRAILLE LINE:  ' \$l'",
-     "     VISIBLE:  ' \$l', cursor=1",
      "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject the works of the ungodly. Two last chances. And you shall be free. Three last chances. You have three last chances, the nature of which I have divulged in my previous utterance.'"]))
 
 ######################################################################
@@ -90,8 +88,6 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=1",
      "BRAILLE LINE:  'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=1",
-     "BRAILLE LINE:  ' \$l'",
-     "     VISIBLE:  ' \$l', cursor=1",
      "SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'"]))
 
 ######################################################################
diff --git a/test/keystrokes/oowriter/table_cells_structural_navigation1.py b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
index 50d52c4..3a0538d 100644
--- a/test/keystrokes/oowriter/table_cells_structural_navigation1.py
+++ b/test/keystrokes/oowriter/table_cells_structural_navigation1.py
@@ -158,8 +158,12 @@ sequence.append(utils.AssertPresentationAction(
     "9. Alt Shift End.",
     ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample2(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample2(.odt|)", "Calendar-1 Table Paragraph") + "'",
+     "     VISIBLE:  'Paragraph', cursor=1",
      "SPEECH OUTPUT: 'blank'",
-     "SPEECH OUTPUT: 'Row 7, column 7.'"]))
+     "SPEECH OUTPUT: 'Row 7, column 7.'",
+     "SPEECH OUTPUT: 'End of table blank'",
+     "SPEECH OUTPUT: 'Cell G7'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Alt><Shift>Down"))