orca r3583 - in trunk: . test/harness test/keystrokes/firefox



Author: shaeger
Date: Fri Feb 15 17:15:28 2008
New Revision: 3583
URL: http://svn.gnome.org/viewvc/orca?rev=3583&view=rev

Log:
Update/added ARIA regression tests.


Added:
   trunk/test/keystrokes/firefox/uiuc_grid.py
   trunk/test/keystrokes/firefox/uiuc_slider.py
   trunk/test/keystrokes/firefox/uiuc_tabpanel.py
Modified:
   trunk/ChangeLog
   trunk/test/harness/utils.py
   trunk/test/keystrokes/firefox/dojo_slider.py
   trunk/test/keystrokes/firefox/dojo_spinner.py
   trunk/test/keystrokes/firefox/dojo_tabcontainer.py
   trunk/test/keystrokes/firefox/moz_menu.py
   trunk/test/keystrokes/firefox/moz_slider.py
   trunk/test/keystrokes/firefox/moz_tabpanel.py
   trunk/test/keystrokes/firefox/uiuc_button.py
   trunk/test/keystrokes/firefox/uiuc_radiobutton.py
   trunk/test/keystrokes/firefox/uiuc_tree.py

Modified: trunk/test/harness/utils.py
==============================================================================
--- trunk/test/harness/utils.py	(original)
+++ trunk/test/harness/utils.py	Fri Feb 15 17:15:28 2008
@@ -5,8 +5,9 @@
 
 # Where to find Dojo tests.
 #
-DojoURLPrefix="http://archive.dojotoolkit.org/dojo-2007-09-20/dojotoolkit/dijit/tests/";
-
+DojoURLPrefix="http://archive.dojotoolkit.org/nightly/dojotoolkit/dijit/tests/";
+#DojoURLPrefix="http://localhost/apache2-default/dojo-release-1.0.0/dijit/tests/";
+#DojoURLPrefix="http://bashautomation.com/dojo-release-1.0.0/dijit/tests/";
 # Where to find our local HTML tests.
 #
 import sys, os

Modified: trunk/test/keystrokes/firefox/dojo_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_slider.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_slider.py	Fri Feb 15 17:15:28 2008
@@ -41,8 +41,8 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'slider 10'"]))
 
@@ -71,8 +71,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "1 move first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
                             
 sequence.append(utils.StartRecordingAction())
@@ -84,8 +84,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "2 move first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
                                
 sequence.append(utils.StartRecordingAction())                      
@@ -97,8 +97,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "3 move first slider", 
-    ["BRAILLE LINE:  '11 Slider Section'",
-     "     VISIBLE:  '11 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '11 Slider'",
+     "     VISIBLE:  '11 Slider', cursor=1",
      "SPEECH OUTPUT: '11'"]))
                            
 sequence.append(utils.StartRecordingAction())
@@ -110,8 +110,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "4 move first slider", 
-    ["BRAILLE LINE:  '11 Slider Section'",
-     "     VISIBLE:  '11 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '11 Slider'",
+     "     VISIBLE:  '11 Slider', cursor=1",
      "SPEECH OUTPUT: '11'"]))
                                
 sequence.append(utils.StartRecordingAction())                  
@@ -123,8 +123,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "5 move first slider", 
-    ["BRAILLE LINE:  '11 Slider Section'",
-     "     VISIBLE:  '11 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '11 Slider'",
+     "     VISIBLE:  '11 Slider', cursor=1",
      "SPEECH OUTPUT: '11'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
@@ -136,8 +136,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "6 move first slider", 
-    ["BRAILLE LINE:  '11 Slider Section'",
-     "     VISIBLE:  '11 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '11 Slider'",
+     "     VISIBLE:  '11 Slider', cursor=1",
      "SPEECH OUTPUT: '11'"]))
                                  
 sequence.append(utils.StartRecordingAction())                     
@@ -149,8 +149,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "7 move first slider", 
-    ["BRAILLE LINE:  '11 Slider Section'",
-     "     VISIBLE:  '11 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '11 Slider'",
+     "     VISIBLE:  '11 Slider', cursor=1",
      "SPEECH OUTPUT: '11'"]))
                                   
 sequence.append(utils.StartRecordingAction())                    
@@ -162,8 +162,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "8 move first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
                              
 sequence.append(utils.StartRecordingAction())                     
@@ -175,8 +175,8 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "9 move first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
                             
 sequence.append(utils.StartRecordingAction())                       
@@ -188,13 +188,13 @@
                            5000))
 sequence.append(utils.AssertPresentationAction(
     "10 move first slider", 
-    ["BRAILLE LINE:  '10 Slider Section'",
-     "     VISIBLE:  '10 Slider Section', cursor=1",
+    ["BRAILLE LINE:  '10 Slider'",
+     "     VISIBLE:  '10 Slider', cursor=1",
      "SPEECH OUTPUT: '10'"]))
 
 ########################################################################
 # Tab to the next entry between the sliders. 
-#
+# bug? not labeling properly.  should be as shown below
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
@@ -213,10 +213,10 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "move to button", 
-    ["BRAILLE LINE:  'Disable previous slider    Button'",
-     "     VISIBLE:  'Disable previous slider    Butto', cursor=1",
+    ["BRAILLE LINE:  'Disable previous slider Button'",
+     "     VISIBLE:  'Disable previous slider Button', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Disable previous slider    button'"]))
+     "SPEECH OUTPUT: 'Disable previous slider button'"]))
      
 ########################################################################
 # Tab to the next slider.  

Modified: trunk/test/keystrokes/firefox/dojo_spinner.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_spinner.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_spinner.py	Fri Feb 15 17:15:28 2008
@@ -36,12 +36,12 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "Tab to the first spinner", 
-    ["BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Spinbox #1:  900 spin button'"]))
+     "SPEECH OUTPUT: 'Spinbox #1:  900 selected spin button'"]))
 
 ########################################################################
 # Use down arrow to decrement spinner value.  
@@ -50,10 +50,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 1", 
-    ["BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -63,10 +63,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 2", 
-    [ "BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -76,10 +76,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 3", 
-    ["BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -89,10 +89,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 4", 
-    ["BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -102,10 +102,10 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner decrement 5", 
-    ["BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  895 $l'",
-     "     VISIBLE:  'Spinbox #1:  895 $l', cursor=17",
+    [ "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  895 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  895 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '895'"]))
 
 ########################################################################
@@ -115,10 +115,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 1", 
-    ["BRAILLE LINE:  'Spinbox #1:  895 $l'",
-     "     VISIBLE:  'Spinbox #1:  895 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  895 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  895 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '896'"]))
 
 ########################################################################
@@ -128,10 +128,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 2", 
-    ["BRAILLE LINE:  'Spinbox #1:  896 $l'",
-     "     VISIBLE:  'Spinbox #1:  896 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
+    [ "BRAILLE LINE:  'Spinbox #1:  896 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  896 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '897'"]))
 
 ########################################################################
