orca r4618 - in trunk: . src/orca test/keystrokes/firefox test/keystrokes/gtk-demo

[wwalker svn gnome org]

Author: wwalker
Date: Mon Mar  2 16:15:30 2009
New Revision: 4618
URL: http://svn.gnome.org/viewvc/orca?rev=4618&view=rev

Log:
Regression test cleanups


Modified:
   trunk/ChangeLog
   trunk/src/orca/default.py
   trunk/test/keystrokes/firefox/uiuc_grid.py
   trunk/test/keystrokes/gtk-demo/role_combo_box.py
   trunk/test/keystrokes/gtk-demo/role_text_multiline_navigation.py

Modified: trunk/src/orca/default.py
==============================================================================
--- trunk/src/orca/default.py	(original)
+++ trunk/src/orca/default.py	Mon Mar  2 16:15:30 2009
@@ -4422,7 +4422,8 @@
                         # first one.  See:
                         # http://www.w3.org/TR/CSS2/fonts.html#font-family-prop
                         #
-                        line = attribute.split(",")[0].strip().strip('"')
+                        localizedValue = \
+                            attribute.split(",")[0].strip().strip('"')
 
                     line = line or (localizedKey + " " + localizedValue)
                     speech.speak(line)

Modified: trunk/test/keystrokes/firefox/uiuc_grid.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_grid.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_grid.py	Mon Mar  2 16:15:30 2009
@@ -35,8 +35,13 @@
     "Tab to grid", 
     ["BRAILLE LINE:  'E-mail List Sorted by Date Caption'",
      "     VISIBLE:  'E-mail List Sorted by Date Capti', cursor=1",
+     "BRAILLE LINE:  'Email 0 Selected CheckBox 1 Cell Read message Image Attachment Image Lowest priority Image John Smith Cell Trip to Florida Cell 2007-10-03 Cell 2K Cell'",
+     "     VISIBLE:  'Email 0 Selected CheckBox 1 Cell', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'E-mail List Sorted by Date table'",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'E-mail List Sorted by Date table'"]))
+     "SPEECH OUTPUT: 'Status column header'",
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida panel'"]))
   
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  

Modified: trunk/test/keystrokes/gtk-demo/role_combo_box.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_combo_box.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_combo_box.py	Mon Mar  2 16:15:30 2009
@@ -201,7 +201,7 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Shift>Tab"))
+sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box with selected text",
@@ -241,14 +241,10 @@
     "Editable text combo box menu",
     ["BRAILLE LINE:  'gtk-demo Application Window'",
      "     VISIBLE:  'gtk-demo Application Window', cursor=22",
-     "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel Menu'",
-     "     VISIBLE:  'Menu', cursor=1",
      "BRAILLE LINE:  'gtk-demo Application Combo boxes Frame Editable Panel  ComboFour One'",
      "     VISIBLE:  'One', cursor=1",
      "SPEECH OUTPUT: 'window'",
      "SPEECH OUTPUT: 'Editable panel'",
-     "SPEECH OUTPUT: 'menu'",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'One'"]))
 
 ########################################################################
@@ -279,13 +275,13 @@
      "SPEECH OUTPUT: 'Editable panel'",
      "SPEECH OUTPUT: 'Two combo box'"]))
 
-sequence.append(KeyComboAction("<Shift>Tab"))
+sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(KeyComboAction("Tab"))
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_COMBO_BOX))
 
 sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Shift>Tab"))
+sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(WaitForFocus(acc_role=pyatspi.ROLE_TEXT))
 sequence.append(utils.AssertPresentationAction(
     "Editable text combo box Two text selected",

Modified: trunk/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
==============================================================================
--- trunk/test/keystrokes/gtk-demo/role_text_multiline_navigation.py	(original)
+++ trunk/test/keystrokes/gtk-demo/role_text_multiline_navigation.py	Mon Mar  2 16:15:30 2009
@@ -1073,8 +1073,8 @@
 sequence.append(utils.AssertPresentationAction(
     "Insert+KP_1 to flat review end of line",
     ["BRAILLE LINE:  'Open & y toggle button Quit panel GTK! $l'",
-     "     VISIBLE:  'l GTK! $l', cursor=3",
-     "SPEECH OUTPUT: 'GTK!'"]))
+     "     VISIBLE:  'l GTK! $l', cursor=6",
+     "SPEECH OUTPUT: 'exclaim'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Subtract"))