GNOME.org
 

[orca] Updated tests

commit 8d7dfee48480a8481173ecadbea9bddd193a5a28
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Fri Oct 9 13:42:48 2015 -0400

    Updated tests

 test/keystrokes/firefox/line_nav_bug_552887a.py    |   16 +++++++-------
 test/keystrokes/firefox/line_nav_bug_554616.py     |    4 +++
 .../firefox/line_nav_follow_same_page_link.py      |    4 +-
 .../firefox/line_nav_follow_same_page_link_2.py    |   11 +++------
 .../keystrokes/firefox/line_nav_iframes_blogger.py |    4 ++-
 test/keystrokes/firefox/line_nav_iframes_nested.py |   14 +++++-------
 test/keystrokes/firefox/line_nav_simple_form.py    |   23 ++++++++++---------
 test/keystrokes/firefox/line_nav_sun_java.py       |    2 +-
 8 files changed, 40 insertions(+), 38 deletions(-)
---
diff --git a/test/keystrokes/firefox/line_nav_bug_552887a.py b/test/keystrokes/firefox/line_nav_bug_552887a.py
index 51b55ef..e47d217 100644
--- a/test/keystrokes/firefox/line_nav_bug_552887a.py
+++ b/test/keystrokes/firefox/line_nav_bug_552887a.py
@@ -59,7 +59,7 @@ sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
     ["BRAILLE LINE:  'Can an Orca really'",
      "     VISIBLE:  'Can an Orca really', cursor=1",
-     "SPEECH OUTPUT: 'link Can an Orca really'"]))
+     "SPEECH OUTPUT: 'Can an Orca really link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -67,7 +67,7 @@ sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
     ["BRAILLE LINE:  'hold a white cane?'",
      "     VISIBLE:  'hold a white cane?', cursor=1",
-     "SPEECH OUTPUT: 'link hold a white cane?'"]))
+     "SPEECH OUTPUT: 'hold a white cane? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -75,7 +75,7 @@ sequence.append(utils.AssertPresentationAction(
     "8. Line Down",
     ["BRAILLE LINE:  '\(And why aren't we'",
      "     VISIBLE:  '\(And why aren't we', cursor=1",
-     "SPEECH OUTPUT: 'link \(And why aren't we'"]))
+     "SPEECH OUTPUT: '\(And why aren't we link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -83,7 +83,7 @@ sequence.append(utils.AssertPresentationAction(
     "9. Line Down",
     ["BRAILLE LINE:  'speaking this text?'",
      "     VISIBLE:  'speaking this text?', cursor=1",
-     "SPEECH OUTPUT: 'link speaking this text?'"]))
+     "SPEECH OUTPUT: 'speaking this text? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -179,7 +179,7 @@ sequence.append(utils.AssertPresentationAction(
     "21. Line Up",
     ["BRAILLE LINE:  'speaking this text?'",
      "     VISIBLE:  'speaking this text?', cursor=1",
-     "SPEECH OUTPUT: 'link speaking this text?'"]))
+     "SPEECH OUTPUT: 'speaking this text? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -187,7 +187,7 @@ sequence.append(utils.AssertPresentationAction(
     "22. Line Up",
     ["BRAILLE LINE:  '\(And why aren't we'",
      "     VISIBLE:  '\(And why aren't we', cursor=1",
-     "SPEECH OUTPUT: 'link \(And why aren't we'"]))
+     "SPEECH OUTPUT: '\(And why aren't we link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -195,7 +195,7 @@ sequence.append(utils.AssertPresentationAction(
     "23. Line Up",
     ["BRAILLE LINE:  'hold a white cane?'",
      "     VISIBLE:  'hold a white cane?', cursor=1",
-     "SPEECH OUTPUT: 'link hold a white cane?'"]))
+     "SPEECH OUTPUT: 'hold a white cane? link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -203,7 +203,7 @@ sequence.append(utils.AssertPresentationAction(
     "24. Line Up",
     ["BRAILLE LINE:  'Can an Orca really'",
      "     VISIBLE:  'Can an Orca really', cursor=1",
-     "SPEECH OUTPUT: 'link Can an Orca really'"]))
+     "SPEECH OUTPUT: 'Can an Orca really link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_554616.py b/test/keystrokes/firefox/line_nav_bug_554616.py
index e31f6be..f2ae93b 100644
--- a/test/keystrokes/firefox/line_nav_bug_554616.py
+++ b/test/keystrokes/firefox/line_nav_bug_554616.py
@@ -8,6 +8,10 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(WaitForDocLoad())
+
+# Work around some new quirk in Gecko that causes this test to fail if
+# run via the test harness rather than manually.
+sequence.append(KeyComboAction("<Control>r"))
 sequence.append(KeyComboAction("Tab"))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
index 85c270b..59d3357 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link.py
@@ -49,9 +49,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "5. Down",
-    ["BRAILLE LINE:  'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations'",
+    ["BRAILLE LINE:  'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt'",
      "     VISIBLE:  'Orca are versatile and opportuni', cursor=1",
-     "SPEECH OUTPUT: 'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations'"]))
+     "SPEECH OUTPUT: 'Orca are versatile and opportunistic predators. Some populations feed mostly on fish, 
and other populations hunt'"]))
 
 sequence.append(utils.AssertionSummaryAction())
 sequence.start()
diff --git a/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py 
b/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
index 7863541..be85ce2 100644
--- a/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
+++ b/test/keystrokes/firefox/line_nav_follow_same_page_link_2.py
@@ -8,16 +8,13 @@ import utils
 sequence = MacroSequence()
 
 sequence.append(WaitForDocLoad())