@@ -141,10 +141,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 3", 
-    ["BRAILLE LINE:  'Spinbox #1:  897 $l'",
-     "     VISIBLE:  'Spinbox #1:  897 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  897 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  897 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '898'"]))
 
 ########################################################################
@@ -154,10 +154,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 4", 
-    ["BRAILLE LINE:  'Spinbox #1:  898 $l'",
-     "     VISIBLE:  'Spinbox #1:  898 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  898 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  898 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '899'"]))
 
 ########################################################################
@@ -167,10 +167,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 5", 
-    ["BRAILLE LINE:  'Spinbox #1:  899 $l'",
-     "     VISIBLE:  'Spinbox #1:  899 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  899 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  899 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '900'"]))
 
 ########################################################################
@@ -180,10 +180,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 6", 
-    ["BRAILLE LINE:  'Spinbox #1:  900 $l'",
-     "     VISIBLE:  'Spinbox #1:  900 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  901 $l'",
-     "     VISIBLE:  'Spinbox #1:  901 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  900 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  900 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  901 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  901 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '901'"]))
 
 ########################################################################
@@ -193,10 +193,10 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "first spinner increment 7", 
-    ["BRAILLE LINE:  'Spinbox #1:  901 $l'",
-     "     VISIBLE:  'Spinbox #1:  901 $l', cursor=17",
-     "BRAILLE LINE:  'Spinbox #1:  902 $l'",
-     "     VISIBLE:  'Spinbox #1:  902 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  901 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  901 $l not fired ye', cursor=17",
+     "BRAILLE LINE:  'Spinbox #1:  902 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  902 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: '902'"]))
 
 ########################################################################
@@ -207,8 +207,8 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    [ "BRAILLE LINE:  'Spinbox #1:  902 $l'",
-     "     VISIBLE:  'Spinbox #1:  902 $l', cursor=17",
+    ["BRAILLE LINE:  'Spinbox #1:  902 $l not fired yet! $l'",
+     "     VISIBLE:  'Spinbox #1:  902 $l not fired ye', cursor=17",
      "SPEECH OUTPUT: 'Spinbox #1: '",
      "SPEECH OUTPUT: 'spin button'",
      "SPEECH OUTPUT: '902'",

Modified: trunk/test/keystrokes/firefox/dojo_tabcontainer.py
==============================================================================
--- trunk/test/keystrokes/firefox/dojo_tabcontainer.py	(original)
+++ trunk/test/keystrokes/firefox/dojo_tabcontainer.py	Fri Feb 15 17:15:28 2008
@@ -36,8 +36,10 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to tab 2", 
-    [ "BRAILLE LINE:  'Tab 2 Page Tab 3 Page'",
-     "     VISIBLE:  'Tab 2 Page Tab 3 Page', cursor=1",
+    ["BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
+     "     VISIBLE:  'Tab 2 Page Tab 3 Page Programmat', cursor=1",
+     "BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
+     "     VISIBLE:  'Tab 2 Page Tab 3 Page Programmat', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab 2 page'"]))
 
@@ -49,11 +51,11 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Tab 2 Page Tab 3 Page'",
-     "     VISIBLE:  'Tab 2 Page Tab 3 Page', cursor=1",
-     "SPEECH OUTPUT: 'section'",
+    ["BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
+     "     VISIBLE:  'Tab 2 Page Tab 3 Page Programmat', cursor=1",
+     "SPEECH OUTPUT: 'tab list'",
      "SPEECH OUTPUT: 'Tab 2 page'",
-     "SPEECH OUTPUT: 'item 1 of 1'",
+     "SPEECH OUTPUT: 'item 2 of 7'",
      "SPEECH OUTPUT: ''"]))
 
 ########################################################################
@@ -63,7 +65,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BRAILLE LINE:  'Tab 3 Page Programmatically created tab Page'",
+    ["BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
      "     VISIBLE:  'Tab 3 Page Programmatically crea', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Tab 3 page'"]))
@@ -74,7 +76,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to programmatically created tab", 
-    ["BRAILLE LINE:  'Programmatically created tab Page Inlined Sub TabContainer Page'",
+    ["BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
      "     VISIBLE:  'Programmatically created tab Pag', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Programmatically created tab page'"]))
@@ -86,7 +88,7 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to sub tab container", 
-    ["BRAILLE LINE:  'Inlined Sub TabContainer Page Sub TabContainer from href Page'",
+    ["BRAILLE LINE:  'TabList Tab 1 Page Tab 2 Page Tab 3 Page Programmatically created tab Page Inlined Sub TabContainer Page Sub TabContainer from href Page'",
      "     VISIBLE:  'Inlined Sub TabContainer Page Su', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Inlined Sub TabContainer page'"]))
@@ -97,9 +99,11 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to tab 2 contents", 
-    ["BRAILLE LINE:  'SubTab 2 Page'",
+    ["BRAILLE LINE:  'TabList SubTab 1 Page SubTab 2 Page'",
      "     VISIBLE:  'SubTab 2 Page', cursor=1",
-     "SPEECH OUTPUT: ''",
+     "BRAILLE LINE:  'TabList SubTab 1 Page SubTab 2 Page'",
+     "     VISIBLE:  'SubTab 2 Page', cursor=1",
+     "SPEECH OUTPUT: 'Inlined Sub TabContainer scroll pane'",
      "SPEECH OUTPUT: 'SubTab 2 page'"]))
     
 ########################################################################
@@ -109,10 +113,12 @@
 sequence.append(KeyComboAction("Tab"))
 sequence.append(utils.AssertPresentationAction(
     "tab to next tab container", 
-    ["BRAILLE LINE:  'Tab 1 Page  $l Tab 2 Page'",
-     "     VISIBLE:  'Tab 1 Page  $l Tab 2 Page', cursor=1",
+    ["BRAILLE LINE:  'TabList First Page  $l Second Page Third Page  $l'",
+     "     VISIBLE:  'First Page  $l Second Page Third', cursor=1",
+     "BRAILLE LINE:  'TabList First Page  $l Second Page Third Page  $l'",
+     "     VISIBLE:  'First Page  $l Second Page Third', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab 1 page'"]))
+     "SPEECH OUTPUT: 'First page'"]))
 
 ########################################################################
 # Use arrows to move between tabs: 'SubTab1'.  The following will be presented
@@ -126,10 +132,10 @@
 sequence.append(KeyComboAction("Left"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BRAILLE LINE:  'Tab 3 Page  $l'",
-     "     VISIBLE:  'Tab 3 Page  $l', cursor=1",
+    ["BRAILLE LINE:  'First Page TabList  $l Second Page Third Page  $l'",
+     "     VISIBLE:  'Third Page  $l', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab 3 page'"]))
+     "SPEECH OUTPUT: 'Third page'"]))
 
 ########################################################################
 # Close the demo

