From 4b2747cd47d45383f3d29fb674f8ac2e4aaa69a1 Mon Sep 17 00:00:00 2001
From: JosiahOne <josiah@programmer.net>
Date: Wed, 8 May 2013 22:25:09 -0400
Subject: [PATCH] Bug 868432 - Alter tests to be aware of delayed changes in
 scrolling. r=roc

---
 .../tests/test_selection_move_commands.xul    |  2 ++
 .../content/tests/chrome/test_showcaret.xul   | 31 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/editor/libeditor/base/tests/test_selection_move_commands.xul b/editor/libeditor/base/tests/test_selection_move_commands.xul
index 333bc30a60be..7398920542db 100644
--- a/editor/libeditor/base/tests/test_selection_move_commands.xul
+++ b/editor/libeditor/base/tests/test_selection_move_commands.xul
@@ -123,8 +123,10 @@ function execTests() {
   }
 
   doCommand("cmd_scrollBottom");
+  yield;
   testScrollCommand("cmd_scrollBottom", root.scrollHeight - 100);
   doCommand("cmd_scrollTop");
+  yield;
   testScrollCommand("cmd_scrollTop", 0);
 
   doCommand("cmd_scrollPageDown");
diff --git a/toolkit/content/tests/chrome/test_showcaret.xul b/toolkit/content/tests/chrome/test_showcaret.xul
index c75b9c81655e..68762969555e 100644
--- a/toolkit/content/tests/chrome/test_showcaret.xul
+++ b/toolkit/content/tests/chrome/test_showcaret.xul
@@ -33,8 +33,6 @@ function runTest()
 
   window.frames[0].focus();
   document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
-
-  ok(frames[0].scrollY > 0, "scrollY for non-showcaret");
   is(sel1.focusNode, frames[0].document.body, "focusNode for non-showcaret");
   is(sel1.focusOffset, 0, "focusOffset for non-showcaret");
 
@@ -49,6 +47,22 @@ function runTest()
 
   otherWindow = window.open("window_showcaret.xul", "_blank", "chrome,width=400,height=200");
   otherWindow.addEventListener("focus", otherWindowFocused, false);
+
+  var sel1 = frames[0].getSelection();
+  sel1.collapse(frames[0].document.body, 0);
+
+  var sel2 = frames[1].getSelection();
+  sel2.collapse(frames[1].document.body, 0);
+  window.frames[0].focus();
+  document.commandDispatcher.getControllerForCommand("cmd_moveBottom").doCommand("cmd_moveBottom");
+
+  /* We aren't sure exactly how long the cmd_moveBottom will take.
+   * Therefore, check for success every second. If we don't have success within 10 seconds, assume the scroll
+   * will never pass the test and fail it.
+   */
+
+  var timeoutUntilFail = window.setTimeout(scrollYTimeout, 10000);
+  var testScroll = self.setInterval(function(){continueTest()}, 10);
 }
 
 function otherWindowFocused()
@@ -73,6 +87,19 @@ function otherWindowFocused()
   SimpleTest.finish();
 }
 
+function continueTest() {
+  if (frames[0].scrollY > 0) {
+    return;
+  }
+  testScroll = window.clearInterval(testScroll);
+  window.clearTimeout(timeoutUntilFail);
+  return;
+}
+
+function scrollYTimeout() {
+  ok(frames[0].scrollY > 0, "scrollY for non-showcaret");
+}
+
 ]]>
 </script>