From bf75b9cda7dcd537ec98c5c8823014793ff38de3 Mon Sep 17 00:00:00 2001
From: "bclary%bclary.com"
 <bclary%bclary.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 3 Sep 2006 00:23:09 +0000
Subject: [PATCH] JavaScript Test - register and unregister dialog closer on
 start/stop rather than on before/after page load, no bug, not part of the
 build

git-svn-id: svn://10.0.0.236/trunk@209085 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/tests/userhook-e4x.js     | 14 ++++++++++++--
 mozilla/js/tests/userhook-js.js      | 13 +++++++++++--
 mozilla/js/tests/userhookeach-e4x.js | 13 ++++++++++++-
 mozilla/js/tests/userhookeach-js.js  | 14 ++++++++++++--
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/mozilla/js/tests/userhook-e4x.js b/mozilla/js/tests/userhook-e4x.js
index bd94d802999..bbb47487410 100755
--- a/mozilla/js/tests/userhook-e4x.js
+++ b/mozilla/js/tests/userhook-e4x.js
@@ -43,10 +43,14 @@ var gCheckInterval = 1000;
 
 // if jsUnit status doesn't change, force page complete.
 
+function userOnStart()
+{
+  registerDialogCloser();
+}
+
 function userOnBeforePage()
 {
   dlog('userOnBeforePage');
-  registerDialogCloser();
 }
 
 var gReport;
@@ -54,7 +58,6 @@ var gReport;
 function userOnAfterPage()
 {
   dlog('userOnAfterPage');
-  unregisterDialogCloser();
 
   var win = gSpider.mDocument.defaultView;
   if (win.wrappedJSObject)
@@ -101,6 +104,13 @@ function userOnAfterPage()
   win.setTimeout("executeList()", 10000);
 }
 
+function userOnStop()
+{
+  // close any pending dialogs
+  closeDialog();
+  unregisterDialogCloser();
+}
+
 
 gConsoleListener.onConsoleMessage = 
 function userOnConsoleMessage(s)
diff --git a/mozilla/js/tests/userhook-js.js b/mozilla/js/tests/userhook-js.js
index 71a0ecdf3c3..c8215184ff2 100755
--- a/mozilla/js/tests/userhook-js.js
+++ b/mozilla/js/tests/userhook-js.js
@@ -44,11 +44,21 @@ var gCheckInterval = 1000;
 
 // if jsUnit status doesn't change, force page complete.
 
+function userOnStart()
+{
+  registerDialogCloser();
+}
+
 function userOnBeforePage()
 {
   dlog('userOnBeforePage');
-  registerDialogCloser();
+}
 
+function userOnStop()
+{
+  // close any pending dialogs
+  closeDialog();
+  unregisterDialogCloser();
 }
 
 var gReport;
@@ -56,7 +66,6 @@ var gReport;
 function userOnAfterPage()
 {
   dlog('userOnAfterPage');
-  unregisterDialogCloser();
 
   var win = gSpider.mDocument.defaultView;
   if (win.wrappedJSObject)
diff --git a/mozilla/js/tests/userhookeach-e4x.js b/mozilla/js/tests/userhookeach-e4x.js
index c92ba78f643..8a3fc59299f 100755
--- a/mozilla/js/tests/userhookeach-e4x.js
+++ b/mozilla/js/tests/userhookeach-e4x.js
@@ -45,10 +45,14 @@ var gCheckInterval = 1000;
 
 // if jsUnit status doesn't change, force page complete.
 
+function userOnStart()
+{
+  registerDialogCloser();
+}
+
 function userOnBeforePage()
 {
   dlog('userOnBeforePage');
-  registerDialogCloser();
 }
 
 var gReport;
@@ -59,6 +63,13 @@ function userOnAfterPage()
   checkTestCompleted();
 }
 
+function userOnStop()
+{
+  // close any pending dialogs
+  closeDialog();
+  unregisterDialogCloser();
+}
+
 function checkTestCompleted()
 {
   var win = gSpider.mDocument.defaultView;
diff --git a/mozilla/js/tests/userhookeach-js.js b/mozilla/js/tests/userhookeach-js.js
index 332c1183601..fb3073f9f32 100755
--- a/mozilla/js/tests/userhookeach-js.js
+++ b/mozilla/js/tests/userhookeach-js.js
@@ -44,10 +44,14 @@ var gCheckInterval = 1000;
 
 // if jsUnit status doesn't change, force page complete.
 
+function userOnStart()
+{
+  registerDialogCloser();
+}
+
 function userOnBeforePage()
 {
   dlog('userOnBeforePage');
-  registerDialogCloser();
 }
 
 var gReport;
@@ -58,6 +62,13 @@ function userOnAfterPage()
   checkTestCompleted();
 }
 
+function userOnStop()
+{
+  // close any pending dialogs
+  closeDialog();
+  unregisterDialogCloser();
+}
+
 function checkTestCompleted()
 {
   var win = gSpider.mDocument.defaultView;
@@ -67,7 +78,6 @@ function checkTestCompleted()
   }
   if (win.gPageCompleted)
   {
-    unregisterDialogCloser();
     gPageCompleted = true;
 
     var testcases = win.testcases;