Modified: trunk/test/keystrokes/firefox/moz_menu.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_menu.py	(original)
+++ trunk/test/keystrokes/firefox/moz_menu.py	Fri Feb 15 17:15:28 2008
@@ -60,17 +60,18 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move to View", 
-    ["BRAILLE LINE:  'View'",
-     "     VISIBLE:  'View', cursor=1",
+    ["BRAILLE LINE:  'Edit View'",
+     "     VISIBLE:  'Edit View', cursor=6",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'View'"]))
     
+# We get flagged because of the unicode.  Everything else seems good.
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Move to Themes", 
-    ["BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
-     "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=0",
+    ["BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â> Themes ÂÂ Â ÂÂ Â>'",
+     "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â> Themes ï', cursor=0",
      "BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
      "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=1",
      "SPEECH OUTPUT: ''",
@@ -82,10 +83,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "Move to basic grey", 
-    ["BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
-     "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=0",
-     "BRAILLE LINE:  'Themes ÂÂ Â ÂÂ Â>'",
-     "     VISIBLE:  'Themes ÂÂ Â ÂÂ Â>', cursor=0",
+    ["BRAILLE LINE:  'Basic Grey '",
+     "     VISIBLE:  'Basic Grey ', cursor=0",
+     "BRAILLE LINE:  'Basic Grey '",
+     "     VISIBLE:  'Basic Grey ', cursor=1",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'menu'",
      "SPEECH OUTPUT: ''",
@@ -189,8 +190,8 @@
 sequence.append(KeyComboAction("Escape"))
 sequence.append(utils.AssertPresentationAction(
     "leave menu", 
-    ["BRAILLE LINE:  'Entry # $l Date $l'",
-     "     VISIBLE:  'Entry # $l Date $l', cursor=0",
+    ["BRAILLE LINE:  'Entry # $l Date $l Expense $l Amount $l Merchant $l Type ColumnHeader'",
+     "     VISIBLE:  'Entry # $l Date $l Expense $l Am', cursor=0",
      "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'table'"]))
 

Modified: trunk/test/keystrokes/firefox/moz_slider.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_slider.py	(original)
+++ trunk/test/keystrokes/firefox/moz_slider.py	Fri Feb 15 17:15:28 2008
@@ -25,140 +25,175 @@
 sequence.append(WaitForFocus("Graphical ARIA Slider", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
 ########################################################################
-# Tab to the slider.  The following will be presented.
-# [[[Bug?: is Braille output correct?]]]
+# Tab to the first slider.  The following will be presented.
 #
-#  BRAILLE LINE:  '0 Move slider left Button 10 Slider Move slider right Button 100'
-#       VISIBLE:  '10 Slider Move slider right Butt', cursor=1
+#  BRAILLE LINE:  '10 Slider'
+#       VISIBLE:  '10 Slider', cursor=1
 # SPEECH OUTPUT: ''
 # SPEECH OUTPUT: 'slider 10'
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("My slider", acc_role=pyatspi.ROLE_SLIDER))
+sequence.append(utils.AssertPresentationAction(
+    "tab to slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'slider 10'"]))
+     
 
 ########################################################################
-# Do a basic "Where Am I" via KP_Enter.  The following should be
-# presented in speech and braille:
-#
-# BRAILLE LINE:  '0 Move slider left Button Move slider right Button 100'
-#      VISIBLE:  '0 Move slider left Button Move s', cursor=0
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'slider'
-# SPEECH OUTPUT: '10.0'
-# SPEECH OUTPUT: '10 percent'
-# SPEECH OUTPUT: ''
+# 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(
+    "basic whereAmI", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'slider'",
+     "SPEECH OUTPUT: '10.0'",
+     "SPEECH OUTPUT: '10 percent'",
+     "SPEECH OUTPUT: ''"]))
 
 ########################################################################
-# Move the slider.  The following will be presented for each.
-#
-#  BRAILLE LINE:  '0 Move slider left Button 15 Slider Move slider right Button 100'
-#       VISIBLE:  '15 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '15'
+# Move the slider several times.  The following will be presented for each.
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Right"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 20 Slider Move slider right Button 100'
-#       VISIBLE:  '20 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '20'                           
+sequence.append(utils.AssertPresentationAction(
+    "0 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 15 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '15 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '15'"]))
+                               
+sequence.append(utils.StartRecordingAction())                       
 sequence.append(KeyComboAction("Right"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 25 Slider Move slider right Button 100'
-#       VISIBLE:  '25 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '25'                           
+sequence.append(utils.AssertPresentationAction(
+    "1 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 20 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '20 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '20'"]))
+                              
+sequence.append(utils.StartRecordingAction())                         
 sequence.append(KeyComboAction("Right"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 30 Slider Move slider right Button 100'
-#       VISIBLE:  '30 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '30'                  
+sequence.append(utils.AssertPresentationAction(
+    "2 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 25 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '25 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '25'"]))
+                                     
+sequence.append(utils.StartRecordingAction())           
 sequence.append(KeyComboAction("Right"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 25 Slider Move slider right Button 100'
-#       VISIBLE:  '25 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '25'                           
+sequence.append(utils.AssertPresentationAction(
+    "3 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 30 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '30 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '30'"]))
+                               
+sequence.append(utils.StartRecordingAction())                        
 sequence.append(KeyComboAction("Left"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 20 Slider Move slider right Button 100'
-#       VISIBLE:  '20 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '20'                           
+sequence.append(utils.AssertPresentationAction(
+    "4 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 25 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '25 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '25'"]))
+                                       
+sequence.append(utils.StartRecordingAction())                  
 sequence.append(KeyComboAction("Left"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 15 Slider Move slider right Button 100'
-#       VISIBLE:  '15 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '15'                           
+sequence.append(utils.AssertPresentationAction(
+    "5 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 20 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '20 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '20'"]))
+                                     
+sequence.append(utils.StartRecordingAction())                    
 sequence.append(KeyComboAction("Left"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
-#  BRAILLE LINE:  '0 Move slider left Button 10 Slider Move slider right Button 100'
-#       VISIBLE:  '10 Slider Move slider right Butt', cursor=1
-# SPEECH OUTPUT: '10'                           
+sequence.append(utils.AssertPresentationAction(
+    "6 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 15 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '15 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '15'"]))                           
+  
+sequence.append(utils.StartRecordingAction())                     
 sequence.append(KeyComboAction("Left"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
+sequence.append(utils.AssertPresentationAction(
+    "7 move slider", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 10 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '10 Slider Move slider right Butt', cursor=1",
+     "SPEECH OUTPUT: '10'"]))   
+                            
 #  Move the slider with the 'end' key.
-#
-#  BRAILLE LINE:  '0 Move slider left Button 100 Slider Move slider right Button 100'
-#       VISIBLE:  '100 Slider Move slider right But', cursor=1
-# SPEECH OUTPUT: '100'                           
+#         
+sequence.append(utils.StartRecordingAction())                
 sequence.append(KeyComboAction("End"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-                           
+sequence.append(utils.AssertPresentationAction(
+    "move slider end", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 100 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '100 Slider Move slider right But', cursor=1",
+     "SPEECH OUTPUT: '100'"]))
+                               
 #  Move the slider with the 'home' key.
-#
-#  BRAILLE LINE:  '0 Move slider left Button 0 Slider Move slider right Button 100'
-#       VISIBLE:  '0 Slider Move slider right But', cursor=1
-# SPEECH OUTPUT: '0'                               
+#                
+sequence.append(utils.StartRecordingAction())              
 sequence.append(KeyComboAction("Home"))
 sequence.append(WaitAction("object:property-change:accessible-value",
                            None,
                            None,
                            pyatspi.ROLE_SLIDER,
                            5000))
-
+sequence.append(utils.AssertPresentationAction(
+    "move slider home", 
+    ["BRAILLE LINE:  '0 Cell Move slider left Button 0 Slider Move slider right Button 100 Cell'",
+     "     VISIBLE:  '0 Slider Move slider right Butto', cursor=1",
+     "SPEECH OUTPUT: '0'"]))
 ########################################################################
 # Close the demo
 #

Modified: trunk/test/keystrokes/firefox/moz_tabpanel.py
==============================================================================
--- trunk/test/keystrokes/firefox/moz_tabpanel.py	(original)
+++ trunk/test/keystrokes/firefox/moz_tabpanel.py	Fri Feb 15 17:15:28 2008
@@ -30,15 +30,6 @@
 sequence.append(PauseAction(1000))
 
 ########################################################################
-# Tab to the tabpanel.
-#
-# File bug for no output
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Tab"))
-sequence.append(utils.AssertPresentationAction(
-    "tab to tabpanel", 
-    [""]))
-########################################################################
 # Do a basic "Where Am I" via KP_Enter.  
 #
 sequence.append(utils.StartRecordingAction())
@@ -46,11 +37,11 @@
 sequence.append(PauseAction(3000))
 sequence.append(utils.AssertPresentationAction(
     "basic whereAmI", 
-    ["BRAILLE LINE:  'Tab One Page Tab Two Page'",
-     "     VISIBLE:  'Tab One Page Tab Two Page', cursor=1",
-     "SPEECH OUTPUT: 'section'",
-     "SPEECH OUTPUT: 'Tab One page'",
-     "SPEECH OUTPUT: 'item 1 of 1'",
+    [ "BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page'",
+     "     VISIBLE:  'Tab Zero  Page Tab One  Page Tab', cursor=1",
+     "SPEECH OUTPUT: 'tab list'",
+     "SPEECH OUTPUT: 'Tab Zero page'",
+     "SPEECH OUTPUT: 'item 1 of 5'",
      "SPEECH OUTPUT: ''"]))
 
 ########################################################################
@@ -60,10 +51,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 2", 
-    ["BRAILLE LINE:  'Tab Two Page Tab Three Page'",
-     "     VISIBLE:  'Tab Two Page Tab Three Page', cursor=1",
+    ["BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page Tab Zero  Tab Zero ScrollPane'",
+     "     VISIBLE:  'Tab One  Page Tab Two  Page Tab ', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab Two page'"]))
+     "SPEECH OUTPUT: 'Tab One  page'"]))
 ########################################################################
 # Move to tab 3
 #
@@ -71,10 +62,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 3", 
-    ["BRAILLE LINE:  'Tab Three Page Tab Four Page'",
-     "     VISIBLE:  'Tab Three Page Tab Four Page', cursor=1",
+    [ "BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page Tab One  Tab One ScrollPane'",
+     "     VISIBLE:  'Tab Two  Page Tab Three  Page Ta', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab Three page'"]))
+     "SPEECH OUTPUT: 'Tab Two  page'"]))
 ########################################################################
 # Move to tab 3 contents
 #
@@ -84,7 +75,7 @@
     "tab to tab 3 contents", 
     ["BRAILLE LINE:  '&=y RadioButton Internal Portal Bookmark & y RadioButton External URL  '",
      "     VISIBLE:  '&=y RadioButton Internal Portal ', cursor=1",
-     "SPEECH OUTPUT: 'Tab Three  Tab Three scroll pane'",
+     "SPEECH OUTPUT: 'Tab Two  Tab Two scroll pane'",
      "SPEECH OUTPUT: 'Internal Portal Bookmark'",
      "SPEECH OUTPUT: 'selected radio button'"]))
 ########################################################################
@@ -94,10 +85,12 @@
 sequence.append(KeyComboAction("<Shift>ISO_Left_Tab"))
 sequence.append(utils.AssertPresentationAction(
     "move back to tab 3", 
-    ["BRAILLE LINE:  'Tab Three Page Tab Four Page'",
-     "     VISIBLE:  'Tab Three Page Tab Four Page', cursor=1",
+    ["BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page'",
+     "     VISIBLE:  'Tab Two  Page Tab Three  Page Ta', cursor=1",
+     "BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page'",
+     "     VISIBLE:  'Tab Two  Page Tab Three  Page Ta', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab Three page'"]))
+     "SPEECH OUTPUT: 'Tab Two  page'"]))
 ########################################################################
 # Move to tab 4
 #
