Bug 684327 - Introduce js-implemented test component. r=khuey
authorBobby Holley <bobbyholley@gmail.com>
Sun, 25 Sep 2011 15:37:59 +0100
changeset 78832 7934b2288e1c8fdac09a32eb3c7c4642ae6baba5
parent 78831 de1c69fb961e0ad49bf3447b553c28bca660f694
child 78833 614b6c0627b9182b696db8311a6c36e06e81b648
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs684327
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 684327 - Introduce js-implemented test component. r=khuey
js/src/xpconnect/tests/Makefile.in
js/src/xpconnect/tests/components/js/Makefile.in
js/src/xpconnect/tests/components/js/xpctest.manifest
js/src/xpconnect/tests/components/js/xpctest_attributes.js
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@@ -39,17 +39,17 @@
 DEPTH = ../../../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = js/src/xpconnect/tests
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = idl mochitest chrome components/native
+DIRS = idl mochitest chrome components/native components/js
 
 XPCSHELL_TESTS = unit
 
 LIBS = \
   $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
   $(LIBS_DIR) \
   $(MOZ_JS_LIBS) \
   $(MOZ_COMPONENT_LIBS) \
new file mode 100644
--- /dev/null
+++ b/js/src/xpconnect/tests/components/js/Makefile.in
@@ -0,0 +1,67 @@
+#
+# ***** 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 XPConnect Test Code.
+#
+# The Initial Developer of the Original Code is
+# Portions created by the Initial Developer are Copyright (C) 2011
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#   Bobby Holley <bobbyholley@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
+# 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 = xpctest
+LIBRARY_NAME = xpctest
+IS_COMPONENT = 1
+MODULE_NAME = xpconnect_test
+NO_DIST_INSTALL = 1
+
+JS_FILES = \
+  xpctest_attributes.js \
+  $(NULL)
+
+include $(topsrcdir)/config/config.mk
+
+MANIFEST_FILE = xpctest.manifest
+
+include $(topsrcdir)/config/rules.mk
+
+componentdir = js/src/xpconnect/tests/components/js
+
+libs:: $(JS_FILES)
+	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)
+
+libs:: $(MANIFEST_FILE)
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $< > $(testxpcobjdir)/$(componentdir)/$(<F)
new file mode 100644
--- /dev/null
+++ b/js/src/xpconnect/tests/components/js/xpctest.manifest
@@ -0,0 +1,2 @@
+component {8ff41d9c-66e9-4453-924a-7d8de0a5e966} xpctest_attributes.js
+contract @mozilla.org/js/xpc/test/js/ObjectReadWrite;1 {8ff41d9c-66e9-4453-924a-7d8de0a5e966}
new file mode 100644
--- /dev/null
+++ b/js/src/xpconnect/tests/components/js/xpctest_attributes.js
@@ -0,0 +1,55 @@
+/* ***** 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 XPConnect Test Code.
+ *
+ * The Initial Developer of the Original Code is The Mozilla Foundation.
+ * Portions created by the Initial Developer are Copyright (C) 2011
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bobby Holley <bobbyholley@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
+ * 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 ***** */
+Components.utils.import("resource:///modules/XPCOMUtils.jsm");
+
+function TestObjectReadWrite() {}
+TestObjectReadWrite.prototype = {
+
+  /* Boilerplate */
+  QueryInterface: XPCOMUtils.generateQI([Components.interfaces["nsIXPCTestObjectReadWrite"]]),
+  contractID: "@mozilla.org/js/xpc/test/js/ObjectReadWrite;1",
+  classID: Components.ID("{8ff41d9c-66e9-4453-924a-7d8de0a5e966}"),
+
+  /* nsIXPCTestObjectReadWrite */
+  stringProperty: "XPConnect Read-Writable String",
+  booleanProperty: true,
+  shortProperty: 32767,
+  longProperty: 2147483647,
+  floatProperty: 5.5,
+  charProperty: "X"
+};
+
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([TestObjectReadWrite]);