1 files changed, 74 insertions, 0 deletions
diff --git a/toolkit/components/places/tests/unit/test_425563.js b/toolkit/components/places/tests/unit/test_425563.js
new file mode 100644
index 000000000..bee3a4a54
--- /dev/null
+++ b/toolkit/components/places/tests/unit/test_425563.js
@@ -0,0 +1,74 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 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/. */
+
+function run_test()
+{
+  run_next_test();
+}
+
+add_task(function* test_execute()
+{
+  let count_visited_URIs = ["http://www.test-link.com/",
+                            "http://www.test-typed.com/",
+                            "http://www.test-bookmark.com/",
+                            "http://www.test-redirect-permanent.com/",
+                            "http://www.test-redirect-temporary.com/"];
+
+  let notcount_visited_URIs = ["http://www.test-embed.com/",
+                               "http://www.test-download.com/",
+                               "http://www.test-framed.com/",
+                               "http://www.test-reload.com/"];
+
+  // add visits, one for each transition type
+  yield PlacesTestUtils.addVisits([
+    { uri: uri("http://www.test-link.com/"),
+      transition: TRANSITION_LINK },
+    { uri: uri("http://www.test-typed.com/"),
+      transition: TRANSITION_TYPED },
+    { uri: uri("http://www.test-bookmark.com/"),
+      transition: TRANSITION_BOOKMARK },
+    { uri: uri("http://www.test-embed.com/"),
+      transition: TRANSITION_EMBED },
+    { uri: uri("http://www.test-framed.com/"),
+      transition: TRANSITION_FRAMED_LINK },
+    { uri: uri("http://www.test-redirect-permanent.com/"),
+      transition: TRANSITION_REDIRECT_PERMANENT },
+    { uri: uri("http://www.test-redirect-temporary.com/"),
+      transition: TRANSITION_REDIRECT_TEMPORARY },
+    { uri: uri("http://www.test-download.com/"),
+      transition: TRANSITION_DOWNLOAD },
+    { uri: uri("http://www.test-reload.com/"),
+      transition: TRANSITION_RELOAD },
+  ]);
+
+  // check that all links are marked as visited
+  for (let visited_uri of count_visited_URIs) {
+    do_check_true(yield promiseIsURIVisited(uri(visited_uri)));
+  }
+  for (let visited_uri of notcount_visited_URIs) {
+    do_check_true(yield promiseIsURIVisited(uri(visited_uri)));
+  }
+
+  // check that visit_count does not take in count embed and downloads
+  // maxVisits query are directly binded to visit_count
+  let options = PlacesUtils.history.getNewQueryOptions();
+  options.sortingMode = options.SORT_BY_VISITCOUNT_DESCENDING;
+  options.resultType = options.RESULTS_AS_VISIT;
+  options.includeHidden = true;
+  let query = PlacesUtils.history.getNewQuery();
+  query.minVisits = 1;
+  let root = PlacesUtils.history.executeQuery(query, options).root;
+
+  root.containerOpen = true;
+  let cc = root.childCount;
+  do_check_eq(cc, count_visited_URIs.length);
+
+  for (let i = 0; i < cc; i++) {
+    let node = root.getChild(i);
+    do_check_neq(count_visited_URIs.indexOf(node.uri), -1);
+  }
+  root.containerOpen = false;
+});