GNOME.org
 

orca r3679 - in branches/gnome-2-22: . src/orca test/html test/keystrokes/firefox

Author: joanied
Date: Mon Mar  3 05:33:29 2008
New Revision: 3679
URL: http://svn.gnome.org/viewvc/orca?rev=3679&view=rev

Log:
* src/orca/Gecko.py:
  Fix for bug #519931 - Orca does not read certain news feeds
  correctly.

* test/keystrokes/firefox/label_guess_bugzilla_search.py:
  test/keystrokes/firefox/line_nav_bugzilla_search.py:
  test/keystrokes/firefox/line_nav_enter_bug.py:
  test/keystrokes/firefox/line_nav_nested_tables.py:
  test/html/table-caption.html:
  Updated regression tests.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/orca/Gecko.py
   branches/gnome-2-22/test/html/table-caption.html
   branches/gnome-2-22/test/keystrokes/firefox/label_guess_bugzilla_search.py
   branches/gnome-2-22/test/keystrokes/firefox/line_nav_bugzilla_search.py
   branches/gnome-2-22/test/keystrokes/firefox/line_nav_enter_bug.py
   branches/gnome-2-22/test/keystrokes/firefox/line_nav_nested_tables.py

Modified: branches/gnome-2-22/src/orca/Gecko.py
==============================================================================
--- branches/gnome-2-22/src/orca/Gecko.py	(original)
+++ branches/gnome-2-22/src/orca/Gecko.py	Mon Mar  3 05:33:29 2008
@@ -7828,9 +7828,14 @@
                 nOffset += 1
 
             nextExtents = self.getExtents(nextObj, nOffset, nOffset + 1)
+
+            imgOnLine = obj.getRole() == pyatspi.ROLE_IMAGE \
+                     and extents[1] < nextExtents[1] < extents[1] + extents[3]
+                              
             if self.onSameLine(extents, nextExtents) \
                and lastExtents != nextExtents \
-               or nextExtents == (0, 0, 0, 0):
+               or nextExtents == (0, 0, 0, 0) \
+               or imgOnLine:
                 toAdd = self.getObjectsFromEOCs(nextObj, nOffset, boundary)
                 objects.extend(toAdd)
             elif (nextObj.getRole() in [pyatspi.ROLE_SECTION,

Modified: branches/gnome-2-22/test/html/table-caption.html
==============================================================================
--- branches/gnome-2-22/test/html/table-caption.html	(original)
+++ branches/gnome-2-22/test/html/table-caption.html	Mon Mar  3 05:33:29 2008
@@ -5,8 +5,8 @@
 </head><body text="yellow" bgcolor="black">
 <p>Below is a table, with some sample table data</p>
 
-<table>
-<caption><strong><b><font size="29">this is a caption for this table</font></b></strong></caption>
+<table width="100%">
+<caption>this is a caption for this table</caption>
 <thead>
 <tr><th>col1</th><th>col2</th><th>col3</th></tr>
 </thead>
@@ -16,4 +16,4 @@
 <tr><td>7</td><td>8</td><td>9</td></tr>
 </tbody></table>
 <p>hope the table looks pretty</p>
-</body></html>
\ No newline at end of file
+</body></html>

Modified: branches/gnome-2-22/test/keystrokes/firefox/label_guess_bugzilla_search.py
==============================================================================
--- branches/gnome-2-22/test/keystrokes/firefox/label_guess_bugzilla_search.py	(original)
+++ branches/gnome-2-22/test/keystrokes/firefox/label_guess_bugzilla_search.py	Mon Mar  3 05:33:29 2008
@@ -36,9 +36,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla'",
-     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
+    ["BRAILLE LINE:  'Home Link Image Bugzilla New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
+     "     VISIBLE:  'Home Link Image Bugzilla New bug', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'"]))
 
 ########################################################################
 # Press Insert+Tab to move from form field to form field.