@@ -105,10 +98,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 4", 
-    ["BRAILLE LINE:  'Tab Four Page Tab Five Page'",
-     "     VISIBLE:  'Tab Four Page Tab Five Page', cursor=1",
+    ["BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page Tab Two  Tab Two ScrollPane'",
+     "     VISIBLE:  'Tab Three  Page Tab Four  Page T', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab Four page'"]))
+     "SPEECH OUTPUT: 'Tab Three  page'"]))
 ########################################################################
 # Move to tab 5
 #
@@ -116,10 +109,10 @@
 sequence.append(KeyComboAction("Right"))
 sequence.append(utils.AssertPresentationAction(
     "arrow to tab 5", 
-    ["BRAILLE LINE:  'Tab Five Page'",
-     "     VISIBLE:  'Tab Five Page', cursor=1",
+    ["BRAILLE LINE:  'Tab Zero  Page Tab One  Page Tab Two  Page Tab Three  Page Tab Four  Page'",
+     "     VISIBLE:  'Tab Four  Page', cursor=1",
      "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: 'Tab Five page'"]))
+     "SPEECH OUTPUT: 'Tab Four  page'"]))
 ########################################################################
 # Close the demo
 #

Modified: trunk/test/keystrokes/firefox/uiuc_button.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_button.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_button.py	Fri Feb 15 17:15:28 2008
@@ -19,93 +19,125 @@
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/button/html.php?title=Button%20Example%201&ginc=includes/button1.inc&gcss=css/button1.css&gjs=../js/globals.js,../js/enable_app.js,js/button1.js";))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/button/view_class.php?title=Button%20Example%201&ginc=includes/button1_class.inc&gcss=css/button1_class.css&gjs=../js/globals.js,../js/widgets_class.js,js/button1_class.js";))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
-sequence.append(WaitForFocus("text/html: Button Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(WaitForFocus("class: Button Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
 ########################################################################
 # Tab to the first button.  The following will be presented.
 #
-#  BRAILLE LINE:  ' Reduce Text 1 Button'
-#       VISIBLE:  ' Reduce Text 1 Button', cursor=1
-# SPEECH OUTPUT: 'Button example 1 panel'
-# SPEECH OUTPUT: ' Reduce Text 1 button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(" Reduce Text 1", acc_role=pyatspi.ROLE_PUSH_BUTTON))
+sequence.append(utils.AssertPresentationAction(
+    "tab to first button", 
+    ["BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Font Larger + ToggleButton &', cursor=1",
+     "BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Font Larger + ToggleButton &', cursor=1",
+     "SPEECH OUTPUT: 'Text Formating Controls 1 list'",
+     "SPEECH OUTPUT: 'Font Larger + toggle button not pressed'"]))
 
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  The following should be
 # presented in speech and braille:
 #
-# BRAILLE LINE:  ' Reduce Text 1 Button'
-#      VISIBLE:  ' Reduce Text 1 Button', cursor=1
-# SPEECH OUTPUT: 'Reduce Text 1'
-# SPEECH OUTPUT: 'button'
-# SPEECH OUTPUT: ''
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
 sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
+    "basic whereamI", 
+    ["BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Font Larger + ToggleButton &', cursor=1",
+     "SPEECH OUTPUT: 'Font Larger +'",
+     "SPEECH OUTPUT: 'toggle button'",
+     "SPEECH OUTPUT: 'not pressed'"]))
 
 ########################################################################
 # Now push the first button.  The following will be presented.
 #
 # [[[Bug?: No output when button is pressed.]]]
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
+sequence.append(utils.AssertPresentationAction(
+    "push first button", 
+    [""]))
 
 ########################################################################
 # Tab to the second button.
 #
