GNOME.org
 

[orca/570658] More work on Gecko tests

commit e1fcf5d025de6cd8576b7a45734a33ceeb9dac62
Author: Willie Walker <william walker sun com>
Date:   Thu May 21 07:11:58 2009 -0400

    More work on Gecko tests
---
 test/keystrokes/firefox/find_wiki.py    |    5 +--
 test/keystrokes/firefox/imagemap.py     |   36 -------------------------------
 test/keystrokes/firefox/page_summary.py |    7 +-----
 3 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/test/keystrokes/firefox/find_wiki.py b/test/keystrokes/firefox/find_wiki.py
index 6013f05..bfa47ea 100644
--- a/test/keystrokes/firefox/find_wiki.py
+++ b/test/keystrokes/firefox/find_wiki.py
@@ -48,10 +48,9 @@ sequence.append(KeyComboAction("<Control>F"))
 sequence.append(utils.AssertPresentationAction(
     "Get into the Find Toolbar", 
     ["BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar  \$l'",
-     "     VISIBLE:  ' $l', cursor=1",
+     "     VISIBLE:  ' $l', cursor=1",
      "BRAILLE LINE:  '" + utils.firefoxAppNames + " Application Orca - GNOME Live! - " + utils.firefoxFrameNames + " Frame ToolBar  \$l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "SPEECH OUTPUT: ''",
+     "     VISIBLE:  ' $l', cursor=1",
      "SPEECH OUTPUT: 'Find: text '"]))
 
 # We won't use an assert here because different builds of Firefox give