Modified: branches/gnome-2-22/test/keystrokes/firefox/line_nav_bugzilla_search.py
==============================================================================
--- branches/gnome-2-22/test/keystrokes/firefox/line_nav_bugzilla_search.py	(original)
+++ branches/gnome-2-22/test/keystrokes/firefox/line_nav_bugzilla_search.py	Mon Mar  3 05:33:29 2008
@@ -36,9 +36,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla'",
-     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
+    ["BRAILLE LINE:  'Home Link Image Bugzilla New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
+     "     VISIBLE:  'Home Link Image Bugzilla New bug', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'"]))
 
 ########################################################################
 # Down Arrow.
@@ -47,14 +47,6 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
-     "     VISIBLE:  'New bug Link  Browse Link  Â', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  Browse link   Search link   Reports link   Account link   Admin link   Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "Line Down",
     ["BRAILLE LINE:  'Â Short Bug Search Form Link Complicated Bug Search Form Â'",
      "     VISIBLE:  'Â Short Bug Search Form Link Co', cursor=1",
      "SPEECH OUTPUT: 'Â Short Bug Search Form link Complicated Bug Search Form Â'"]))

Modified: branches/gnome-2-22/test/keystrokes/firefox/line_nav_enter_bug.py
==============================================================================
--- branches/gnome-2-22/test/keystrokes/firefox/line_nav_enter_bug.py	(original)
+++ branches/gnome-2-22/test/keystrokes/firefox/line_nav_enter_bug.py	Mon Mar  3 05:33:29 2008
@@ -36,9 +36,9 @@
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "Top of file",
-    ["BRAILLE LINE:  'Home Link Image Bugzilla'",
-     "     VISIBLE:  'Home Link Image Bugzilla', cursor=1",
-     "SPEECH OUTPUT: 'Home link image Bugzilla'"]))
+    ["BRAILLE LINE:  'Home Link Image Bugzilla New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
+     "     VISIBLE:  'Home Link Image Bugzilla New bug', cursor=1",
+     "SPEECH OUTPUT: 'Home link image Bugzilla New bug link  Browse link   Search link   Reports link   Account link   Admin link   Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
 
 ########################################################################
 # Down Arrow.
@@ -47,14 +47,6 @@
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "Line Down",
-    ["BRAILLE LINE:  'New bug Link  Browse Link   Search Link   Reports Link   Account Link   Admin Link   Help Link Logged In joanmarie diggs gmail com | Log Out Link'",
-     "     VISIBLE:  'New bug Link  Browse Link   ', cursor=1",
-     "SPEECH OUTPUT: 'New bug link  Browse link   Search link   Reports link   Account link   Admin link   Help link Logged In joanmarie diggs gmail com | Log Out link'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("Down"))
-sequence.append(utils.AssertPresentationAction(
-    "Line Down",
     ["BRAILLE LINE:  'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. h1'",
      "     VISIBLE:  'Enter Bug: orca â This page le', cursor=1",
      "SPEECH OUTPUT: 'Enter Bug: orca â This page lets you enter a new bug into Bugzilla. heading  '",

Modified: branches/gnome-2-22/test/keystrokes/firefox/line_nav_nested_tables.py
==============================================================================
--- branches/gnome-2-22/test/keystrokes/firefox/line_nav_nested_tables.py	(original)
+++ branches/gnome-2-22/test/keystrokes/firefox/line_nav_nested_tables.py	Mon Mar  3 05:33:29 2008
@@ -235,9 +235,9 @@
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "12. line Up",
-    ["BRAILLE LINE:  'nested-tables Link Image'",
-     "     VISIBLE:  'nested-tables Link Image', cursor=1",
-     "SPEECH OUTPUT: 'nested-tables link image'"]))
+    ["BRAILLE LINE:  'nested-tables Link Image Campus Link ÂÂ.ÂÂ Classroom Link ÂÂ.ÂÂ Communicate Link ÂÂ.ÂÂ Reports Link Â'",
+     "     VISIBLE:  'nested-tables Link Image Campus', cursor=1",
+     "SPEECH OUTPUT: 'nested-tables link image Campus Link ÂÂ.ÂÂ Classroom Link ÂÂ.ÂÂ Communicate Link ÂÂ.ÂÂ Reports Link Â'"]))
 
 ########################################################################
 # Move to the location bar by pressing Control+L.  When it has focus
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]