-# BRAILLE LINE:  ' Enlarge Text 1 Button'
-#      VISIBLE:  ' Enlarge Text 1 Button', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: ' Enlarge Text 1 button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(" Enlarge Text 1", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "tab to second button", 
+    ["BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Font Smaller - ToggleButton ', cursor=1",
+     "BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Font Smaller - ToggleButton ', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Font Smaller - toggle button not pressed'"]))
 ########################################################################
 # Now push the second button.  The following will be presented.
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
+sequence.append(utils.AssertPresentationAction(
+    "push second button", 
+    [""]))
 
 ########################################################################
 # Tab to the third button.
 #
-#  BRAILLE LINE:  ' Italicize Text 1 Button'
-#       VISIBLE:  ' Italicize Text 1 Button', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: ' Italicize Text 1 button'
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(" Italicize Text 1", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "tab to third button", 
+    ["BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Italic i ToggleButton & y Bo', cursor=1",
+     "BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Italic i ToggleButton & y Bo', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Italic i toggle button not pressed'"]))
 ########################################################################
 # Now push the third button.  The following will be presented.
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction(" "))
+sequence.append(utils.AssertPresentationAction(
+    "push third button", 
+    [""]))
 
 ########################################################################
 # Tab to the fourth button.  The following will be presented.
 #
-#  BRAILLE LINE:  ' Bold Text 1 Button'
-#       VISIBLE:  ' Bold Text 1 Button', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: ' Bold Text 1 button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus(" Bold Text 1", acc_role=pyatspi.ROLE_PUSH_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "tab to fourth button", 
+    ["BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Bold B ToggleButton', cursor=1",
+     "BRAILLE LINE:  '& y Font Larger + ToggleButton & y Font Smaller - ToggleButton & y Italic i ToggleButton & y Bold B ToggleButton'",
+     "     VISIBLE:  '& y Bold B ToggleButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Bold B toggle button not pressed'"]))
 ########################################################################
 # Now push the fourth button.  The following will be presented.
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction           ("  "))
+sequence.append(utils.AssertPresentationAction(
+    "push fourth button", 
+    [""]))
 
 ########################################################################
 # Now push the fourth button again.  The following will be presented.
 #
+sequence.append(utils.StartRecordingAction())
 sequence.append(TypeAction           ("  "))
+sequence.append(utils.AssertPresentationAction(
+    "push fourth button again", 
+    [""]))
 
 ########################################################################
 # Close the demo

Added: trunk/test/keystrokes/firefox/uiuc_grid.py
==============================================================================
--- (empty file)
+++ trunk/test/keystrokes/firefox/uiuc_grid.py	Fri Feb 15 17:15:28 2008
@@ -0,0 +1,132 @@
+#!/usr/bin/python
+
+"""Test of UIUC grid presentation using Firefox.
+"""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+########################################################################
+# We wait for the focus to be on the Firefox window as well as for focus
+# to move to the "inline: Grid Example 1" frame.
+#
+sequence.append(WaitForWindowActivate("Minefield",None))
+
+########################################################################
+# Load the UIUC Tab Panel demo.
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/grid/view_inline.php?title=Grid%20Example%201:%20E-mail%20List%20with%20Row%20and%20Column%20Navigation&ginc=includes/grid1_inline.inc&gcss=css/grid1.css&gjs=../js/globals.js,../js/widgets_inline.js,js/grid1.js";))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+
+
+########################################################################
+# Tab to grid
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Tab"))
+sequence.append(utils.AssertPresentationAction(
+    "Tab to grid", 
+    ["BRAILLE LINE:  'E-mail List Sorted by Date $l Sel $l'",
+     "     VISIBLE:  'E-mail List Sorted by Date $l Se', cursor=0",
+     "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 ', 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 ', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'E-mail List Sorted by Date table'",
+     "SPEECH OUTPUT: ''",
+     "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.  
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("KP_Enter"))
+sequence.append(PauseAction(3000))
+sequence.append(utils.AssertPresentationAction(
+    "basic whereAmI", 
+    ["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 ', cursor=1",
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority From John Smith Subject Trip to Florida'",
+     "SPEECH OUTPUT: 'panel'",
+     "SPEECH OUTPUT: '1 Read message Attachment Lowest priority John Smith Trip to Florida'"]))
+    
+########################################################################
+# Move down grid
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "Move down grid", 
+    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  '< > Email 1 Selected CheckBox 2 ', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: '2 New message Attachment Low priority From Fred Jones Subject Lunch on Friday panel'"]))
+    
+########################################################################
+# Move right on second row 1
+#   
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Move right on second row 1", 
+    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  '< > Email 1 Selected CheckBox 2 ', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Email 1 Selected'"]))
+     
+########################################################################
+# Move right on second row 2
+#   
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Move right on second row 2", 
+    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  '2 Cell New message Image Attachm', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: '2'"]))
+     
+########################################################################
+# Move right on second row 3
+#   
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Move right on second row 3", 
+    ["BRAILLE LINE:  '< > Email 1 Selected CheckBox 2 Cell New message Image Attachment Image Low priority Image Fred Jones Cell Lunch on Friday Cell 2007-12-03 Cell 1K Cell'",
+     "     VISIBLE:  'New message Image Attachment Ima', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'New message'"]))
+    
+########################################################################
+# Move down to third row 
+#   
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Down"))
+sequence.append(utils.AssertPresentationAction(
+    "Move down to third row", 
+    ["BRAILLE LINE:  '< > Email 2 Selected CheckBox 3 Cell New message Image None Image Jane Johnson Cell Proposal for you to review Cell 2007-16-03 Cell 12K Cell'",
+     "     VISIBLE:  'New message Image None Image Jan', cursor=1",
+     "SPEECH OUTPUT: '3 New message None From Jane Johnson Subject Proposal for you to review panel'",
+     "SPEECH OUTPUT: 'New message'"]))
+    
+
+########################################################################
+# Close the demo
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("about:blank"))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+# Just a little extra wait to let some events get through.
+#
+sequence.append(PauseAction(3000))
+
+sequence.start()

