orca r4047 - in trunk: . test/harness test/keystrokes/oowriter

From: wwalker svn gnome org
To: svn-commits-list gnome org
Subject: orca r4047 - in trunk: . test/harness test/keystrokes/oowriter
Date: Sat, 19 Jul 2008 01:19:00 +0000 (UTC)
Author: wwalker
Date: Sat Jul 19 01:18:59 2008
New Revision: 4047
URL: http://svn.gnome.org/viewvc/orca?rev=4047&view=rev

Log:
More work on the oowriter tests.


Modified:
   trunk/ChangeLog
   trunk/test/harness/utils.py
   trunk/test/keystrokes/oowriter/bug_342602.py
   trunk/test/keystrokes/oowriter/bug_361624.py
   trunk/test/keystrokes/oowriter/bug_361747.py
   trunk/test/keystrokes/oowriter/bug_382408.py
   trunk/test/keystrokes/oowriter/bug_382415.py
   trunk/test/keystrokes/oowriter/bug_382418.py
   trunk/test/keystrokes/oowriter/bug_382880.py
   trunk/test/keystrokes/oowriter/bug_382888.py
   trunk/test/keystrokes/oowriter/bug_384893.py
   trunk/test/keystrokes/oowriter/bug_413909.py
   trunk/test/keystrokes/oowriter/bug_435226.py
   trunk/test/keystrokes/oowriter/bug_469367.py

Modified: trunk/test/harness/utils.py
==============================================================================
--- trunk/test/harness/utils.py	(original)
+++ trunk/test/harness/utils.py	Sat Jul 19 01:18:59 2008
@@ -27,25 +27,25 @@
 #
 OOoWriterNames = "(StarOffice Writer|OpenOffice.org Writer|OOo-dev Writer Beta)"
 
-#OOO_VERSION="OOo2.4"
-#OOO_VERSION="OOo-dev 3.0 Beta"
-OOO_VERSION="StarOffice 8"
+#OOO_VERSION="OpenOffice 2.4"
+#OOO_VERSION="StarOffice 8"
+OOO_VERSION="DEV300_m25"
 
 def getOOoName(app):
-    if OOO_VERSION == "OOo2.4":
+    if OOO_VERSION == "OpenOffice 2.4":
         return "OpenOffice.org %s" % app
-    elif OOO_VERSION == "OOo-dev 3.0 Beta":
-        return "OOo-dev %s Beta" % app
     elif OOO_VERSION == "StarOffice 8":
         return "StarOffice %s" % app
+    elif OOO_VERSION == "DEV300_m25":
+        return "OOo-dev %s Beta" % app
         
 def getOOoBrailleLine(app, title, remainder):
-    if OOO_VERSION == "OOo2.4":
+    if OOO_VERSION == "OpenOffice 2.4":
         return "soffice Application " + title + " - OpenOffice.org " + app + " Frame " +  title + " - OpenOffice.org " + app + " RootPane ScrollPane Document view " + remainder
-    elif OOO_VERSION == "OOo-dev 3.0 Beta":
-        return "soffice Application " + title + " - OOo-dev " + app + " Beta Frame " +  title + " - OOo-dev " + app + " Beta RootPane ScrollPane Document view " + remainder
     elif OOO_VERSION == "StarOffice 8":
         return "soffice Application " + title + " - StarOffice " + app + " Frame " +  title + " - StarOffice " + app + " RootPane ScrollPane Document view " + remainder
+    elif OOO_VERSION == "DEV300_m25":
+        return "soffice Application " + title + " - OOo-dev " + app + " Beta Frame " +  title + " - OOo-dev " + app + " Beta RootPane ScrollPane Document view " + remainder
 
 createDiffs = True
 try:
@@ -117,7 +117,6 @@
             if expectedResultRE.match(results[i]):
                 continue
             else:
-                print "NO MATCH", results[i], expectedList[i]
                 return results
     return None
 

Modified: trunk/test/keystrokes/oowriter/bug_342602.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_342602.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_342602.py	Sat Jul 19 01:18:59 2008
@@ -67,7 +67,9 @@
      "     VISIBLE:  'Paragraph', cursor=1",
      "SPEECH OUTPUT: 'A'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell B1'",
@@ -87,7 +89,9 @@
      "     VISIBLE:  'A Paragraph', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
      "SPEECH OUTPUT: 'A'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell A1'"]))

Modified: trunk/test/keystrokes/oowriter/bug_361624.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_361624.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_361624.py	Sat Jul 19 01:18:59 2008
@@ -29,6 +29,8 @@
 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 ",

Modified: trunk/test/keystrokes/oowriter/bug_361747.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_361747.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_361747.py	Sat Jul 19 01:18:59 2008
@@ -44,7 +44,7 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Control-Home to move to start of document",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document", "Bold Italic Normal \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document(.odt|)", "Bold Italic Normal \$l") + "'",
      "     VISIBLE:  'Bold Italic Normal $l', cursor=1",
      "SPEECH OUTPUT: 'Bold Italic Normal'"]))
 
