orca r3768 - in trunk: . test/keystrokes/oowriter

[richb svn gnome org]

Author: richb
Date: Wed Mar 26 18:30:57 2008
New Revision: 3768
URL: http://svn.gnome.org/viewvc/orca?rev=3768&view=rev

Log:
        * test/keystrokes/oowriter/bug_469367.py:
          test/keystrokes/oowriter/bug_469367.params: (new)
          Fix for bug #523458 - oowriter/bug_469367.py regression tests #1 
          and #2 produce the wrong results.


Added:
   trunk/test/keystrokes/oowriter/bug_469367.params
Modified:
   trunk/ChangeLog
   trunk/test/keystrokes/oowriter/bug_469367.py

Added: trunk/test/keystrokes/oowriter/bug_469367.params
==============================================================================
--- (empty file)
+++ trunk/test/keystrokes/oowriter/bug_469367.params	Wed Mar 26 18:30:57 2008
@@ -0,0 +1 @@
+PARAMS=$TEST_DIR/empty_document.odt

Modified: trunk/test/keystrokes/oowriter/bug_469367.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_469367.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_469367.py	Wed Mar 26 18:30:57 2008
@@ -11,23 +11,17 @@
 sequence = MacroSequence()
 
 ######################################################################
-# 1. Start oowriter.
+# 1. Start oowriter. There is a bug_469367.params file that will
+#    automatically load empty_document.odt. This uses the FreeSerif
+#    font as the default which should be available on all test systems.
 #
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Writer", None))
+sequence.append(WaitForWindowActivate("empty_document - OpenOffice.org Writer", None))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 
 ######################################################################
-# 2. Enter Alt-f, right arrow and Return.  (File->New->Text Document).
+# 2. Type Control-Home to move the text caret to the start of the document.
 #
-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(KeyComboAction("Return"))
-sequence.append(WaitForWindowActivate("Untitled2 - OpenOffice.org Writer", None))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
+sequence.append(KeyComboAction("<Control>Home"))
 
 ######################################################################
 # 3. Enter two tabs, three spaces and the text "This is a test." followed by
@@ -49,9 +43,9 @@
     "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.'"]))
+     "BRAILLE LINE:  'soffice Application Frame empty_document - 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.
@@ -63,7 +57,7 @@
 sequence.append(utils.AssertPresentationAction(
     "Enter Insert-f to get text information",
     ["SPEECH OUTPUT: 'size 12'",
-     "SPEECH OUTPUT: 'family-name Times'"]))
+     "SPEECH OUTPUT: 'family-name FreeSerif'"]))
 
 ######################################################################
 # 6. Enter Alt-f, Alt-c to close the Writer application.
@@ -88,8 +82,6 @@
 ######################################################################
 # 8. Wait for things to get back to normal.
 #
-sequence.append(WaitForWindowActivate("Untitled1 - OpenOffice.org Writer", None))
-sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(PauseAction(3000))
 
 sequence.append(utils.AssertionSummaryAction())