[orca/gnome-2-28] Update gtk-demo tests to 2.27.x

[William Walker <wwalker src gnome org>]

commit da34fb41ee44c9c84130d1dd429733bd3ac5f702
Author: Willie Walker <william walker sun com>
Date:   Sun Sep 6 11:58:16 2009 -0400

    Update gtk-demo tests to 2.27.x

 test/keystrokes/gtk-demo/role_radio_button.py      |   89 ++++++++++----------
 test/keystrokes/gtk-demo/role_spin_button.py       |    9 +-
 .../gtk-demo/role_text_multiline_navigation.py     |    4 +-
 3 files changed, 52 insertions(+), 50 deletions(-)
---
diff --git a/test/keystrokes/gtk-demo/role_radio_button.py b/test/keystrokes/gtk-demo/role_radio_button.py
index 104926f..c4cfda5 100644
--- a/test/keystrokes/gtk-demo/role_radio_button.py
+++ b/test/keystrokes/gtk-demo/role_radio_button.py
@@ -50,52 +50,55 @@ sequence.append(utils.AssertPresentationAction(
      "SPEECH OUTPUT: 'Range All Pages radio button selected 1 of 3.'",
      "SPEECH OUTPUT: 'Alt a'"]))
 
-########################################################################
-# Down arrow to the "Pages:" radio button.
-# 
-# presented [[[BUG?: when you first arrow to a radio button, we present
-# it as not selected in the tests, but manual testing presents it as
-# selected.  It should be presented as selected.  Something's wrong,
-# but I suspect we're getting a focus event before the state change
-# event.  Because our normal operating mode of Orca is asynchronous,
-# it's likely that the state has already changed by the time we handle
-# the focus event.]]]:
+# WDW - the printing dialog changed for 2.27.x - the pages radio button
+# takes you to the text entry field now.  We'll comment this out for now.
 #
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Pages:", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-sequence.append(utils.AssertPresentationAction(
-    "Range radio button",
-    ["KNOWN ISSUE - the radio button should be presented as selected.",
-     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range & y Pages: RadioButton'",
-     "     VISIBLE:  '& y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Pages: not selected radio button'"]))
-
-########################################################################
-# Do a basic "Where Am I" via KP_Enter.
+#########################################################################
+## Down arrow to the "Pages:" radio button.
+## 
+## presented [[[BUG?: when you first arrow to a radio button, we present
+## it as not selected in the tests, but manual testing presents it as
+## selected.  It should be presented as selected.  Something's wrong,
+## but I suspect we're getting a focus event before the state change
+## event.  Because our normal operating mode of Orca is asynchronous,
+## it's likely that the state has already changed by the time we handle
+## the focus event.]]]:
+##
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Down"))
+#sequence.append(WaitForFocus("Pages:", acc_role=pyatspi.ROLE_RADIO_BUTTON))
+#sequence.append(utils.AssertPresentationAction(
+#    "Range radio button",
+#    ["KNOWN ISSUE - the radio button should be presented as selected.",
+#     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range & y Pages: RadioButton'",
+#     "     VISIBLE:  '& y Pages: RadioButton', cursor=1",
+#     "SPEECH OUTPUT: 'Pages: not selected radio button'"]))
 #
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("KP_Enter"))
-sequence.append(PauseAction(3000))
-sequence.append(utils.AssertPresentationAction(
-    "Range radio button Where Am I",
-    ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range &=y Pages: RadioButton'",
-     "     VISIBLE:  '&=y Pages: RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'Range Pages: radio button selected 3 of 3.'",
-     "SPEECH OUTPUT: 'Alt e'"]))
-
-########################################################################
-# Put everything back and close the demo.
+#########################################################################
+## Do a basic "Where Am I" via KP_Enter.
+##
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("KP_Enter"))
+#sequence.append(PauseAction(3000))
+#sequence.append(utils.AssertPresentationAction(
+#    "Range radio button Where Am I",
+#    ["BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range &=y Pages: RadioButton'",
+#     "     VISIBLE:  '&=y Pages: RadioButton', cursor=1",
+#     "SPEECH OUTPUT: 'Range Pages: radio button selected 3 of 3.'",
+#     "SPEECH OUTPUT: 'Alt e'"]))
 #
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Up"))
-sequence.append(WaitForFocus("All Pages", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-sequence.append(utils.AssertPresentationAction(
-    "All Pages radio button",
-    ["KNOWN ISSUE - the radio button should be presented as selected.",
-     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range & y All Pages RadioButton'",
-     "     VISIBLE:  '& y All Pages RadioButton', cursor=1",
-     "SPEECH OUTPUT: 'All Pages not selected radio button'"]))
+#########################################################################
+## Put everything back and close the demo.
+##
+#sequence.append(utils.StartRecordingAction())
+#sequence.append(KeyComboAction("Up"))
+#sequence.append(WaitForFocus("All Pages", acc_role=pyatspi.ROLE_RADIO_BUTTON))
+#sequence.append(utils.AssertPresentationAction(
+#    "All Pages radio button",
+#    ["KNOWN ISSUE - the radio button should be presented as selected.",
+#     "BRAILLE LINE:  'gtk-demo Application Print Dialog TabList General Page Range & y All Pages RadioButton'",
+#     "     VISIBLE:  '& y All Pages RadioButton', cursor=1",
+#     "SPEECH OUTPUT: 'All Pages not selected radio button'"]))
 
 ########################################################################
 # Go back to the main gtk-demo window and reselect the
diff --git a/test/keystrokes/gtk-demo/role_spin_button.py b/test/keystrokes/gtk-demo/role_spin_button.py
index 122f227..c4e0feb 100644
--- a/test/keystrokes/gtk-demo/role_spin_button.py
+++ b/test/keystrokes/gtk-demo/role_spin_button.py
@@ -78,15 +78,14 @@ sequence.append(WaitAction("object:property-change:accessible-value",
 sequence.append(PauseAction(1000))
 sequence.append(utils.AssertPresentationAction(
     "Hue spin button decrement value",
-    ["KNOWN ISSUE - Value should be 239",
-     "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
+    ["BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=9",
      "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
      "     VISIBLE:  'Hue: 240 $l', cursor=6",
-     "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 240 $l'",
-     "     VISIBLE:  'Hue: 240 $l', cursor=6",
+     "BRAILLE LINE:  'gtk-demo Application Changing color ColorChooser ColorChooser Hue: 239 $l'",
+     "     VISIBLE:  'Hue: 239 $l', cursor=6",
      "SPEECH OUTPUT: '240'",
-     "SPEECH OUTPUT: '240'"]))
+     "SPEECH OUTPUT: '239'"]))
 
 ########################################################################
 # Change the value by arrowing back up.
diff --git a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
index 53ab1be..401b06c 100644
--- a/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
+++ b/test/keystrokes/gtk-demo/role_text_multiline_navigation.py
@@ -1074,8 +1074,8 @@ sequence.append(KeyReleaseAction(0, None, "KP_Insert"))
 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=6",
-     "SPEECH OUTPUT: 'exclaim'"]))
+     "     VISIBLE:  'l GTK! $l', cursor=3",
+     "SPEECH OUTPUT: 'GTK!'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Subtract"))