Modified: trunk/test/keystrokes/firefox/uiuc_radiobutton.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_radiobutton.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_radiobutton.py	Fri Feb 15 17:15:28 2008
@@ -10,7 +10,7 @@
 
 ########################################################################
 # We wait for the focus to be on the Firefox window as well as for focus
-# to move to the "application/xhtml+xml: Radio Example 1" frame.
+# to move to the "inline: Radio Example 1" frame.
 #
 sequence.append(WaitForWindowActivate("Minefield",None))
 
@@ -19,126 +19,120 @@
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/radio/view_xhtml.php?title=Radio%20Example%201&ginc=includes/radio1_xhtml.inc&gcss=css/radio1_xhtml.css&gjs=../js/globals.js,../js/widgets_xhtml.js,js/radio1_xhtml.js";))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/radio/view_inline.php?title=Radio%20Example%201&ginc=includes/radio1_inline.inc&gcss=css/radio1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/radio1_inline.js";))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
-sequence.append(WaitForFocus("application/xhtml+xml: Radio Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
-
-########################################################################
-# Tab to the first radio button group (panel).
-#
-# BRAILLE LINE:  '& y Thai RadioButton'
-#      VISIBLE:  '& y Thai RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Lunch Options panel'
-#
-#sequence.append(KeyComboAction("Tab"))
-#sequence.append(WaitForFocus("Lunch Options", acc_role=pyatspi.ROLE_PANEL))
+sequence.append(WaitForFocus("inline: Radio Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
 ########################################################################
 # Move to the first radio button.
 #
-# BRAILLE LINE:  '& y Thai RadioButton'
-#     VISIBLE:  '& y Thai RadioButton', cursor=1
-# SPEECH OUTPUT: 'Lunch Options panel'
-# SPEECH OUTPUT: 'Thai not selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Thai", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "tab to first button again", 
+    ["BRAILLE LINE:  '& y Thai RadioButton'",
+     "     VISIBLE:  '& y Thai RadioButton', cursor=1",
+     "BRAILLE LINE:  '& y Thai RadioButton'",
+     "     VISIBLE:  '& y Thai RadioButton', cursor=1",
+     "SPEECH OUTPUT: 'Lunch Options panel'",
+     "SPEECH OUTPUT: 'Thai not selected radio button'"]))
 ########################################################################
 # Do a basic "Where Am I" via KP_Enter.  The following should be
 # presented in speech and braille:
 #
-# BRAILLE LINE:  '&=y Thai RadioButton'
-#      VISIBLE:  '&=y Thai RadioButton', cursor=1
-# SPEECH OUTPUT: 'Lunch Options'
-# SPEECH OUTPUT: 'Thai radio button'
-# SPEECH OUTPUT: 'selected'
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: ''
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("KP_Enter"))
-sequence.append(PauseAction(3000))
-
+sequence.append(utils.AssertPresentationAction(
+    "basic whereamI", 
+    ["BRAILLE LINE:  '& y Thai RadioButton'",
+     "     VISIBLE:  '& y Thai RadioButton', cursor=1",
+     "SPEECH OUTPUT: 'Lunch Options'",
+     "SPEECH OUTPUT: 'Thai radio button'",
+     "SPEECH OUTPUT: 'not selected'",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: ''"]))
 ########################################################################
 # Move to the second radio button.
 #
-# BRAILLE LINE:  '&=y Subway RadioButton'
-#      VISIBLE:  '&=y Subway RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Subway selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Subway", acc_role=pyatspi.ROLE_RADIO_BUTTON))
+sequence.append(utils.AssertPresentationAction(
+    "move to second radio button", 
+    ["BRAILLE LINE:  '&=y Subway RadioButton'",
+     "     VISIBLE:  '&=y Subway RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Subway selected radio button'"]))
 
 ########################################################################
 # Move to the third radio button.
 #
-# BRAILLE LINE:  '&=y Jimmy Johns RadioButton'
-#      VISIBLE:  '&=y Jimmy Johns RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Jimmy Johns selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Jimmy Johns", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "move to third radio button", 
+    ["BRAILLE LINE:  '&=y Jimmy Johns RadioButton'",
+     "     VISIBLE:  '&=y Jimmy Johns RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Jimmy Johns selected radio button'"]))
 ########################################################################
 # Move to the fourth radio button.
 #
-# BRAILLE LINE:  '&=y Radio Maria RadioButton'
-#      VISIBLE:  '&=y Radio Maria RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Radio Maria selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Radio Maria", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "move to fourth radio button", 
+    ["BRAILLE LINE:  '&=y Radio Maria RadioButton'",
+     "     VISIBLE:  '&=y Radio Maria RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Radio Maria selected radio button'"]))
 ########################################################################
 # Move to the fifth radio button.
 #
-# BRAILLE LINE:  '&=y Rainbow Gardens RadioButton'
-#      VISIBLE:  '&=y Rainbow Gardens RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Rainbow Gardens selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Rainbow Gardens", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "move to fifth radio button", 
+    ["BRAILLE LINE:  '&=y Rainbow Gardens RadioButton'",
+     "     VISIBLE:  '&=y Rainbow Gardens RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Rainbow Gardens selected radio button'"]))
 ########################################################################
 # Move to the second radio button group (panel).  Contrast to the first group
 # where the "Water" radio button already has been selected.
 #
