From a535309e07dfb16055ae028014f5e19b591cad3b Mon Sep 17 00:00:00 2001
From: Robert Strong <robert.bugzilla@gmail.com>
Date: Sat, 16 Aug 2008 22:40:34 -0700
Subject: [PATCH] Adding general application update service tests from Bug
 446527. r=dtownsend, r=bsmedberg

---
 toolkit/mozapps/update/Makefile.in            |  9 +++-
 toolkit/mozapps/update/test/Makefile.in       | 51 +++++++++++++++++++
 .../mozapps/update/test/unit/head_update.js   |  4 +-
 .../update/test/unit/test_0030_general.js     |  2 +-
 4 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 toolkit/mozapps/update/test/Makefile.in

diff --git a/toolkit/mozapps/update/Makefile.in b/toolkit/mozapps/update/Makefile.in
index 813414a83f4a..59d013d0b776 100644
--- a/toolkit/mozapps/update/Makefile.in
+++ b/toolkit/mozapps/update/Makefile.in
@@ -11,14 +11,15 @@
 # for the specific language governing rights and limitations under the
 # License.
 #
-# The Original Code is the Extension Manager.
+# The Original Code is the Application Update Service.
 #
 # The Initial Developer of the Original Code is Ben Goodger.
 # Portions created by the Initial Developer are Copyright (C) 2004
 # the Initial Developer. All Rights Reserved.
 #
 # Contributor(s):
-#  Ben Goodger <ben@mozilla.org>
+#   Ben Goodger <ben@mozilla.org>
+#   Robert Strong <robert.bugzilla@gmail.com>.
 #
 # Alternatively, the contents of this file may be used under the terms of
 # either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -43,4 +44,8 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = public src
 
+ifdef ENABLE_TESTS
+DIRS += test
+endif
+
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
new file mode 100644
index 000000000000..4e447c1f6600
--- /dev/null
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -0,0 +1,51 @@
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is the Application Update Service.
+#
+# The Initial Developer of the Original Code is
+# Robert Strong <robert.bugzilla@gmail.com>.
+#
+# Portions created by the Initial Developer are Copyright (C) 2008
+# the Mozilla Foundation <http://www.mozilla.org/>. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH = ../../../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = test_update
+
+XPCSHELL_TESTS = \
+  unit \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/mozapps/update/test/unit/head_update.js b/toolkit/mozapps/update/test/unit/head_update.js
index 6105af8a1928..087b0e028953 100644
--- a/toolkit/mozapps/update/test/unit/head_update.js
+++ b/toolkit/mozapps/update/test/unit/head_update.js
@@ -147,14 +147,14 @@ function createAppInfo(id, name, version, platformVersion)
           iid.equals(AUS_Ci.nsISupports))
         return this;
     
-      throw Components.results.NS_ERROR_NO_INTERFACE;
+      throw AUS_Cr.NS_ERROR_NO_INTERFACE;
     }
   };
   
   var XULAppInfoFactory = {
     createInstance: function (outer, iid) {
       if (outer != null)
-        throw Components.results.NS_ERROR_NO_AGGREGATION;
+        throw AUS_Cr.NS_ERROR_NO_AGGREGATION;
       return XULAppInfo.QueryInterface(iid);
     }
   };
diff --git a/toolkit/mozapps/update/test/unit/test_0030_general.js b/toolkit/mozapps/update/test/unit/test_0030_general.js
index 1d3ff46f5a7d..41533347b8b1 100644
--- a/toolkit/mozapps/update/test/unit/test_0030_general.js
+++ b/toolkit/mozapps/update/test/unit/test_0030_general.js
@@ -218,7 +218,7 @@ const downloadListener = {
     if (!iid.equals(AUS_Ci.nsIRequestObserver) &&
         !iid.equals(AUS_Ci.nsIProgressEventSink) &&
         !iid.equals(AUS_Ci.nsISupports))
-      throw Components.results.NS_ERROR_NO_INTERFACE;
+      throw AUS_Cr.NS_ERROR_NO_INTERFACE;
     return this;
   }
 };