orca r3607 - in trunk: . test/keystrokes/oowriter
- From: richb svn gnome org
- To: svn-commits-list gnome org
- Subject: orca r3607 - in trunk: . test/keystrokes/oowriter
- Date: Tue, 19 Feb 2008 22:33:13 +0000 (GMT)
Author: richb
Date: Tue Feb 19 22:33:13 2008
New Revision: 3607
URL: http://svn.gnome.org/viewvc/orca?rev=3607&view=rev
Log:
* /test/keystrokes/oowriter/bug_342602.py:
/test/keystrokes/oowriter/bug_350219.py:
/test/keystrokes/oowriter/bug_353268.py:
/test/keystrokes/oowriter/bug_355733.py:
/test/keystrokes/oowriter/bug_361624.py:
/test/keystrokes/oowriter/bug_361747.py:
Adjusted various oowriter regression tests to use assertions.
Modified:
trunk/ChangeLog
trunk/test/keystrokes/oowriter/bug_342602.py
trunk/test/keystrokes/oowriter/bug_350219.py
trunk/test/keystrokes/oowriter/bug_353268.py
trunk/test/keystrokes/oowriter/bug_355733.py
trunk/test/keystrokes/oowriter/bug_361624.py
trunk/test/keystrokes/oowriter/bug_361747.py
Modified: trunk/test/keystrokes/oowriter/bug_342602.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_342602.py (original)
+++ trunk/test/keystrokes/oowriter/bug_342602.py Tue Feb 19 22:33:13 2008
@@ -1,10 +1,12 @@
#!/usr/bin/python
"""Test to verify bug #342602 is still fixed.
- StarOffice Writer - order of speaking information of table cells is incorrect.
+ StarOffice Writer - order of speaking information of table cells is
+ incorrect.
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -53,25 +55,40 @@
######################################################################
# 5. Enter a and Tab (Inserts "a" into cell A1 and moves to cell B1).
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Table1-1 Table a Paragraph a $l'
-# VISIBLE: 'Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell B1'
-# SPEECH OUTPUT: 'blank'
-#
sequence.append(TypeAction("a"))
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Move to cell B1",
+ ["BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Table1-1 Table a Paragraph'",
+ " VISIBLE: 'a Paragraph', 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",
+ "SPEECH OUTPUT: 'a'",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell B1'",
+ "SPEECH OUTPUT: 'blank'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 6. Enter Shift-Tab (Returns to cell A1).
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Table1-1 Table a Paragraph'
-# VISIBLE: 'a Paragraph', cursor=1
-# SPEECH OUTPUT: 'Cell A1'
-# SPEECH OUTPUT: 'a'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Move back to cell A1",
+ ["BRAILLE LINE: 'soffice Application 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 Table1-1 Table a Paragraph'",
+ " VISIBLE: 'a Paragraph', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: ' not selected'",
+ "SPEECH OUTPUT: 'Cell A1'",
+ "SPEECH OUTPUT: 'a'",
+ "SPEECH OUTPUT: ' not selected'"]))
######################################################################
# 7. Enter Alt-f, Alt-c to close the Writer application.
@@ -101,4 +118,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_350219.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_350219.py (original)
+++ trunk/test/keystrokes/oowriter/bug_350219.py Tue Feb 19 22:33:13 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -17,20 +18,26 @@
######################################################################
# 2. Enter Alt-f, right arrow and Return. (File->New->Text Document).
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane Panel'
-# VISIBLE: 'Panel', cursor=1
-# SPEECH OUTPUT: 'Untitled2 - OpenOffice.org Writer frame'
-# SPEECH OUTPUT: 'panel'
-#
sequence.append(KeyComboAction("<Alt>f"))
sequence.append(WaitForFocus("New", acc_role=pyatspi.ROLE_MENU))
sequence.append(KeyComboAction("Right"))
sequence.append(WaitForFocus("Text Document", acc_role=pyatspi.ROLE_MENU_ITEM))
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Return"))
sequence.append(WaitForWindowActivate("Untitled2 - OpenOffice.org Writer", None))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "New text document",
+ ["BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame'",
+ " VISIBLE: 'Untitled2 - OpenOffice.org Write', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane Panel'",
+ " VISIBLE: 'Panel', cursor=1",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'Untitled2 - OpenOffice.org Writer frame'",
+ "SPEECH OUTPUT: ''",
+ "SPEECH OUTPUT: 'panel'"]))
######################################################################
# 3. Enter Alt-f, Alt-c to close the Writer application.
@@ -46,4 +53,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_353268.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_353268.py (original)
+++ trunk/test/keystrokes/oowriter/bug_353268.py Tue Feb 19 22:33:13 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -41,32 +42,44 @@
######################################################################
# 4. Enter Control-Home to return to the top of the document.
#
-# BRAILLE OUTPUT: '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: 'Line 1'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Return to top 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=1",
+ "SPEECH OUTPUT: 'Line 1'"]))
######################################################################
# 5. Arrow down over the first line of text.
#
-# BRAILLE OUTPUT: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 2 $l'
-# VISIBLE: 'Line 2 $l', cursor=1
-# SPEECH OUTPUT: 'Line 2'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Arrow down over first line of text",
+ ["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=1",
+ "SPEECH OUTPUT: 'Line 2'"]))
######################################################################
# 6. Arrow down over the second line of text.
#
-# BRAILLE OUTPUT: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view Line 2 $l'
-# VISIBLE: ' Line 2 $l', cursor=1
-# SPEECH OUTPUT: 'blank'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("Down"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Arrow down over second line of text",
+ ["BRAILLE LINE: 'Line 2 $l'",
+ " VISIBLE: 'Line 2 $l', cursor=1",
+ "BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view $l'",
+ " VISIBLE: ' $l', cursor=1",
+ "SPEECH OUTPUT: 'blank'"]))
######################################################################
# 7. Enter Alt-f, Alt-c to close the Writer application.
@@ -90,4 +103,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_355733.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_355733.py (original)
+++ trunk/test/keystrokes/oowriter/bug_355733.py Tue Feb 19 22:33:13 2008
@@ -5,6 +5,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -50,24 +51,28 @@
######################################################################
# 4. Enter Control-Home to return to the top of the document.
#
-# 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: 'Line 1'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(utils.AssertPresentationAction(
+ "Return to top 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=1",
+ "SPEECH OUTPUT: 'Line 1'"]))
######################################################################
# 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 Line 4 $l'
-# VISIBLE: 'Line 4 $l', cursor=7
-# SPEECH OUTPUT: 'Line 1'
-# SPEECH OUTPUT: 'Line 2'
-# SPEECH OUTPUT: 'Line 3'
-# SPEECH OUTPUT: 'Line 4'
-#
-sequence.append(KeyComboAction("KP_Plus", 3000))
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Add", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Say all on document",
+ ["SPEECH OUTPUT: 'Line 1'",
+ "SPEECH OUTPUT: 'Line 2'",
+ "SPEECH OUTPUT: 'Line 3'",
+ "SPEECH OUTPUT: 'Line 4'"]))
######################################################################
# 6. Enter Alt-f, Alt-c to close the Writer application.
@@ -91,4 +96,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_361624.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_361624.py (original)
+++ trunk/test/keystrokes/oowriter/bug_361624.py Tue Feb 19 22:33:13 2008
@@ -6,6 +6,7 @@
"""
from macaroon.playback import *
+import utils
sequence = MacroSequence()
@@ -24,44 +25,51 @@
######################################################################
# 3. Type KP-8 to read the first line in flat review mode.
#
-# BRAILLE LINE: 'panel EFFector Vol. 19, No. 38 October $l'
-# VISIBLE: 'EFFector Vol. 19, No. 38 Octobe', cursor=1
-# SPEECH OUTPUT: 'EFFector Vol. 19, No. 38 October '
-# SPEECH OUTPUT: 'panel EFFector Vol. 19, No. 38 October
-# '
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_8", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Read first line in flat review mode",
+ ["BRAILLE LINE: 'panel EFFector Vol. 19, No. 38 October $l'",
+ " VISIBLE: 'EFFector Vol. 19, No. 38 Octobe', cursor=1",
+ "SPEECH OUTPUT: 'panel EFFector Vol. 19, No. 38 October ",
+ "'"]))
######################################################################
# 4. Type KP-9 to read the next line in flat review mode.
#
-# BRAILLE LINE: '10, 2006 editor eff org * EFF Sues for Information on $l'
-# VISIBLE: '10, 2006 editor eff org * EFF S', cursor=1
-# SPEECH OUTPUT: '10, 2006 editor eff org
-# * EFF Sues for Information on '
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_9", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Read line two in flat review mode",
+ ["BRAILLE LINE: '10, 2006 editor eff org * EFF Sues for Information on $l'",
+ " VISIBLE: '10, 2006 editor eff org * EFF S', cursor=1",
+ "SPEECH OUTPUT: '10, 2006 editor eff org",
+ " * EFF Sues for Information on '"]))
######################################################################
# 5. Type KP-9 to read the next line in flat review mode.
#
-# BRAILLE LINE: ' Electronic Surveillance $l'
-# VISIBLE: ' Electronic Surveillance $l', cursor=1
-# SPEECH OUTPUT: '
-# Electronic Surveillance
-#'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_9", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Read line three in flat review mode",
+ ["BRAILLE LINE: ' Electronic Surveillance $l'",
+ " VISIBLE: ' Electronic Surveillance $l', cursor=1",
+ "SPEECH OUTPUT: '",
+ " Electronic Surveillance ",
+ "'"]))
######################################################################
# 6. Type KP-9 to read the next line in flat review mode.
#
-# BRAILLE LINE: 'A Publication of the Electronic Systems $l'
-# VISIBLE: 'A Publication of the Electronic ', cursor=1
-# SPEECH OUTPUT: 'A Publication of the Electronic Systems
-# '
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("KP_9", 3000))
+sequence.append(utils.AssertPresentationAction(
+ "Read line four in flat review mode",
+ ["BRAILLE LINE: 'A Publication of the Electronic Systems $l'",
+ " VISIBLE: 'A Publication of the Electronic ', cursor=1",
+ "SPEECH OUTPUT: 'A Publication of the Electronic Systems",
+ "'"]))
######################################################################
# 7. Enter Alt-f, Alt-c to close the Writer application.
@@ -99,4 +107,6 @@
#
sequence.append(PauseAction(3000))
+sequence.append(utils.AssertionSummaryAction())
+
sequence.start()
Modified: trunk/test/keystrokes/oowriter/bug_361747.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_361747.py (original)
+++ trunk/test/keystrokes/oowriter/bug_361747.py Tue Feb 19 22:33:13 2008
@@ -7,6 +7,7 @@
from macaroon.playback import *
sequence = MacroSequence()
+import utils
######################################################################
# 1. Start oowriter.
@@ -45,53 +46,61 @@
# 4. Enter Control-Home to position the text caret to the left of
# the first character in the line.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'
-# VISIBLE: 'bold italic normal $l'
-# SPEECH OUTPUT: 'bold italic normal'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Home"))
+sequence.append(utils.AssertPresentationAction(
+ "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 bold italic normal $l'",
+ " VISIBLE: 'bold italic normal $l', cursor=1",
+ "SPEECH OUTPUT: 'bold italic normal'"]))
######################################################################
# 5. Type Insert-f to get the text information for the bold word.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'
-# VISIBLE: 'bold italic normal $l' cursor=1
-# 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(
+ "Text information for bold word",
+ ["SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'",
+ "SPEECH OUTPUT: 'bold'"]))
######################################################################
# 6. Type Control-right and Insert-f to get the text information
# for the italic word.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'
-# VISIBLE: 'bold italic normal $l', cursor=7
-# SPEECH OUTPUT: 'size 12'
-# SPEECH OUTPUT: 'family-name Times'
-# SPEECH OUTPUT: 'style italic'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(KeyPressAction (0, 106,"Insert")) # Press Insert
sequence.append(TypeAction ("f"))
sequence.append(KeyReleaseAction(150, 106,"Insert")) # Release Insert
+sequence.append(utils.AssertPresentationAction(
+ "Text information for italic word",
+ ["BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'",
+ " VISIBLE: 'bold italic normal $l', cursor=6",
+ "SPEECH OUTPUT: 'italic '",
+ "SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'",
+ "SPEECH OUTPUT: 'style italic'"]))
######################################################################
# 7. Type Control-right and Insert-f to get the text information
# for the regular word.
#
-# BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'
-# VISIBLE: 'bold italic normal $l', cursor=13
-# SPEECH OUTPUT: 'size 12'
-# SPEECH OUTPUT: 'family-name Times'
-#
+sequence.append(utils.StartRecordingAction())
sequence.append(KeyComboAction("<Control>Right"))
sequence.append(KeyPressAction (0, 106,"Insert")) # Press Insert
sequence.append(TypeAction ("f"))
sequence.append(KeyReleaseAction(150, 106,"Insert")) # Release Insert
+sequence.append(utils.AssertPresentationAction(
+ "Text information for regular word",
+ ["BRAILLE LINE: 'soffice Application Untitled2 - OpenOffice.org Writer Frame Untitled2 - OpenOffice.org Writer RootPane ScrollPane Document view bold italic normal $l'",
+ " VISIBLE: 'bold italic normal $l', cursor=13",
+ "SPEECH OUTPUT: 'normal'",
+ "SPEECH OUTPUT: 'size 12'",
+ "SPEECH OUTPUT: 'family-name Times'"]))
######################################################################
# 8. Enter Alt-f, Alt-c to close the Writer application.
@@ -120,4 +129,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]