diff --git a/test/keystrokes/firefox/imagemap.py b/test/keystrokes/firefox/imagemap.py
index e5fba0f..901f3ec 100644
--- a/test/keystrokes/firefox/imagemap.py
+++ b/test/keystrokes/firefox/imagemap.py
@@ -48,7 +48,6 @@ sequence.append(utils.AssertPresentationAction(
     "2. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'z y x w v u t s r q p o n m l k ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'z link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -58,7 +57,6 @@ sequence.append(utils.AssertPresentationAction(
     "3. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'y x w v u t s r q p o n m l k j ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'y link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -68,7 +66,6 @@ sequence.append(utils.AssertPresentationAction(
     "4. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'x w v u t s r q p o n m l k j i ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'x link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -78,7 +75,6 @@ sequence.append(utils.AssertPresentationAction(
     "5. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'w v u t s r q p o n m l k j i h ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'w link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -88,7 +84,6 @@ sequence.append(utils.AssertPresentationAction(
     "6. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'v u t s r q p o n m l k j i h g ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'v link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -98,7 +93,6 @@ sequence.append(utils.AssertPresentationAction(
     "7. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'u t s r q p o n m l k j i h g f ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'u link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -108,7 +102,6 @@ sequence.append(utils.AssertPresentationAction(
     "8. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  't s r q p o n m l k j i h g f e ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 't link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -118,7 +111,6 @@ sequence.append(utils.AssertPresentationAction(
     "9. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  's r q p o n m l k j i h g f e d ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 's link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -128,7 +120,6 @@ sequence.append(utils.AssertPresentationAction(
     "10. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'r q p o n m l k j i h g f e d c ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'r link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -138,7 +129,6 @@ sequence.append(utils.AssertPresentationAction(
     "11. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'q p o n m l k j i h g f e d c b ', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'q link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -148,7 +138,6 @@ sequence.append(utils.AssertPresentationAction(
     "12. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'p o n m l k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'p link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -158,7 +147,6 @@ sequence.append(utils.AssertPresentationAction(
     "13. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'o n m l k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'o link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -168,7 +156,6 @@ sequence.append(utils.AssertPresentationAction(
     "14. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'n m l k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'n link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -178,7 +165,6 @@ sequence.append(utils.AssertPresentationAction(
     "15. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'm l k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'm link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -188,7 +174,6 @@ sequence.append(utils.AssertPresentationAction(
     "16. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'l k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'l link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -198,7 +183,6 @@ sequence.append(utils.AssertPresentationAction(
     "17. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'k j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'k link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -208,7 +192,6 @@ sequence.append(utils.AssertPresentationAction(
     "18. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'j i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'j link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -218,7 +201,6 @@ sequence.append(utils.AssertPresentationAction(
     "19. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'i h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'i link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -228,7 +210,6 @@ sequence.append(utils.AssertPresentationAction(
     "20. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'h g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'h link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -238,7 +219,6 @@ sequence.append(utils.AssertPresentationAction(
     "21. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'g f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'g link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -248,7 +228,6 @@ sequence.append(utils.AssertPresentationAction(
     "22. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'f e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'f link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -258,7 +237,6 @@ sequence.append(utils.AssertPresentationAction(
     "23. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'e d c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'e link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -268,7 +246,6 @@ sequence.append(utils.AssertPresentationAction(
     "24. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'd c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'd link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -278,7 +255,6 @@ sequence.append(utils.AssertPresentationAction(
     "25. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'c b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'c link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -288,7 +264,6 @@ sequence.append(utils.AssertPresentationAction(
     "26. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'b a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'b link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -298,7 +273,6 @@ sequence.append(utils.AssertPresentationAction(
     "27. Tab",
     ["BRAILLE LINE:  'Test: z y x w v u t s r q p o n m l k j i h g f e d c b a'",
      "     VISIBLE:  'a', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'a link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -308,7 +282,6 @@ sequence.append(utils.AssertPresentationAction(
     "28. Tab",
     ["BRAILLE LINE:  'wk09_frozenmovie Image'",
      "     VISIBLE:  'wk09_frozenmovie Image', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'wk09_frozenmovie link image'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -318,7 +291,6 @@ sequence.append(utils.AssertPresentationAction(
     "29. Tab",
     ["BRAILLE LINE:  'shop.safeway.com Rancher's Reserve'",
      "     VISIBLE:  'shop.safeway.com Rancher's Reser', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'shop.safeway.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -328,7 +300,6 @@ sequence.append(utils.AssertPresentationAction(
     "30. Tab",
     ["BRAILLE LINE:  'shop.safeway.com Rancher's Reserve'",
      "     VISIBLE:  'Rancher's Reserve', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'Rancher's Reserve link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -338,7 +309,6 @@ sequence.append(utils.AssertPresentationAction(
     "31. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.vons.com www.dominicks.com w', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.vons.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -348,7 +318,6 @@ sequence.append(utils.AssertPresentationAction(
     "32. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.dominicks.com www.randalls.c', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.dominicks.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -358,7 +327,6 @@ sequence.append(utils.AssertPresentationAction(
     "33. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.randalls.com www.tomthumb.co', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.randalls.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -368,7 +336,6 @@ sequence.append(utils.AssertPresentationAction(
     "34. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.tomthumb.com www.genuardis.c', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.tomthumb.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -378,7 +345,6 @@ sequence.append(utils.AssertPresentationAction(
     "35. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.genuardis.com www.pavilions.', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.genuardis.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -388,7 +354,6 @@ sequence.append(utils.AssertPresentationAction(
     "36. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.pavilions.com www.carrsqc.co', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.pavilions.com link'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -398,7 +363,6 @@ sequence.append(utils.AssertPresentationAction(
     "37. Tab",
     ["BRAILLE LINE:  'www.vons.com www.dominicks.com www.randalls.com www.tomthumb.com www.genuardis.com www.pavilions.com www.carrsqc.com'",
      "     VISIBLE:  'www.carrsqc.com', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'www.carrsqc.com link'"]))
 
 ########################################################################
diff --git a/test/keystrokes/firefox/page_summary.py b/test/keystrokes/firefox/page_summary.py
index 745dac1..110b948 100644
--- a/test/keystrokes/firefox/page_summary.py
+++ b/test/keystrokes/firefox/page_summary.py
@@ -50,14 +50,9 @@ sequence.append(utils.AssertPresentationAction(
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
      "BRAILLE LINE:  'This is a Heading 6. h6'",
      "     VISIBLE:  'This is a Heading 6. h6', cursor=1",
-     "SPEECH OUTPUT: ''",
      "SPEECH OUTPUT: 'heading level 6'",
      "SPEECH OUTPUT: 'This is a Heading 6.'",
-     "SPEECH OUTPUT: ''",
-     "SPEECH OUTPUT: '14 headings'",
-     "SPEECH OUTPUT: '3 forms'",
-     "SPEECH OUTPUT: '47 tables'",
-     "SPEECH OUTPUT: '19 unvisited links'"]))
+     "SPEECH OUTPUT: '14 headings 3 forms 47 tables 19 unvisited links'"]))
 
 ########################################################################
 # Close the demo
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]