diff -r 000000000000 -r 6474c204b198 toolkit/components/places/tests/unit/test_multi_queries.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/toolkit/components/places/tests/unit/test_multi_queries.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,53 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:set ts=2 sw=2 sts=2 et: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+/**
+ * Adds a test URI visit to history.
+ *
+ * @param aURI
+ *        The URI to add a visit for.
+ * @param aReferrer
+ *        The referring URI for the given URI.  This can be null.
+ */
+function add_visit(aURI, aDayOffset, aTransition) {
+  yield promiseAddVisits({
+    uri: aURI,
+    transition: aTransition,
+    visitDate: (Date.now() + aDayOffset*86400000) * 1000
+  });
+}
+
+function run_test()
+{
+  run_next_test();
+}
+
+add_task(function test_execute()
+{
+  yield add_visit(uri("http://mirror1.mozilla.com/a"), -1, TRANSITION_LINK);
+  yield add_visit(uri("http://mirror2.mozilla.com/b"), -2, TRANSITION_LINK);
+  yield add_visit(uri("http://mirror3.mozilla.com/c"), -4, TRANSITION_FRAMED_LINK);
+  yield add_visit(uri("http://mirror1.google.com/b"), -1, TRANSITION_EMBED);
+  yield add_visit(uri("http://mirror2.google.com/a"), -2, TRANSITION_LINK);
+  yield add_visit(uri("http://mirror1.apache.org/b"), -3, TRANSITION_LINK);
+  yield add_visit(uri("http://mirror2.apache.org/a"), -4, TRANSITION_FRAMED_LINK);
+
+  let queries = [
+    PlacesUtils.history.getNewQuery(),
+    PlacesUtils.history.getNewQuery()
+  ];
+  queries[0].domain = "mozilla.com";
+  queries[1].domain = "google.com";
+
+  let root = PlacesUtils.history.executeQueries(
+    queries, queries.length, PlacesUtils.history.getNewQueryOptions()
+  ).root;
+  root.containerOpen = true;
+  let childCount = root.childCount;
+  root.containerOpen = false;
+
+  do_check_eq(childCount, 3);
+});