orca r3613 - in trunk: . test/keystrokes/oowriter
- From: richb svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r3613 - in trunk: . test/keystrokes/oowriter
- Date: Wed, 20 Feb 2008 19:38:42 +0000 (GMT)
Author: richb
Date: Wed Feb 20 19:38:41 2008
New Revision: 3613
URL: http://svn.gnome.org/viewvc/orca?rev=3613&view=rev
Log:
* /test/keystrokes/oowriter/bug_362979.py:
/test/keystrokes/oowriter/bug_364765.py:
/test/keystrokes/oowriter/bug_382408.py:
/test/keystrokes/oowriter/bug_382415.py:
/test/keystrokes/oowriter/bug_382418.py:
/test/keystrokes/oowriter/bug_382880.py:
/test/keystrokes/oowriter/bug_382888.py:
/test/keystrokes/oowriter/bug_384893.py:
/test/keystrokes/oowriter/bug_385828.py:
/test/keystrokes/oowriter/bug_413909.py:
/test/keystrokes/oowriter/bug_430402.py:
/test/keystrokes/oowriter/bug_435201.py:
/test/keystrokes/oowriter/bug_435226.py:
/test/keystrokes/oowriter/bug_450210.py:
/test/keystrokes/oowriter/bug_469367.py:
Adjusted various oowriter regression tests to use assertions.
Modified:
trunk/ChangeLog
trunk/test/keystrokes/oowriter/bug_362979.py
trunk/test/keystrokes/oowriter/bug_364765.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_385828.py
trunk/test/keystrokes/oowriter/bug_413909.py
trunk/test/keystrokes/oowriter/bug_430402.py
trunk/test/keystrokes/oowriter/bug_435201.py
trunk/test/keystrokes/oowriter/bug_435226.py
trunk/test/keystrokes/oowriter/bug_450210.py
trunk/test/keystrokes/oowriter/bug_469367.py
Modified: trunk/test/keystrokes/oowriter/bug_362979.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_362979.py (original)
+++ trunk/test/keystrokes/oowriter/bug_362979.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -71,22 +72,30 @@
# 8. Enter Control-Home to position the text caret to the left of
# the first character on the first line.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view âLine 1 $l'
-# VISIBLE: 'âLine 1 $l', cursor=2
-# SPEECH OUTPUT: 'âLine 1'
-#
+sequence.append(utils.StartRecordingAction())
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: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view âLine 1 $l'",
+ " VISIBLE: 'âLine 1 $l', cursor=2",
+ "SPEECH OUTPUT: 'âLine 1'"]))
######################################################################
# 9. Type a down arrow to go to the second bulleted line.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view âLine 2 $l'
-# VISIBLE: 'âLine 2 $l', cursor=2
-# SPEECH OUTPUT: 'âLine 2'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Move to second bulleted line",
+ ["BRAILLE LINE: 'âLine 1 $l'",
+ " VISIBLE: 'âLine 1 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view âLine 2 $l'",
+ " VISIBLE: 'âLine 2 $l', cursor=2",
+ "SPEECH OUTPUT: 'âLine 2'"]))
######################################################################
# 10. Enter Alt-f, Alt-c to close the Writer application.
@@ -113,4 +122,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_364765.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_364765.py (original)
+++ trunk/test/keystrokes/oowriter/bug_364765.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -24,23 +25,32 @@
######################################################################
# 3. Press W to open the Wizards submenu.
#
-# BRAILLE LINE: 'soffice Application Untitled1 - OpenOffice.org Writer Frame Untitled1 - OpenOffice.org Writer RootPane MenuBar File Menu Letter...'
-# VISIBLE: 'Letter...', cursor=1
-# SPEECH OUTPUT: 'Wizards menu'
-# SPEECH OUTPUT: 'Letter...'
-#
+sequence.append(utils.StartRecordingAction())
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 Untitled1 - OpenOffice.org Writer Frame Untitled1 - OpenOffice.org Writer RootPane MenuBar Wizards Menu'",
+ " VISIBLE: 'Wizards Menu', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled1 - OpenOffice.org Writer Frame Untitled1 - OpenOffice.org Writer RootPane MenuBar File Menu Letter...'",
+ " VISIBLE: 'Letter...', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Wizards menu'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Letter...'"]))
######################################################################
# 4. Press Escape to close the Wizards submenu.
#
-# BRAILLE LINE: 'soffice Application Untitled1 - OpenOffice.org Writer Frame Untitled1 - OpenOffice.org Writer RootPane MenuBar Wizards Menu'
-# VISIBLE: 'Wizards Menu', cursor=1
-# SPEECH OUTPUT: 'Wizards menu'
-#
+sequence.append(utils.StartRecordingAction())
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 Untitled1 - OpenOffice.org Writer Frame Untitled1 - OpenOffice.org Writer RootPane MenuBar Wizards Menu'",
+ " VISIBLE: 'Wizards Menu', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Wizards menu'"]))
######################################################################
# 5. Press Escape to close the File submenu.
@@ -59,4 +69,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_382408.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382408.py (original)
+++ trunk/test/keystrokes/oowriter/bug_382408.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -29,24 +30,31 @@
######################################################################
# 4. Type a down arrow to move to the next line.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: 'This is a test. $l', cursor=16
-# SPEECH OUTPUT: 'This is a test.'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type a down arrow to move to the next line",
+ ["BRAILLE LINE: 'December 2006 $l'",
+ " VISIBLE: 'December 2006 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=16",
+ "SPEECH OUTPUT: 'This is a test.'"]))
######################################################################
# 5. Type a down arrow to move to the Mon table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'
-# VISIBLE: 'Mon Paragraph', cursor=1
-# SPEECH OUTPUT: 'table with 7 rows and 7 columns.'
-# SPEECH OUTPUT: 'Cell B1'
-# SPEECH OUTPUT: 'Mon'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view 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'"]))
######################################################################
# 6. Enter Alt-f, Alt-c to close this Writer application.
@@ -85,4 +93,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_382415.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382415.py (original)
+++ trunk/test/keystrokes/oowriter/bug_382415.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -22,56 +23,86 @@
######################################################################
# 3. Type a down arrow to move to the next line.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: 'This is a test. $l', cursor=16
-# SPEECH OUTPUT: 'This is a test.'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Down arrow to next line",
+ ["BRAILLE LINE: 'December 2006 $l'",
+ " VISIBLE: 'December 2006 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=16",
+ "SPEECH OUTPUT: 'This is a test.'"]))
######################################################################
# 4. Type a down arrow to move to the Mon table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'
-# VISIBLE: 'Mon Paragraph', cursor=1
-# SPEECH OUTPUT: 'table with 7 rows and 7 columns.'
-# SPEECH OUTPUT: 'Cell B1'
-# SPEECH OUTPUT: 'Mon'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Down arrow to move to the Mon table column header",
+ ["BRAILLE LINE: 'This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Cell B1'",
+ "SPEECH OUTPUT: 'Mon'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 5. Type a down arrow to move to the blank table cell on the next row.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'
-# VISIBLE: 'Mon Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B2'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Mon'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B2'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 6. Type a down arrow to move to the "4" table cell on the next row.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'
-# VISIBLE: 'Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B3'
-# SPEECH OUTPUT: '4'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B3'",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 7. Type a down arrow to move to the "11" table cell on the next row.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'
-# VISIBLE: '11 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B4'
-# SPEECH OUTPUT: '11'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'",
+ " VISIBLE: '11 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B4'",
+ "SPEECH OUTPUT: '11'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close this Writer application.
@@ -110,4 +141,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_382418.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382418.py (original)
+++ trunk/test/keystrokes/oowriter/bug_382418.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -57,24 +58,34 @@
# 6. Type Control-Home to move the text caret to the start of the
# document (and leave the table).
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 1 $l'
-# VISIBLE: 'Line 1 $l', cursor=1
-# SPEECH OUTPUT: 'leaving table.'
-# SPEECH OUTPUT: 'Line 1'
-#
+sequence.append(utils.StartRecordingAction())
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: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Table1-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 1 $l'",
+ " VISIBLE: 'Line 1 $l', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'leaving table.'",
+ "SPEECH OUTPUT: 'Line 1'"]))
######################################################################
# 7. Type a down arrow to enter the table.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 1 $l'
-# VISIBLE: ' Line 1 $l', cursor=1
-# SPEECH OUTPUT: 'table with 2 rows and 2 columns.'
-# SPEECH OUTPUT: 'Cell A1'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type a down arrow to enter the table",
+ ["BRAILLE LINE: 'Line 1 $l'",
+ " VISIBLE: 'Line 1 $l', cursor=1",
+ "SPEECH OUTPUT: 'table with 2 rows and 2 columns.'",
+ "SPEECH OUTPUT: 'Cell A1'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close the Writer application.
@@ -101,4 +112,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_382880.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382880.py (original)
+++ trunk/test/keystrokes/oowriter/bug_382880.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -22,89 +23,141 @@
######################################################################
# 3. Type a down arrow to move to the next line.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: 'This is a test. $l', cursor=16
-# SPEECH OUTPUT: 'This is a test.'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type a down arrow to move to the next line",
+ ["BRAILLE LINE: 'December 2006 $l'",
+ " VISIBLE: 'December 2006 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=16",
+ "SPEECH OUTPUT: 'This is a test.'"]))
######################################################################
# 4. Type a down arrow to move to the Mon table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'
-# VISIBLE: 'Mon Paragraph', cursor=1
-# SPEECH OUTPUT: 'table with 7 rows and 7 columns.'
-# SPEECH OUTPUT: 'Cell B1'
-# SPEECH OUTPUT: 'Mon'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Cell B1'",
+ "SPEECH OUTPUT: 'Mon'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 5. Type a Tab to move to the Tue table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Tue Paragraph'
-# VISIBLE: 'Tue Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C1'
-# SPEECH OUTPUT: 'Tue'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view 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.'",
+ "SPEECH OUTPUT: 'Cell C1'",
+ "SPEECH OUTPUT: 'Tue'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 6. Type a down arrow to move to the blank cell C2.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'
-# VISIBLE: 'Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C2'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Tue Paragraph'",
+ " VISIBLE: 'Tue Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Tue'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell C2'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 7. Type a down arrow to move to cell C3 containing "5".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'
-# VISIBLE: '5 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C3'
-# SPEECH OUTPUT: '5'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'",
+ " VISIBLE: '5 Paragraph', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell C3'",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 8. Type a Shift-Tab to move to cell B3 containing "4".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'
-# VISIBLE: '4 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B3'
-# SPEECH OUTPUT: '4'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'",
+ " VISIBLE: '5 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B3'",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 9. Type a down arrow to move to cell B4 containing "11".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'
-# VISIBLE: '11 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B4'
-# SPEECH OUTPUT: '11'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'",
+ " VISIBLE: '11 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B4'",
+ "SPEECH OUTPUT: '11'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 10. Type an up arrow to move to cell B3 containing "4".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'
-# VISIBLE: '4 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B3'
-# SPEECH OUTPUT: '4'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'",
+ " VISIBLE: '11 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '11'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B3'"]))
######################################################################
# 11. Enter Alt-f, Alt-c to close this Writer application.
@@ -144,4 +197,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_382888.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_382888.py (original)
+++ trunk/test/keystrokes/oowriter/bug_382888.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -22,89 +23,141 @@
######################################################################
# 3. Type a down arrow to move to the next line.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: 'This is a test. $l', cursor=16
-# SPEECH OUTPUT: 'This is a test.'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type a down arrow to move to the next line",
+ ["BRAILLE LINE: 'December 2006 $l'",
+ " VISIBLE: 'December 2006 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=16",
+ "SPEECH OUTPUT: 'This is a test.'"]))
######################################################################
# 4. Type a down arrow to move to the Mon table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'
-# VISIBLE: 'Mon Paragraph', cursor=1
-# SPEECH OUTPUT: 'table with 7 rows and 7 columns.'
-# SPEECH OUTPUT: 'Cell B1'
-# SPEECH OUTPUT: 'Mon'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'This is a test. $l'",
+ " VISIBLE: 'This is a test. $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Cell B1'",
+ "SPEECH OUTPUT: 'Mon'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 5. Type a Tab to move to the Tue table column header.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Tue Paragraph'
-# VISIBLE: 'Tue Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C1'
-# SPEECH OUTPUT: 'Tue'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Mon Paragraph'",
+ " VISIBLE: 'Mon Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view 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.'",
+ "SPEECH OUTPUT: 'Cell C1'",
+ "SPEECH OUTPUT: 'Tue'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 6. Type a down arrow to move to the blank cell C2.
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'
-# VISIBLE: 'Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C2'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Tue Paragraph'",
+ " VISIBLE: 'Tue Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "SPEECH OUTPUT: 'Tue'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell C2'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 7. Type a down arrow to move to cell C3 containing "5".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'
-# VISIBLE: '5 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell C3'
-# SPEECH OUTPUT: '5'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table Paragraph'",
+ " VISIBLE: 'Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'",
+ " VISIBLE: '5 Paragraph', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell C3'",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 8. Type a Shift-Tab to move to cell B3 containing "4".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'
-# VISIBLE: '4 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B3'
-# SPEECH OUTPUT: '4'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 5 Paragraph'",
+ " VISIBLE: '5 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '5'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B3'",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 9. Type a down arrow to move to cell B4 containing "11".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'
-# VISIBLE: '11 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B4'
-# SPEECH OUTPUT: '11'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'",
+ " VISIBLE: '11 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B4'",
+ "SPEECH OUTPUT: '11'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 10. Type an up arrow to move to cell B3 containing "4".
#
-# BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'
-# VISIBLE: '4 Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B3'
-# SPEECH OUTPUT: '4'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
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: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 11 Paragraph'",
+ " VISIBLE: '11 Paragraph', cursor=1",
+ "BRAILLE LINE: 'soffice Application table-sample - OpenOffice.org Writer Frame table-sample - OpenOffice.org Writer RootPane ScrollPane Document view Calendar-1 Table 4 Paragraph'",
+ " VISIBLE: '4 Paragraph', cursor=1",
+ "SPEECH OUTPUT: '11'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: '4'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B3'"]))
######################################################################
# 11. Enter Alt-f, Alt-c to close this Writer application.
@@ -143,4 +196,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_384893.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_384893.py (original)
+++ trunk/test/keystrokes/oowriter/bug_384893.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -48,24 +49,26 @@
# 4. Type Control-Home to position the text caret to the left of
# the first character.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test $l'
-# VISIBLE: 'This is a test $l', cursor=1
-# SPEECH OUTPUT: 'This is a test'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-Home to move to start of document",
+ ["BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test $l'",
+ " VISIBLE: 'This is a test $l', cursor=1",
+ "SPEECH OUTPUT: 'This is a test'"]))
######################################################################
# 5. Enter Insert-f to get text information on the underlined word.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test $l'
-# VISIBLE: 'This is a test $l', cursor=1
-# SPEECH OUTPUT: 'size 12'
-# SPEECH OUTPUT: 'family-name Times'
-# SPEECH OUTPUT: 'underline single'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction (0, 106,"Insert")) # Press Insert
sequence.append(TypeAction ("f"))
sequence.append(KeyReleaseAction(150, 106,"Insert")) # Release Insert
+sequence.append(utils.AssertPresentationAction(
+ "Enter Insert-f to get text information on the underlined word",
+ ["SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'",
+ "SPEECH OUTPUT: 'underline single'"]))
######################################################################
# 6. Type Control right arrow three times to position the cursor at
@@ -78,15 +81,15 @@
######################################################################
# 7. Enter Insert-f to get text information on the bold word.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test $l'
-# VISIBLE: 'This is a test $l', cursor=12
-# SPEECH OUTPUT: 'size 12'
-# SPEECH OUTPUT: 'family-name Times'
-# SPEECH OUTPUT: 'bold'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction (0, 106,"Insert")) # Press Insert
sequence.append(TypeAction ("f"))
sequence.append(KeyReleaseAction(150, 106,"Insert")) # Release Insert
+sequence.append(utils.AssertPresentationAction(
+ "Enter Insert-f to get text information on the bold word",
+ ["SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'",
+ "SPEECH OUTPUT: 'bold'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close the Writer application.
@@ -112,4 +115,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_385828.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_385828.py (original)
+++ trunk/test/keystrokes/oowriter/bug_385828.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -29,15 +30,24 @@
######################################################################
# 4. Press "a" to bring up the Agenda... wizard.
#
-# BRAILLE LINE: 'soffice Application Agenda Wizard Dialog Agenda Wizard OptionPane Steps Panel Page design Label'
-# VISIBLE: 'Page design Label', cursor=1
-# SPEECH OUTPUT: 'aw-5blue (read-only) - OpenOffice.org Writer frame'
-# 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'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("a"))
sequence.append(WaitForWindowActivate("aw-5blue (read-only) - OpenOffice.org Writer",None))
sequence.append(WaitForFocus("Page design", acc_role=pyatspi.ROLE_LABEL))
+sequence.append(utils.AssertPresentationAction(
+ "Press 'a' to bring up the Agenda... wizard",
+ ["BRAILLE LINE: 'soffice Application aw-5blue (read-only) - OpenOffice.org Writer Frame'",
+ " VISIBLE: 'aw-5blue (read-only) - OpenOffic', cursor=1",
+ "BRAILLE LINE: 'soffice Application Agenda Wizard Dialog'",
+ " VISIBLE: 'Agenda Wizard Dialog', cursor=1",
+ "BRAILLE LINE: 'soffice Application Agenda Wizard Dialog Agenda Wizard OptionPane Steps Panel Page design $l'",
+ " VISIBLE: 'Page design $l', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'aw-5blue (read-only) - OpenOffice.org Writer frame'",
+ "SPEECH OUTPUT: ''",
+ "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: ''",
+ "SPEECH OUTPUT: 'Page design label'"]))
######################################################################
# 5. Press Escape to put focus back in the document.
@@ -50,4 +60,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_413909.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_413909.py (original)
+++ trunk/test/keystrokes/oowriter/bug_413909.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -45,24 +46,64 @@
# 4. Type Control-Home to position the text caret to the left of
# the first character on the first line.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'
-# VISIBLE: 'The quuuiick brown fox $l', cursor=1
-# SPEECH OUTPUT: 'The quuuiick brown fox'
-#
+sequence.append(utils.StartRecordingAction())
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: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=1",
+ "SPEECH OUTPUT: 'The quuuiick brown fox'"]))
######################################################################
# 5. Enter F7 to bring up the spell checking dialog.
#
-# BRAILLE LINE: 'soffice Application Spellcheck: (English (USA)) Dialog Spellcheck: (English (USA)) OptionPane Change Button'
-# VISIBLE: 'Change Button', cursor=1
-# SPEECH OUTPUT: 'Spellcheck: (English (USA))'
-# SPEECH OUTPUT: 'Misspelled word: quuuiick Context is The quuuiick brown fox'
-# SPEECH OUTPUT: 'Change button'
-#
+sequence.append(utils.StartRecordingAction())
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: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=2",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=3",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=4",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=5",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=23",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=14",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=15",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=16",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=17",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=18",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=19",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=20",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=21",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=22",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quuuiick brown fox $l'",
+ " VISIBLE: 'The quuuiick brown fox $l', cursor=23",
+ "BRAILLE LINE: 'soffice Application Spellcheck: (English (USA)) Dialog'",
+ " 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: ''",
+ "SPEECH OUTPUT: 'Spellcheck: (English (USA))'",
+ "SPEECH OUTPUT: 'Misspelled word: quuuiick Context is The quuuiick brown fox'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Change button'"]))
######################################################################
# 6. Press Esc to dismiss the spell checking dialog.
@@ -93,4 +134,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_430402.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_430402.py (original)
+++ trunk/test/keystrokes/oowriter/bug_430402.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -54,24 +55,29 @@
######################################################################
# 4. Type Control-Home to position the text caret to the left of the
# first character.
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quick $l'
-# VISIBLE: 'The quick $l', cursor=1
-# SPEECH OUTPUT: 'The quick'
#
+sequence.append(utils.StartRecordingAction())
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: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view The quick $l'",
+ " VISIBLE: 'The quick $l', cursor=1",
+ "SPEECH OUTPUT: 'The quick'"]))
######################################################################
# 5. Enter KP+ to perform a "say all" on the document.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view the lazy dog $l'
-# VISIBLE: 'the lazy dog $l', cursor=13
-# SPEECH OUTPUT: 'The quick'
-# SPEECH OUTPUT: 'brown'
-# SPEECH OUTPUT: 'fox jumps over'
-# SPEECH OUTPUT: 'the lazy dog'
-#
-sequence.append(KeyComboAction("KP_Plus", 3000))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Add", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Enter KP+ to perform a 'say all' on the document",
+ ["SPEECH OUTPUT: 'The quick'",
+ "SPEECH OUTPUT: 'brown'",
+ "SPEECH OUTPUT: 'fox jumps over'",
+ "SPEECH OUTPUT: 'the lazy dog'"]))
######################################################################
# 6. Enter Alt-f, Alt-c to close the Writer application.
@@ -96,4 +102,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_435201.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_435201.py (original)
+++ trunk/test/keystrokes/oowriter/bug_435201.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -18,62 +19,121 @@
# 2. Type Control-Home to position the text caret to the left of the
# first character on the first line.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and $l'
-# VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1
-# SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and '
-#
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
######################################################################
# 3. Type Control-down to move to the next paragraph.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'
-# VISIBLE: ' NOBODY expects the Spanish Inqui', cursor=1
-# SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse '
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-down to move to the next paragraph [1]",
+ ["BUG: speaks the paragraph three times",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=2",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1",
+ "BRAILLE LINE: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1",
+ "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and '",
+ "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Our chief weapon is surprise. Surprise and '",
+ "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse '"]))
######################################################################
# 4. Type Control-down to move to the next paragraph.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'
-# VISIBLE: ' NOBODY expects the Spanish Inqu', cursor=1
-# SPEECH OUTPUT: 'blank'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-down to move to the next paragraph [2]",
+ ["BUG: speaks the paragraph two times",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=2",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1",
+ "BRAILLE LINE: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse $l'",
+ " VISIBLE: 'NOBODY expects the Spanish Inqui', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse '",
+ "SPEECH OUTPUT: 'NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse '",
+ "SPEECH OUTPUT: 'blank'"]))
######################################################################
# 5. Type Control-down to move to the next paragraph.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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
-# SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject '
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-down to move to the next paragraph [3]",
+ ["BUG: speaks the paragraph two times",
+ "BRAILLE LINE: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: '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: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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",
+ "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject '",
+ "SPEECH OUTPUT: 'blank'",
+ "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject '"]))
######################################################################
# 6. Type Control-down to move to the next paragraph.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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
-# SPEECH OUTPUT: 'blank'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-down to move to the next paragraph [4]",
+ ["BUG: speaks the paragraph two times",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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=2",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: '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: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject '",
+ "SPEECH OUTPUT: 'Now old lady, you have one last chance. Confess the heinous sin of heresy, reject '",
+ "SPEECH OUTPUT: 'blank'"]))
######################################################################
# 7. Type Control-down to move to the next paragraph.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! $l'
-# VISIBLE: 'Hm! She is made of harder stuff!', cursor=1
-# SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Type Control-down to move to the next paragraph [5]",
+ ["BUG: speaks the paragraph two times",
+ "BRAILLE LINE: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: '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: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR! $l'",
+ " VISIBLE: 'Hm! She is made of harder stuff!', cursor=1",
+ "SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'",
+ "SPEECH OUTPUT: 'blank'",
+ "SPEECH OUTPUT: 'Hm! She is made of harder stuff! Cardinal Fang! Fetch the COMFY CHAIR!'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close the Writer application.
@@ -112,4 +172,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_435226.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_435226.py (original)
+++ trunk/test/keystrokes/oowriter/bug_435226.py Wed Feb 20 19:38:41 2008
@@ -10,6 +10,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -66,27 +67,42 @@
######################################################################
# 7. Type KP-Enter once to do a "single-click" where-am-I operation.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: 'paragraph'
-# SPEECH OUTPUT: 'Hm! She is made '
-# SPEECH OUTPUT: 'selected'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
+ "Type KP-Enter once to do a 'single-click' where-am-I operation",
+ ["BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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'",
+ "SPEECH OUTPUT: 'Hm! She is made '",
+ "SPEECH OUTPUT: 'selected'",
+ "SPEECH OUTPUT: ''"]))
######################################################################
# 8. Type KP-Enter twice to do a "double-click" where-am-I operation.
#
-# BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: 'paragraph'
-# SPEECH OUTPUT: 'Spanish Inquisition! Our chief weapon is surprise. Surprise and fear. Fear and surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three weapons are fear, surprise, and ruthless efficiency. And an almost fanatical devotion to the Pope. Our four. No. Amongst our weapons. Amongst our weaponry, are such elements as fear, surprise. I'll come in again. NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse elements as: fear, surprise, ruthless efficiency, an almost fanatical devotion to the Pope, and nice red uniforms - Oh damn! 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. Hm! She is made '
-# SPEECH OUTPUT: 'selected'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(KeyComboAction("KP_Enter"))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
+ "Type KP-Enter twice to do a 'double-click' where-am-I operation",
+ ["BRAILLE LINE: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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: 'soffice Application spanish - OpenOffice.org Writer Frame spanish - OpenOffice.org Writer RootPane ScrollPane Document view 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'",
+ "SPEECH OUTPUT: 'Hm! She is made '",
+ "SPEECH OUTPUT: 'selected'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'paragraph'",
+ "SPEECH OUTPUT: 'Spanish Inquisition! Our chief weapon is surprise. Surprise and fear. Fear and surprise. Our two weapons are fear and surprise. And ruthless efficiency. Our three weapons are fear, surprise, and ruthless efficiency. And an almost fanatical devotion to the Pope. Our four. No. Amongst our weapons. Amongst our weaponry, are such elements as fear, surprise. I'll come in again. NOBODY expects the Spanish Inquisition! Amongst our weaponry are such diverse elements as: fear, surprise, ruthless efficiency, an almost fanatical devotion to the Pope, and nice red uniforms - Oh damn! 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. Hm! She is made '",
+ "SPEECH OUTPUT: 'selected'",
+ "SPEECH OUTPUT: ''"]))
######################################################################
# 9. Enter Alt-f, Alt-c to close the Writer application.
@@ -124,4 +140,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_450210.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_450210.py (original)
+++ trunk/test/keystrokes/oowriter/bug_450210.py Wed Feb 20 19:38:41 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -23,18 +24,23 @@
######################################################################
# 3. Press "o" to open the Open File Chooser.
#
-# BRAILLE LINE: 'soffice Application Open Dialog ScrollPane Files Table'
-# VISIBLE: 'Files Table', cursor=1
-# SPEECH OUTPUT: 'Open Version:'
-# SPEECH OUTPUT: 'Location: text '
-# SPEECH OUTPUT: 'Files table'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(TypeAction("o"))
sequence.append(WaitAction("focus:",
None,
None,
pyatspi.ROLE_TABLE,
30000))
+sequence.append(utils.AssertPresentationAction(
+ "Press 'o' to open the Open File Chooser",
+ ["BRAILLE LINE: 'soffice Application Open Dialog'",
+ " VISIBLE: 'soffice Application Open Dialog', cursor=21",
+ "BRAILLE LINE: 'soffice Application Open Dialog Location: $l'",
+ " VISIBLE: 'Location: $l', cursor=11",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Open Version:'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Location: text '"]))
######################################################################
# 4. Press Escape to dismiss the Open File Chooser.
@@ -47,4 +53,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_469367.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_469367.py (original)
+++ trunk/test/keystrokes/oowriter/bug_469367.py Wed Feb 20 19:38:41 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -41,29 +42,28 @@
######################################################################
# 4. Enter up arrow to position the text caret on the first line.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: ' This is a test. $l', cursor=1
-# SPEECH OUTPUT: '3 spaces 2 tabs '
-# SPEECH OUTPUT: ' This is a test.
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Up"))
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: ' $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'",
+ " VISIBLE: ' This is a test. $l', cursor=1",
+ "SPEECH OUTPUT: ' This is a test.'"]))
######################################################################
# 5. Enter Insert-f to get text information.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view This is a test. $l'
-# VISIBLE: ' This is a test. $l', cursor=1
-# SPEECH OUTPUT: 'size 12'
-# SPEECH OUTPUT: 'family-name Thorndale'
-# SPEECH OUTPUT: 'indent 0'
-# SPEECH OUTPUT: 'left-margin 0 pixels'
-# SPEECH OUTPUT: 'right-margin 0 pixels'
-# SPEECH OUTPUT: 'strikethrough false'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyPressAction (0, 106,"Insert")) # Press Insert
sequence.append(TypeAction ("f"))
sequence.append(KeyReleaseAction(150, 106,"Insert")) # Release Insert
+sequence.append(utils.AssertPresentationAction(
+ "Enter Insert-f to get text information",
+ ["SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'"]))
######################################################################
# 6. Enter Alt-f, Alt-c to close the Writer application.
@@ -75,7 +75,6 @@
# We'll get a new window, but we'll wait for the "Save" button to get focus.
#
-#sequence.append(WaitForWindowActivate("OpenOffice.org 2.3 ",None))
sequence.append(WaitForFocus("Save", acc_role=pyatspi.ROLE_PUSH_BUTTON))
######################################################################
@@ -93,4 +92,6 @@
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