-
-# Work around some new quirk in Gecko that causes this test to fail if
-# run via the test harness rather than manually.
-sequence.append(KeyComboAction("<Control>r"))
-sequence.append(PauseAction(3000))
 sequence.append(KeyComboAction("<Control>Home"))
-for i in range(25):
+sequence.append(KeyComboAction("H"))
+sequence.append(KeyComboAction("H"))
+for i in range(5):
     sequence.append(KeyComboAction("Tab"))
+    sequence.append(PauseAction(1000))
 
-sequence.append(PauseAction(5000))
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Return"))
 sequence.append(utils.AssertPresentationAction(
diff --git a/test/keystrokes/firefox/line_nav_iframes_blogger.py 
b/test/keystrokes/firefox/line_nav_iframes_blogger.py
index cd01def..2231a28 100644
--- a/test/keystrokes/firefox/line_nav_iframes_blogger.py
+++ b/test/keystrokes/firefox/line_nav_iframes_blogger.py
@@ -9,12 +9,14 @@ sequence = MacroSequence()
 
 sequence.append(WaitForDocLoad())
 
+sequence.append(KeyComboAction("<Control>Home"))
+
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("e"))
 sequence.append(utils.AssertPresentationAction(
     "1. E for next entry",
     ["BRAILLE LINE:  'Search  $l'",
-     "     VISIBLE:  'Search  $l', cursor=0",
+     "     VISIBLE:  'Search  $l', cursor=8",
      "SPEECH OUTPUT: 'Search entry'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_iframes_nested.py 
b/test/keystrokes/firefox/line_nav_iframes_nested.py
index bae227c..b641f29 100644
--- a/test/keystrokes/firefox/line_nav_iframes_nested.py
+++ b/test/keystrokes/firefox/line_nav_iframes_nested.py
@@ -17,11 +17,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "1. Top of file",
-    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button '",
-     "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
-     "BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+'",
-     "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
-     "SPEECH OUTPUT: 'Click here to publicly \+1 this. push button'",
+    ["BRAILLE LINE:  '\+1 push button [0-9]+'",
+     "     VISIBLE:  '\+1 push button [0-9]+', cursor=1",
+     "SPEECH OUTPUT: '\+1 push button'",
      "SPEECH OUTPUT: '[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -36,9 +34,9 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Home"))
 sequence.append(utils.AssertPresentationAction(
     "3. Top of file",
-    ["BRAILLE LINE:  'Click here to publicly \+1 this. push button [0-9]+'",
-     "     VISIBLE:  'Click here to publicly \+1 this. ', cursor=1",
-     "SPEECH OUTPUT: 'Click here to publicly \+1 this. push button'",
+    ["BRAILLE LINE:  '\+1 push button [0-9]+'",
+     "     VISIBLE:  '\+1 push button [0-9]+', cursor=1",
+     "SPEECH OUTPUT: '\+1 push button'",
      "SPEECH OUTPUT: '[0-9]+'"]))
 
 sequence.append(utils.StartRecordingAction())
diff --git a/test/keystrokes/firefox/line_nav_simple_form.py b/test/keystrokes/firefox/line_nav_simple_form.py
index 9930d69..c490c8b 100644
--- a/test/keystrokes/firefox/line_nav_simple_form.py
+++ b/test/keystrokes/firefox/line_nav_simple_form.py
@@ -45,7 +45,8 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "4. line Down",
-    ["BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
+    ["KNOWN ISSUE: When the test is run, we sometimes get extra presentation which doesn't happen in real 
use.",
+     "BRAILLE LINE:  'I am a monkey with a long tail.  I like  $l'",
      "     VISIBLE:  'I am a monkey with a long tail. ', cursor=1",
      "SPEECH OUTPUT: 'entry I am a monkey with a long tail.  I like '"]))
 
@@ -61,17 +62,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. line Down",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. line Down",
-    ["BRAILLE LINE:  'write my memoirs. $l'",
-     "     VISIBLE:  'write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'write my memoirs.",
+    ["BRAILLE LINE:  'to write my memoirs. $l'",
+     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
@@ -180,18 +181,18 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "19. line Up",
-    ["BRAILLE LINE:  'write my memoirs. $l'",
-     "     VISIBLE:  'write my memoirs. $l', cursor=1",
-     "SPEECH OUTPUT: 'write my memoirs.",
+    ["BRAILLE LINE:  'to write my memoirs. $l'",
+     "     VISIBLE:  'to write my memoirs. $l', cursor=1",
+     "SPEECH OUTPUT: 'to write my memoirs.",
      "'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "20. line Up",
-    ["BRAILLE LINE:  'I've recently taken up typing and plan to  $l'",
+    ["BRAILLE LINE:  'I've recently taken up typing and plan  $l'",
      "     VISIBLE:  'I've recently taken up typing an', cursor=1",
-     "SPEECH OUTPUT: 'I've recently taken up typing and plan to '"]))
+     "SPEECH OUTPUT: 'I've recently taken up typing and plan '"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_sun_java.py b/test/keystrokes/firefox/line_nav_sun_java.py
index b607c33..bfb2ab0 100644
--- a/test/keystrokes/firefox/line_nav_sun_java.py
+++ b/test/keystrokes/firefox/line_nav_sun_java.py
@@ -32,7 +32,7 @@ sequence.append(utils.AssertPresentationAction(
     ["BRAILLE LINE:  'Home Page Sun Developer Network'",
      "     VISIBLE:  'Home Page Sun Developer Network', cursor=1",
      "SPEECH OUTPUT: 'Home Page link.'",
-     "SPEECH OUTPUT: 'link Sun Developer Network'"]))
+     "SPEECH OUTPUT: 'Sun Developer Network link'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]