@@ -72,7 +72,7 @@
 sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
 sequence.append(utils.AssertPresentationAction(
     "Text information for italic word",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document", "Bold Italic Normal \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document(.odt|)", "Bold Italic Normal \$l") + "'",
      "     VISIBLE:  'Bold Italic Normal $l', cursor=6",
      "SPEECH OUTPUT: 'Italic '",
      "SPEECH OUTPUT: 'size 12'",
@@ -90,7 +90,7 @@
 sequence.append(KeyReleaseAction(150, 106,"Insert"))   # Release Insert
 sequence.append(utils.AssertPresentationAction(
     "Text information for regular word",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document", "Bold Italic Normal \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document(.odt|)", "Bold Italic Normal \$l") + "'",
      "     VISIBLE:  'Bold Italic Normal $l', cursor=13",
      "SPEECH OUTPUT: 'Normal'",
      "SPEECH OUTPUT: 'size 12'",

Modified: trunk/test/keystrokes/oowriter/bug_382408.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382408.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_382408.py	Sat Jul 19 01:18:59 2008
@@ -35,7 +35,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "This is a test. \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
 
@@ -47,7 +47,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Sun Mon Tue Wed Thu Fri Sat") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Sun Mon Tue Wed Thu Fri Sat") + "'",
      "     VISIBLE:  'Mon Tue Wed Thu Fri Sat', cursor=1",
      "SPEECH OUTPUT: 'Sun Mon Tue Wed Thu Fri Sat'",
      "SPEECH OUTPUT: ' not selected'"]))

Modified: trunk/test/keystrokes/oowriter/bug_382415.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382415.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_382415.py	Sat Jul 19 01:18:59 2008
@@ -28,7 +28,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to next line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "This is a test. \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
 
@@ -40,7 +40,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
      "SPEECH OUTPUT: 'Mon'",
@@ -54,9 +54,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to move to the blank table cell on the next row",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Mon'",
      "SPEECH OUTPUT: ' not selected'",
@@ -72,9 +72,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to move to the '4' table cell on the next row",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
@@ -90,9 +90,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Down arrow to move to the '11' table cell on the next row",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 11 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 11 Paragraph") + "'",
      "     VISIBLE:  '11 Paragraph', cursor=1",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",

Modified: trunk/test/keystrokes/oowriter/bug_382418.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382418.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_382418.py	Sat Jul 19 01:18:59 2008
@@ -69,7 +69,9 @@
      "     VISIBLE:  'Line 1 $l', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'leaving table.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'leaving table.'",
      "SPEECH OUTPUT: 'Line 1'"]))
 
 ######################################################################
@@ -80,7 +82,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to enter the table",
-    ["SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+    [#"SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
      "SPEECH OUTPUT: 'Cell A1'"]))
 
 ######################################################################

Modified: trunk/test/keystrokes/oowriter/bug_382880.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382880.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_382880.py	Sat Jul 19 01:18:59 2008
@@ -28,7 +28,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "This is a test. \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
 
@@ -40,7 +40,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
      "SPEECH OUTPUT: 'Mon'",
@@ -54,13 +54,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a Tab to move to the Tue table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Tue Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Tue Paragraph") + "'",
      "     VISIBLE:  'Tue Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Mon'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: 'Tue'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell C1'"]))
@@ -73,9 +75,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the blank cell C2",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Tue Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Tue Paragraph") + "'",
      "     VISIBLE:  'Tue Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Tue'",
      "SPEECH OUTPUT: ' not selected'",
@@ -91,9 +93,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to cell C3 containing '5'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 5 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 5 Paragraph") + "'",
      "     VISIBLE:  '5 Paragraph', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
@@ -109,13 +111,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a Shift-Tab to move to cell B3 containing '4'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 5 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 5 Paragraph") + "'",
      "     VISIBLE:  '5 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
      "SPEECH OUTPUT: '5'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell B3'"]))
@@ -128,9 +132,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to cell B4 containing '11'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 11 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 11 Paragraph") + "'",
      "     VISIBLE:  '11 Paragraph', cursor=1",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
@@ -146,13 +150,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type an up arrow to move to cell B3 containing '4'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 11 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 11 Paragraph") + "'",
      "     VISIBLE:  '11 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
      "SPEECH OUTPUT: '11'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell B3'"]))

Modified: trunk/test/keystrokes/oowriter/bug_382888.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382888.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_382888.py	Sat Jul 19 01:18:59 2008
@@ -28,7 +28,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the next line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "This is a test. \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "This is a test. \$l") + "'",
      "     VISIBLE:  'This is a test. $l', cursor=16",
      "SPEECH OUTPUT: 'This is a test.'"]))
 
