[orca] Adjust the test harness to deal wtih test-specific customizations better.

[Joanmarie Diggs <joanied src gnome org>]

commit 149f39baa18a7f3af8997a766bd7e770691afd91
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Thu Dec 30 05:31:12 2010 -0500

    Adjust the test harness to deal wtih test-specific customizations better.

 test/harness/runone.sh                             |   13 +++++-
 .../firefox/line_nav_bug_577239.customizations     |    3 +
 test/keystrokes/firefox/line_nav_bug_577239.py     |   48 ++++++++++----------
 .../firefox/line_nav_bug_577239.settings           |   36 ---------------
 .../firefox/line_nav_bug_577979.customizations     |    2 +
 test/keystrokes/firefox/line_nav_bug_577979.py     |   30 ++++++------
 .../firefox/line_nav_bug_577979.settings           |   36 ---------------
 7 files changed, 55 insertions(+), 113 deletions(-)
---
diff --git a/test/harness/runone.sh b/test/harness/runone.sh
index 15e55be..1a9ead9 100755
--- a/test/harness/runone.sh
+++ b/test/harness/runone.sh
@@ -40,8 +40,18 @@ WAIT_TIME=10
 # if there is a *.params file for the test or not.
 #
 currentDir=`pwd`
+
 cp `dirname $0`/orca-customizations.py.in orca-customizations.py
-cat >> orca-customizations.py <<EOF
+
+# If a <testfilename>.customizations file exists, add those settings to
+# what is specified in the default orca-customizations-py.in.
+#
+CUSTOMIZATIONS_FILE=`dirname $1`/$debugFile.customizations
+if [ -f $CUSTOMIZATIONS_FILE ]
+then
+    cat $CUSTOMIZATIONS_FILE >> orca-customizations.py
+fi
+cat >> orca-customizations.py << EOF
 
 orca.settings.userPrefsDir = '$currentDir'
 
@@ -74,7 +84,6 @@ fi
 cp $SETTINGS_FILE user-settings.conf
 #echo "Using settings file:" $SETTINGS_FILE
 
-
 # Allow us to pass parameters to the command line of the application.
 #
 # If a <testfilename>.params file exists, it contains parameters to
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.customizations b/test/keystrokes/firefox/line_nav_bug_577239.customizations
new file mode 100644
index 0000000..dd91f7f
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_bug_577239.customizations
@@ -0,0 +1,3 @@
+import orca.scripts.toolkits.Gecko.script_settings
+orca.scripts.toolkits.Gecko.script_settings.arrowToLineBeginning = False
+
diff --git a/test/keystrokes/firefox/line_nav_bug_577239.py b/test/keystrokes/firefox/line_nav_bug_577239.py
index 79fa2e4..370e24a 100644
--- a/test/keystrokes/firefox/line_nav_bug_577239.py
+++ b/test/keystrokes/firefox/line_nav_bug_577239.py
@@ -54,17 +54,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  '1. This is a short list item.'",
-     "     VISIBLE:  '1. This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: '1. This is a short list item.'"]))
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=1",
-     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=1",
+     "SPEECH OUTPUT: '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -86,17 +86,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Down",
-    ["BRAILLE LINE:  'â?¢ This is a short list item.'",
-     "     VISIBLE:  'â?¢ This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a short list item.'"]))
+    ["BRAILLE LINE:  'â?¢This is a short list item.'",
+     "     VISIBLE:  'â?¢This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: 'â?¢This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "7. Line Down",
-    ["BRAILLE LINE:  'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  'â?¢ This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+    ["BRAILLE LINE:  'â?¢This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  'â?¢This is a list item that spans ', cursor=1",
+     "SPEECH OUTPUT: 'â?¢This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
@@ -113,17 +113,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "1. Line Up",
-    ["BRAILLE LINE:  'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  'â?¢ This is a list item that spans', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+    ["BRAILLE LINE:  'â?¢This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  'â?¢This is a list item that spans ', cursor=1",
+     "SPEECH OUTPUT: 'â?¢This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Up",
-    ["BRAILLE LINE:  'â?¢ This is a short list item.'",
-     "     VISIBLE:  'â?¢ This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: 'â?¢ This is a short list item.'"]))
+    ["BRAILLE LINE:  'â?¢This is a short list item.'",
+     "     VISIBLE:  'â?¢This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: 'â?¢This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
@@ -145,17 +145,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "5. Line Up",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=1",
-     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=1",
+     "SPEECH OUTPUT: '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
 sequence.append(utils.AssertPresentationAction(
     "6. Line Up",
-    ["BRAILLE LINE:  '1. This is a short list item.'",
-     "     VISIBLE:  '1. This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: '1. This is a short list item.'"]))
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Up"))
diff --git a/test/keystrokes/firefox/line_nav_bug_577979.customizations b/test/keystrokes/firefox/line_nav_bug_577979.customizations
new file mode 100644
index 0000000..4a48898
--- /dev/null
+++ b/test/keystrokes/firefox/line_nav_bug_577979.customizations
@@ -0,0 +1,2 @@
+import orca.scripts.toolkits.Gecko.script_settings
+orca.scripts.toolkits.Gecko.script_settings.arrowToLineBeginning = False
diff --git a/test/keystrokes/firefox/line_nav_bug_577979.py b/test/keystrokes/firefox/line_nav_bug_577979.py
index ef94cef..e2c3082 100644
--- a/test/keystrokes/firefox/line_nav_bug_577979.py
+++ b/test/keystrokes/firefox/line_nav_bug_577979.py
@@ -54,17 +54,17 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "2. Line Down",
-    ["BRAILLE LINE:  '1. This is a short list item.'",
-     "     VISIBLE:  '1. This is a short list item.', cursor=1",
-     "SPEECH OUTPUT: '1. This is a short list item.'"]))
+    ["BRAILLE LINE:  '1.This is a short list item.'",
+     "     VISIBLE:  '1.This is a short list item.', cursor=1",
+     "SPEECH OUTPUT: '1.This is a short list item.'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("Down"))
 sequence.append(utils.AssertPresentationAction(
     "3. Line Down",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=1",
-     "SPEECH OUTPUT: '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=1",
+     "SPEECH OUTPUT: '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'"]))
 
 ########################################################################
 # Control + Right Arrow to move several words into the line.
@@ -73,32 +73,32 @@ sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "1. Next Word",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=8",
-     "SPEECH OUTPUT: '. This'"]))
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=7",
+     "SPEECH OUTPUT: '.This'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "2. Next Word",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=11",
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=10",
      "SPEECH OUTPUT: ' is'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "3. Next Word",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=13",
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=12",
      "SPEECH OUTPUT: ' a'"]))
 
 sequence.append(utils.StartRecordingAction())
 sequence.append(KeyComboAction("<Control>Right"))
 sequence.append(utils.AssertPresentationAction(
     "4. Next Word",
-    ["BRAILLE LINE:  '2. This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
-     "     VISIBLE:  '2. This is a list item that span', cursor=18",
+    ["BRAILLE LINE:  '2.This is a list item that spans multiple lines. If Orca can successfully read to the end of this list item, it will have read several lines of text within this'",
+     "     VISIBLE:  '2.This is a list item that spans', cursor=17",
      "SPEECH OUTPUT: ' list'"]))
 
 ########################################################################