[orca] Updated regression test

[Joanmarie Diggs <joanied src gnome org>]

commit aaf4b4c561e2a5c65e52830f1e064db60f8e6a52
Author: Joanmarie Diggs <jdiggs igalia com>
Date:   Wed Nov 18 19:21:49 2015 -0500

    Updated regression test

 test/keystrokes/firefox/aria_landmarks.py |   54 +++++++++++------------------
 1 files changed, 20 insertions(+), 34 deletions(-)
---
diff --git a/test/keystrokes/firefox/aria_landmarks.py b/test/keystrokes/firefox/aria_landmarks.py
index a5ee564..7bc7e02 100644
--- a/test/keystrokes/firefox/aria_landmarks.py
+++ b/test/keystrokes/firefox/aria_landmarks.py
@@ -22,23 +22,16 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
     "2. m to next landmark",
-    ["BRAILLE LINE:  'main'",
-     "     VISIBLE:  'main', cursor=1",
-     "SPEECH OUTPUT: 'main'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("m"))
-sequence.append(utils.AssertPresentationAction(
-    "3. m to next landmark",
-    ["BRAILLE LINE:  'application embedded'",
-     "     VISIBLE:  'application embedded', cursor=1",
+    ["BRAILLE LINE:  'main application embedded'",
+     "     VISIBLE:  'main application embedded', cursor=1",
+     "SPEECH OUTPUT: 'main'",
      "SPEECH OUTPUT: 'application'",
      "SPEECH OUTPUT: 'embedded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
-    "4. m to next landmark",
+    "3. m to next landmark",
     ["BRAILLE LINE:  'complementary'",
      "     VISIBLE:  'complementary', cursor=1",
      "SPEECH OUTPUT: 'complementary'"]))
@@ -46,15 +39,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
-    "5. m to next landmark",
+    "4. m to next landmark",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'form '"]))
+     "SPEECH OUTPUT: 'form'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
-    "6. m to next landmark",
+    "5. m to next landmark",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search'"]))
@@ -62,7 +55,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
-    "7. m to next landmark",
+    "6. m to next landmark",
     ["BRAILLE LINE:  'contentinfo'",
      "     VISIBLE:  'contentinfo', cursor=1",
      "SPEECH OUTPUT: 'contentinfo'"]))
@@ -70,7 +63,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("m"))
 sequence.append(utils.AssertPresentationAction(
-    "8. m to next landmark",
+    "7. m to next landmark",
     ["BRAILLE LINE:  'Wrapping to top.'",
      "     VISIBLE:  'Wrapping to top.', cursor=0",
      "BRAILLE LINE:  'banner'",
@@ -81,7 +74,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "9. Shift+m to previous landmark",
+    "8. Shift+m to previous landmark",
     ["BRAILLE LINE:  'Wrapping to bottom.'",
      "     VISIBLE:  'Wrapping to bottom.', cursor=0",
      "BRAILLE LINE:  'contentinfo'",
@@ -92,7 +85,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "10. Shift+m to previous landmark",
+    "9. Shift+m to previous landmark",
     ["BRAILLE LINE:  'search'",
      "     VISIBLE:  'search', cursor=1",
      "SPEECH OUTPUT: 'search'"]))
@@ -100,15 +93,15 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "11. Shift+m to previous landmark",
+    "10. Shift+m to previous landmark",
     ["BRAILLE LINE:  ''",
      "     VISIBLE:  '', cursor=1",
-     "SPEECH OUTPUT: 'form '"]))
+     "SPEECH OUTPUT: 'form'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "12. Shift+m to previous landmark",
+    "11. Shift+m to previous landmark",
     ["BRAILLE LINE:  'complementary'",
      "     VISIBLE:  'complementary', cursor=1",
      "SPEECH OUTPUT: 'complementary'"]))
@@ -116,24 +109,17 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "13. Shift+m to previous landmark",
-    ["BRAILLE LINE:  'application embedded'",
-     "     VISIBLE:  'application embedded', cursor=1",
+    "12. Shift+m to previous landmark",
+    ["BRAILLE LINE:  'main application embedded'",
+     "     VISIBLE:  'main application embedded', cursor=1",
+     "SPEECH OUTPUT: 'main'",
      "SPEECH OUTPUT: 'application'",
      "SPEECH OUTPUT: 'embedded'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "14. Shift+m to previous landmark",
-    ["BRAILLE LINE:  'main'",
-     "     VISIBLE:  'main', cursor=1",
-     "SPEECH OUTPUT: 'main'"]))
-
-sequence.append(utils.StartRecordingAction())
-sequence.append(KeyComboAction("<Shift>m"))
-sequence.append(utils.AssertPresentationAction(
-    "15. Shift+m to previous landmark",
+    "13. Shift+m to previous landmark",
     ["BRAILLE LINE:  'navigation'",
      "     VISIBLE:  'navigation', cursor=1",
      "SPEECH OUTPUT: 'navigation'"]))
@@ -141,7 +127,7 @@ sequence.append(utils.AssertPresentationAction(
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Shift>m"))
 sequence.append(utils.AssertPresentationAction(
-    "16. Shift+m to previous landmark",
+    "14. Shift+m to previous landmark",
     ["BRAILLE LINE:  'banner'",
      "     VISIBLE:  'banner', cursor=1",
      "SPEECH OUTPUT: 'banner'"]))