orca r4059 - in trunk: . test/harness test/keystrokes/oowriter

[wwalker svn gnome org]

Author: wwalker
Date: Tue Jul 22 22:25:29 2008
New Revision: 4059
URL: http://svn.gnome.org/viewvc/orca?rev=4059&view=rev

Log:
Get the nasty oowriter bug_362979.py working again.


Modified:
   trunk/ChangeLog
   trunk/test/harness/utils.py
   trunk/test/keystrokes/oowriter/bug_362979.py

Modified: trunk/test/harness/utils.py
==============================================================================
--- trunk/test/harness/utils.py	(original)
+++ trunk/test/harness/utils.py	Tue Jul 22 22:25:29 2008
@@ -113,11 +113,14 @@
 	if results[i] == expectedList[i]:
             continue
         else:
-            expectedResultRE = re.compile(expectedList[i])
-            if expectedResultRE.match(results[i]):
+            expectedResultRE = re.compile(expectedList[i].decode("UTF-8",
+                                                                 "replace"))
+            if expectedResultRE.match(results[i].decode("UTF-8",
+                                                        "replace")):
                 continue
             else:
                 return results
+
     return None
 
 class AssertPresentationAction(AtomicAction):
@@ -179,6 +182,18 @@
             print >> myErr, '\n'.join(list(diffs))
         except:
             print "(ERROR COMPUTING DIFFERENCES!!!)"
+            for i in range(0, max(len(results), len(self._expectedResults))):
+                try:
+                    print "  EXPECTED: %s" \
+                          % self._expectedResults[i].decode("UTF-8", "replace")
+                except:
+                    pass
+                try:
+                    print "  ACTUAL:   %s" \
+                          % results[i].decode("UTF-8", "replace")
+                except:
+                    pass
+
         return expectedToFail
 
     def printResults(self, results):

Modified: trunk/test/keystrokes/oowriter/bug_362979.py
==============================================================================
--- trunk/test/keystrokes/oowriter/bug_362979.py	(original)
+++ trunk/test/keystrokes/oowriter/bug_362979.py	Tue Jul 22 22:25:29 2008
@@ -77,10 +77,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Move cursor to start of document",
-    ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view âLine 1 \$l'",
-     "     VISIBLE:  'âLine 1 $l', cursor=2",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view âLine 1 \$l'",
+     "     VISIBLE:  'âLine 1 \$l', cursor=2",
      "SPEECH OUTPUT: 'âLine 1'"]))
 
 ######################################################################
@@ -91,10 +89,8 @@
 sequence.append(WaitForFocus("", acc_role=pyatspi.ROLE_PARAGRAPH))
 sequence.append(utils.AssertPresentationAction(
     "Move to second bulleted line",
-    ["BRAILLE LINE:  ' $l'",
-     "     VISIBLE:  ' $l', cursor=1",
-     "BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view âLine 2 \$l'",
-     "     VISIBLE:  'âLine 2 $l', cursor=2",
+    ["BRAILLE LINE:  'soffice Application Untitled[ ]*2 - " + utils.getOOoName("Writer") + " Frame Untitled[ ]*2 - " + utils.getOOoName("Writer") + " RootPane ScrollPane Document view âLine 2 \$l'",
+     "     VISIBLE:  'âLine 2 \$l', cursor=2",
      "SPEECH OUTPUT: 'âLine 2'"]))
 
 ######################################################################