-# BRAILLE LINE:  '&=y Water RadioButton'
-#      VISIBLE:  '&=y Water RadioButton', cursor=1
-# SPEECH OUTPUT: 'Drink Options panel'
-# SPEECH OUTPUT: 'Water selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Tab"))
-sequence.append(WaitForFocus("Water", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "tab to second radio group", 
+    ["BRAILLE LINE:  '&=y Water RadioButton'",
+     "     VISIBLE:  '&=y Water RadioButton', cursor=1",
+     "BRAILLE LINE:  '&=y Water RadioButton'",
+     "     VISIBLE:  '&=y Water RadioButton', cursor=1",
+     "SPEECH OUTPUT: 'Drink Options panel'",
+     "SPEECH OUTPUT: 'Water selected radio button'"]))
 ########################################################################
 # Move to the second radio button.
 #
-# BRAILLE LINE:  '&=y Tea RadioButton'
-#      VISIBLE:  '&=y Tea RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Tea selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
-sequence.append(WaitForFocus("Tea", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "move to second radio button grp2", 
+    ["BRAILLE LINE:  '&=y Tea RadioButton'",
+     "     VISIBLE:  '&=y Tea RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Tea selected radio button'"]))
 ########################################################################
 # Move back to the first radio button.
 #
-# BRAILLE LINE:  '&=y Water RadioButton'
-#      VISIBLE:  '&=y Water RadioButton', cursor=1
-# SPEECH OUTPUT: ''
-# SPEECH OUTPUT: 'Water selected radio button'
-#
+sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
-sequence.append(WaitForFocus("Water", acc_role=pyatspi.ROLE_RADIO_BUTTON))
-
+sequence.append(utils.AssertPresentationAction(
+    "move back to first radio button grp2", 
+    ["BRAILLE LINE:  '&=y Water RadioButton'",
+     "     VISIBLE:  '&=y Water RadioButton', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Water selected radio button'"]))
 ########################################################################
 # Close the demo
 #

Added: trunk/test/keystrokes/firefox/uiuc_slider.py
==============================================================================
--- (empty file)
+++ trunk/test/keystrokes/firefox/uiuc_slider.py	Fri Feb 15 17:15:28 2008
@@ -0,0 +1,177 @@
+#!/usr/bin/python
+
+"""Test of UIUC slider presentation using Firefox.
+"""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+########################################################################
+# We wait for the focus to be on the Firefox window as well as for focus
+# to move to the "inline: Slider Example 1" frame.
+#
+sequence.append(WaitForWindowActivate("Minefield",None))
+
+########################################################################
+# Load the UIUC Tab Panel demo.
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/slider/view_inline.php?title=Slider%20Example%201&ginc=includes/slider1_inline.inc&gcss=css/slider1.css&gjs=../js/globals.js,../js/widgets_inline.js,js/slider1_inline.js";))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+
+
+########################################################################
+# Tab to slider 1
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Tab"))
+sequence.append(utils.AssertPresentationAction(
+    "Tab to slider 1", 
+    ["BRAILLE LINE:  'Slider Control 1 50 Slider'",
+     "     VISIBLE:  'Slider Control 1 50 Slider', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Slider Control 1 slider 50'"]))
+    
+########################################################################
+# 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(
+    "basic whereAmI", 
+    ["BRAILLE LINE:  'Slider Control 1 50 Slider'",
+     "     VISIBLE:  'Slider Control 1 50 Slider', cursor=1",
+     "SPEECH OUTPUT: 'Slider Control 1'",
+     "SPEECH OUTPUT: 'slider'",
+     "SPEECH OUTPUT: '50.0'",
+     "SPEECH OUTPUT: '50 percent'",
+     "SPEECH OUTPUT: ''"]))
+    
+########################################################################
+# Increment slider several times
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "1 Increment slider 1", 
+    ["BRAILLE LINE:  'Slider Control 1 51 Slider'",
+     "     VISIBLE:  'Slider Control 1 51 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 51 Slider'",
+     "     VISIBLE:  'Slider Control 1 51 Slider', cursor=1",
+     "SPEECH OUTPUT: '51'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "2 Increment slider 1", 
+    ["BRAILLE LINE:  'Slider Control 1 52 Slider'",
+     "     VISIBLE:  'Slider Control 1 52 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 52 Slider'",
+     "     VISIBLE:  'Slider Control 1 52 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 52 Slider'",
+     "     VISIBLE:  'Slider Control 1 52 Slider', cursor=1",
+     "SPEECH OUTPUT: '52'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "3 Increment slider 1", 
+    ["BRAILLE LINE:  'Slider Control 1 53 Slider'",
+     "     VISIBLE:  'Slider Control 1 53 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 53 Slider'",
+     "     VISIBLE:  'Slider Control 1 53 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 53 Slider'",
+     "     VISIBLE:  'Slider Control 1 53 Slider', cursor=1",
+     "SPEECH OUTPUT: '53'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "4 Increment slider 1", 
+    ["BRAILLE LINE:  'Slider Control 1 54 Slider'",
+     "     VISIBLE:  'Slider Control 1 54 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 54 Slider'",
+     "     VISIBLE:  'Slider Control 1 54 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 1 54 Slider'",
+     "     VISIBLE:  'Slider Control 1 54 Slider', cursor=1",
+     "SPEECH OUTPUT: '54'"]))
+    
+########################################################################
+# Tab to slider 2
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Tab"))
+sequence.append(utils.AssertPresentationAction(
+    "Tab to slider 2", 
+    ["BRAILLE LINE:  'Slider Control 2 100 Slider'",
+     "     VISIBLE:  'Slider Control 2 100 Slider', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Slider Control 2 slider 100'"]))
+    
+########################################################################
+# Decrement slider 2 several times
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "1 Decrement slider 2", 
+    ["BRAILLE LINE:  'Slider Control 2 101 Slider'",
+     "     VISIBLE:  'Slider Control 2 101 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 101 Slider'",
+     "     VISIBLE:  'Slider Control 2 101 Slider', cursor=1",
+     "SPEECH OUTPUT: '101'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "2 Decrement slider 2", 
+    ["BRAILLE LINE:  'Slider Control 2 102 Slider'",
+     "     VISIBLE:  'Slider Control 2 102 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 102 Slider'",
+     "     VISIBLE:  'Slider Control 2 102 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 102 Slider'",
+     "     VISIBLE:  'Slider Control 2 102 Slider', cursor=1",
+     "SPEECH OUTPUT: '102'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "3 Decrement slider 2", 
+    ["BRAILLE LINE:  'Slider Control 2 103 Slider'",
+     "     VISIBLE:  'Slider Control 2 103 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 103 Slider'",
+     "     VISIBLE:  'Slider Control 2 103 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 103 Slider'",
+     "     VISIBLE:  'Slider Control 2 103 Slider', cursor=1",
+     "SPEECH OUTPUT: '103'"]))
+    
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "4 Decrement slider 2", 
+    ["BRAILLE LINE:  'Slider Control 2 104 Slider'",
+     "     VISIBLE:  'Slider Control 2 104 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 104 Slider'",
+     "     VISIBLE:  'Slider Control 2 104 Slider', cursor=1",
+     "BRAILLE LINE:  'Slider Control 2 104 Slider'",
+     "     VISIBLE:  'Slider Control 2 104 Slider', cursor=1",
+     "SPEECH OUTPUT: '104'"]))
+
+########################################################################
+# Close the demo
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("about:blank"))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+# Just a little extra wait to let some events get through.
+#
+sequence.append(PauseAction(3000))
+
+sequence.start()