@@ -40,7 +40,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the Mon table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Cell B1'",
      "SPEECH OUTPUT: 'Mon'",
@@ -54,13 +54,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a Tab to move to the Tue table column header",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Mon Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Mon Paragraph") + "'",
      "     VISIBLE:  'Mon Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Tue Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Tue Paragraph") + "'",
      "     VISIBLE:  'Tue Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Mon'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: 'Tue'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell C1'"]))
@@ -73,9 +75,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to the blank cell C2",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Tue Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Tue Paragraph") + "'",
      "     VISIBLE:  'Tue Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
      "SPEECH OUTPUT: 'Tue'",
      "SPEECH OUTPUT: ' not selected'",
@@ -91,9 +93,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to cell C3 containing '5'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table Paragraph") + "'",
      "     VISIBLE:  'Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 5 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 5 Paragraph") + "'",
      "     VISIBLE:  '5 Paragraph', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: ' not selected'",
@@ -109,13 +111,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a Shift-Tab to move to cell B3 containing '4'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 5 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 5 Paragraph") + "'",
      "     VISIBLE:  '5 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
      "SPEECH OUTPUT: '5'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell B3'"]))
@@ -128,9 +132,9 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type a down arrow to move to cell B4 containing '11'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 11 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 11 Paragraph") + "'",
      "     VISIBLE:  '11 Paragraph', cursor=1",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
@@ -146,13 +150,15 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Type an up arrow to move to cell B3 containing '4'",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 11 Paragraph") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 11 Paragraph") + "'",
      "     VISIBLE:  '11 Paragraph', cursor=1",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample", "Calendar-1 Table 4 Paragraph") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "table-sample(.odt|)", "Calendar-1 Table 4 Paragraph") + "'",
      "     VISIBLE:  '4 Paragraph', cursor=1",
      "SPEECH OUTPUT: '11'",
      "SPEECH OUTPUT: ' not selected'",
-     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'table with 7 rows and 7 columns.'",
      "SPEECH OUTPUT: '4'",
      "SPEECH OUTPUT: ' not selected'",
      "SPEECH OUTPUT: 'Cell B3'"]))

Modified: trunk/test/keystrokes/oowriter/bug_384893.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_384893.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_384893.py	Sat Jul 19 01:18:59 2008
@@ -47,7 +47,7 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Type Control-Home to move to start of document",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document", "This is a test \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document(.odt|)", "This is a test \$l") + "'",
      "     VISIBLE:  'This is a test $l', cursor=1",
      "SPEECH OUTPUT: 'This is a test'"]))
 

Modified: trunk/test/keystrokes/oowriter/bug_413909.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_413909.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_413909.py	Sat Jul 19 01:18:59 2008
@@ -97,8 +97,13 @@
      "     VISIBLE:  'Spellcheck:  (English (USA)) Dia', cursor=1",
      "BRAILLE LINE:  'soffice Application Spellcheck:  (English (USA)) Dialog Spellcheck:  (English (USA)) OptionPane Change Button'",
      "     VISIBLE:  'Change Button', cursor=1",
-     "SPEECH OUTPUT: 'Spellcheck:  (English (USA))'",
+# [[[TODO: WDW - StarOffice 8 doesn't give us this.  DEV300_m25 does.]]]
+#
      "SPEECH OUTPUT: 'Misspelled word: quuuiick Context is The quuuiick brown fox'",
+     "SPEECH OUTPUT: 'Spellcheck:  (English (USA))'",
+# [[[TODO: WDW - StarOffice 8 gives us this.  DEV300_m25 does not.]]]
+#
+#     "SPEECH OUTPUT: 'Misspelled word: quuuiick Context is The quuuiick brown fox'",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Change button'"]))
 

Modified: trunk/test/keystrokes/oowriter/bug_435226.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_435226.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_435226.py	Sat Jul 19 01:18:59 2008
@@ -72,7 +72,7 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Type KP-Enter once to do a 'single-click' where-am-I operation",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=17",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'paragraph'",
@@ -89,9 +89,9 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "Type KP-Enter twice to do a 'double-click' where-am-I operation",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=17",
-     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
+     "BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "spanish(.odt|)", "Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! \$l") + "'",
      "     VISIBLE:  'Hm! She is made of harder stuff!', cursor=17",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'paragraph'",

Modified: trunk/test/keystrokes/oowriter/bug_469367.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_469367.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_469367.py	Sat Jul 19 01:18:59 2008
@@ -41,7 +41,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Enter up arrow to position the text caret on the first line",
-    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document", "		   This is a test. \$l") + "'",
+    ["BRAILLE LINE:  '" + utils.getOOoBrailleLine("Writer", "empty_document(.odt|)", "		   This is a test. \$l") + "'",
      "     VISIBLE:  '		   This is a test. $l', cursor=1",
      "SPEECH OUTPUT: '		   This is a test.'"]))
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]