Added: trunk/test/keystrokes/firefox/uiuc_tabpanel.py
==============================================================================
--- (empty file)
+++ trunk/test/keystrokes/firefox/uiuc_tabpanel.py	Fri Feb 15 17:15:28 2008
@@ -0,0 +1,129 @@
+#!/usr/bin/python
+
+"""Test of UIUC tab panel presentation using Firefox.
+"""
+
+from macaroon.playback import *
+import utils
+
+sequence = MacroSequence()
+
+########################################################################
+# We wait for the focus to be on the Firefox window as well as for focus
+# to move to the "inline: Tab Panel Example 1" frame.
+#
+sequence.append(WaitForWindowActivate("Minefield",None))
+
+########################################################################
+# Load the UIUC Tab Panel demo.
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tabpanel/view_inline.php?title=Tab%20Panel%20Example%201&ginc=includes/tabpanel1_inline.inc&gcss=css/tabpanel1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/tabpanel1_inline.js";))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+
+
+
+########################################################################
+# 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(
+    "basic whereAmI", 
+    ["BRAILLE LINE:  'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+     "     VISIBLE:  'Crust Page Veges Page Carnivore ', cursor=1",
+     "SPEECH OUTPUT: 'tab list'",
+     "SPEECH OUTPUT: 'Crust page'",
+     "SPEECH OUTPUT: 'item 1 of 4'",
+     "SPEECH OUTPUT: ''"]))
+
+########################################################################
+# Navigate to second tab
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Navigate to second tab", 
+    ["BRAILLE LINE:  'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+     "     VISIBLE:  'Veges Page Carnivore Page Delive', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Veges page'"]))
+    
+########################################################################
+# Navigate to third tab
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Navigate to third tab", 
+    ["BRAILLE LINE:  'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+     "     VISIBLE:  'Carnivore Page Delivery Page', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Carnivore page'"]))
+
+########################################################################
+# Navigate to fourth tab
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Right"))
+sequence.append(utils.AssertPresentationAction(
+    "Navigate to fourth tab", 
+    ["BRAILLE LINE:  'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+     "     VISIBLE:  'Delivery Page', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Delivery page'"]))
+    
+########################################################################
+# Navigate back to third tab
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Left"))
+sequence.append(utils.AssertPresentationAction(
+    "Navigate to back to third tab", 
+    ["BRAILLE LINE:  'TabList TabList TabList TabList Crust Page Veges Page Carnivore Page Delivery Page'",
+     "     VISIBLE:  'Carnivore Page Delivery Page', cursor=1",
+     "SPEECH OUTPUT: ''",
+     "SPEECH OUTPUT: 'Carnivore page'"]))
+     
+########################################################################
+# Tab into third page
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(KeyComboAction("Tab"))
+sequence.append(utils.AssertPresentationAction(
+    "Tab into third page", 
+    ["BRAILLE LINE:  '< > CheckBox Hamburger'",
+     "     VISIBLE:  '< > CheckBox Hamburger', cursor=1",
+     "SPEECH OUTPUT: 'Carnivore scroll pane'",
+     "SPEECH OUTPUT: 'Hamburger check box not checked'"]))
+    
+########################################################################
+# Press the checkbox
+#
+sequence.append(utils.StartRecordingAction())
+sequence.append(TypeAction           ("  "))
+sequence.append(utils.AssertPresentationAction(
+    "press checkbox", 
+    ["BRAILLE LINE:  '<x> CheckBox Hamburger'",
+     "     VISIBLE:  '<x> CheckBox Hamburger', cursor=1",
+     "BRAILLE LINE:  '< > CheckBox Hamburger'",
+     "     VISIBLE:  '< > CheckBox Hamburger', cursor=1",
+     "SPEECH OUTPUT: 'checked'",
+     "SPEECH OUTPUT: 'not checked'"]))
+
+########################################################################
+# Close the demo
+#
+sequence.append(KeyComboAction("<Control>l"))
+sequence.append(WaitForFocus(acc_name="Location", acc_role=pyatspi.ROLE_ENTRY))
+sequence.append(TypeAction("about:blank"))
+sequence.append(KeyComboAction("Return"))
+sequence.append(WaitForDocLoad())
+# Just a little extra wait to let some events get through.
+#
+sequence.append(PauseAction(3000))
+
+sequence.start()

Modified: trunk/test/keystrokes/firefox/uiuc_tree.py
==============================================================================
--- trunk/test/keystrokes/firefox/uiuc_tree.py	(original)
+++ trunk/test/keystrokes/firefox/uiuc_tree.py	Fri Feb 15 17:15:28 2008
@@ -10,7 +10,7 @@
 
 ########################################################################
 # We wait for the focus to be on the Firefox window as well as for focus
-# to move to the "application/xhtml+xml: Tree Example 1" frame.
+# to move to the "inline: Tree Example 1" frame.
 #
 sequence.append(WaitForWindowActivate("Minefield",None))
 
@@ -19,10 +19,10 @@
 #
 sequence.append(KeyComboAction("<Control>l"))
 sequence.append(WaitForFocus("Location", acc_role=pyatspi.ROLE_ENTRY))
-sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tree/view_html.php?title=Tree%20Example%201&ginc=includes/tree1_inline.inc&gcss=css/tree1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/tree1_inline.js";))
+sequence.append(TypeAction("http://test.cita.uiuc.edu/aria/tree/view_inline.php?title=Tree%20Example%201&ginc=includes/tree1_inline.inc&gcss=css/tree1_inline.css&gjs=../js/globals.js,../js/widgets_inline.js,js/tree1_inline.js";))
 sequence.append(KeyComboAction("Return"))
 sequence.append(WaitForDocLoad())
-sequence.append(WaitForFocus("text/html: Tree Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
+sequence.append(WaitForFocus("inline: Tree Example 1", acc_role=pyatspi.ROLE_DOCUMENT_FRAME))
 
 ########################################################################
 # Tab to the tree.  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]