From 43a97878ce14b72f0981164f87f2e35e14151312 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sun, 7 Apr 2024 11:22:09 +0200
Subject: Adding upstream version 110.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 browser/components/places/tests/chrome/chrome.ini  |  10 ++
 browser/components/places/tests/chrome/head.js     |  36 +++++
 .../places/tests/chrome/test_0_bug510634.xhtml     | 100 +++++++++++++
 ...t_bug1163447_selectItems_through_shortcut.xhtml |  88 ++++++++++++
 .../places/tests/chrome/test_bug549192.xhtml       | 131 +++++++++++++++++
 .../places/tests/chrome/test_bug549491.xhtml       |  78 ++++++++++
 .../chrome/test_selectItems_on_nested_tree.xhtml   |  85 +++++++++++
 .../places/tests/chrome/test_treeview_date.xhtml   | 159 +++++++++++++++++++++
 8 files changed, 687 insertions(+)
 create mode 100644 browser/components/places/tests/chrome/chrome.ini
 create mode 100644 browser/components/places/tests/chrome/head.js
 create mode 100644 browser/components/places/tests/chrome/test_0_bug510634.xhtml
 create mode 100644 browser/components/places/tests/chrome/test_bug1163447_selectItems_through_shortcut.xhtml
 create mode 100644 browser/components/places/tests/chrome/test_bug549192.xhtml
 create mode 100644 browser/components/places/tests/chrome/test_bug549491.xhtml
 create mode 100644 browser/components/places/tests/chrome/test_selectItems_on_nested_tree.xhtml
 create mode 100644 browser/components/places/tests/chrome/test_treeview_date.xhtml

(limited to 'browser/components/places/tests/chrome')

diff --git a/browser/components/places/tests/chrome/chrome.ini b/browser/components/places/tests/chrome/chrome.ini
new file mode 100644
index 0000000000..3ca7ebdd60
--- /dev/null
+++ b/browser/components/places/tests/chrome/chrome.ini
@@ -0,0 +1,10 @@
+[DEFAULT]
+support-files = head.js
+
+[test_0_bug510634.xhtml]
+[test_bug1163447_selectItems_through_shortcut.xhtml]
+skip-if = (os == 'win' && processor == 'aarch64') # bug 1532775
+[test_bug549192.xhtml]
+[test_bug549491.xhtml]
+[test_selectItems_on_nested_tree.xhtml]
+[test_treeview_date.xhtml]
\ No newline at end of file
diff --git a/browser/components/places/tests/chrome/head.js b/browser/components/places/tests/chrome/head.js
new file mode 100644
index 0000000000..6a19fd89d3
--- /dev/null
+++ b/browser/components/places/tests/chrome/head.js
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+Services.scriptloader.loadSubScript(
+  "chrome://global/content/globalOverlay.js",
+  this
+);
+Services.scriptloader.loadSubScript(
+  "chrome://browser/content/utilityOverlay.js",
+  this
+);
+
+ChromeUtils.defineESModuleGetters(this, {
+  BrowserTestUtils: "resource://testing-common/BrowserTestUtils.sys.mjs",
+  PlacesTestUtils: "resource://testing-common/PlacesTestUtils.sys.mjs",
+});
+
+ChromeUtils.defineESModuleGetters(window, {
+  PlacesUIUtils: "resource:///modules/PlacesUIUtils.sys.mjs",
+  PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  PlacesTransactions: "resource://gre/modules/PlacesTransactions.sys.mjs",
+});
+
+var { XPCOMUtils } = ChromeUtils.importESModule(
+  "resource://gre/modules/XPCOMUtils.sys.mjs"
+);
+XPCOMUtils.defineLazyScriptGetter(
+  window,
+  ["PlacesTreeView"],
+  "chrome://browser/content/places/treeView.js"
+);
+XPCOMUtils.defineLazyScriptGetter(
+  window,
+  ["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"],
+  "chrome://browser/content/places/controller.js"
+);
diff --git a/browser/components/places/tests/chrome/test_0_bug510634.xhtml b/browser/components/places/tests/chrome/test_0_bug510634.xhtml
new file mode 100644
index 0000000000..9f75047b79
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_0_bug510634.xhtml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+
+<!-- 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/. -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="510634: Wrong icons on bookmarks sidebar"
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript">
+  <![CDATA[
+
+    /**
+     * Bug 510634 -  Wrong icons on bookmarks sidebar
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=510634
+     *
+     * Ensures that properties for special queries are set on their tree nodes.
+     */
+
+    SimpleTest.waitForExplicitFinish();
+
+    function runTest() {
+      // Setup the places tree contents.
+      let tree = document.getElementById("tree");
+      tree.place = `place:type=${Ci.nsINavHistoryQueryOptions.RESULTS_AS_LEFT_PANE_QUERY}&excludeItems=1&expandQueries=0`;
+
+      // The query-property is set on the title column for each row.
+      let titleColumn = tree.columns.getColumnAt(0);
+
+      // Open All Bookmarks
+      tree.selectItems([PlacesUtils.virtualAllBookmarksGuid]);
+      PlacesUtils.asContainer(tree.selectedNode).containerOpen = true;
+      is(tree.selectedNode.uri,
+         "place:type=" + Ci.nsINavHistoryQueryOptions.RESULTS_AS_ROOTS_QUERY,
+         "Opened All Bookmarks");
+
+      const topLevelGuids = [
+        PlacesUtils.virtualHistoryGuid,
+        PlacesUtils.virtualDownloadsGuid,
+        PlacesUtils.virtualTagsGuid,
+        PlacesUtils.virtualAllBookmarksGuid
+      ];
+
+      for (let queryName of topLevelGuids) {
+        let found = false;
+        for (let i = 0; i < tree.view.rowCount && !found; i++) {
+          let rowProperties = tree.view.getCellProperties(i, titleColumn).split(" ");
+          found = rowProperties.includes("OrganizerQuery_" + queryName);
+        }
+        ok(found, `OrganizerQuery_${queryName} is set`);
+      }
+
+      const folderGuids = [
+        PlacesUtils.bookmarks.toolbarGuid,
+        PlacesUtils.bookmarks.menuGuid,
+        PlacesUtils.bookmarks.unfiledGuid,
+      ];
+
+      for (let guid of folderGuids) {
+        let found = false;
+        for (let i = 0; i < tree.view.rowCount && !found; i++) {
+          let rowProperties = tree.view.getCellProperties(i, titleColumn).split(" ");
+          found = rowProperties.includes("queryFolder_" + guid);
+        }
+        ok(found, `queryFolder_${guid} is set`);
+      }
+
+      // Close the root node
+      tree.result.root.containerOpen = false;
+
+      SimpleTest.finish();
+    }
+
+  ]]>
+  </script>
+</window>
diff --git a/browser/components/places/tests/chrome/test_bug1163447_selectItems_through_shortcut.xhtml b/browser/components/places/tests/chrome/test_bug1163447_selectItems_through_shortcut.xhtml
new file mode 100644
index 0000000000..f945c7e169
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_bug1163447_selectItems_through_shortcut.xhtml
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+
+<!--
+    Any copyright is dedicated to the Public Domain.
+    http://creativecommons.org/licenses/publicdomain/
+   -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="1163447:  selectItems in Places no longer selects items within Toolbar or Sidebar folders"
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript"><![CDATA[
+
+    /**
+     * Bug 1163447: places-tree should be able to select an item within the toolbar, and
+     * unfiled bookmarks. Yet not follow recursive folder-shortcuts infinitely.
+     */
+
+    function runTest() {
+      SimpleTest.waitForExplicitFinish();
+
+      (async function() {
+        let bmu = PlacesUtils.bookmarks;
+
+        await bmu.insert({
+          parentGuid: bmu.toolbarGuid,
+          index: bmu.DEFAULT_INDEX,
+          type: bmu.TYPE_BOOKMARK,
+          url: `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
+          title: "shortcut to self - causing infinite recursion if not handled properly"
+        });
+
+        await bmu.insert({
+          parentGuid: bmu.toolbarGuid,
+          index: bmu.DEFAULT_INDEX,
+          type: bmu.TYPE_BOOKMARK,
+          url: `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
+          title: "shortcut to unfiled, within toolbar"
+        });
+
+        let folder = await bmu.insert({
+          parentGuid: bmu.unfiledGuid,
+          index: bmu.DEFAULT_INDEX,
+          type: bmu.TYPE_FOLDER,
+          title: "folder within unfiled"
+        });
+
+        // Setup the places tree contents.
+        let tree = document.getElementById("tree");
+        tree.place = `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`;
+
+        // Select the folder via the selectItems(folder.guid) API being tested
+        tree.selectItems([folder.guid]);
+
+        is(tree.selectedNode && tree.selectedNode.bookmarkGuid, folder.guid, "The node was selected through the shortcut");
+
+        // Cleanup
+        await bmu.eraseEverything();
+
+      })().catch(err => {
+        ok(false, `Uncaught error: ${err}`);
+      }).then(SimpleTest.finish);
+    }
+  ]]></script>
+</window>
diff --git a/browser/components/places/tests/chrome/test_bug549192.xhtml b/browser/components/places/tests/chrome/test_bug549192.xhtml
new file mode 100644
index 0000000000..8017c1f2f5
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_bug549192.xhtml
@@ -0,0 +1,131 @@
+<?xml version="1.0"?>
+
+<!--
+    Any copyright is dedicated to the Public Domain.
+    http://creativecommons.org/licenses/publicdomain/
+   -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="549192:  History view not updated after deleting entry"
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flatList="true"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript"><![CDATA[
+    /**
+     * Bug 874407
+     * Ensures that history views are updated properly after visits.
+     * Bug 549192
+     * Ensures that history views are updated after deleting entries.
+     */
+
+    function runTest() {
+      SimpleTest.waitForExplicitFinish();
+
+      (async function() {
+        await PlacesUtils.history.clear();
+
+        // Add some visits.
+        let timeInMicroseconds = PlacesUtils.toPRTime(Date.now() - 10000);
+
+        function newTimeInMicroseconds() {
+          timeInMicroseconds = timeInMicroseconds + 1000;
+          return timeInMicroseconds;
+        }
+
+        const transition = PlacesUtils.history.TRANSITIONS.TYPED;
+        let places =
+          [{ uri: Services.io.newURI("http://example.tld/"),
+             visitDate: newTimeInMicroseconds(), transition },
+           { uri: Services.io.newURI("http://example2.tld/"),
+             visitDate: newTimeInMicroseconds(), transition },
+           { uri: Services.io.newURI("http://example3.tld/"),
+             visitDate: newTimeInMicroseconds(), transition }];
+
+        await PlacesTestUtils.addVisits(places);
+
+        // Make a history query.
+        let query = PlacesUtils.history.getNewQuery();
+        let opts = PlacesUtils.history.getNewQueryOptions();
+        opts.sortingMode = opts.SORT_BY_DATE_DESCENDING;
+        let queryURI = PlacesUtils.history.queryToQueryString(query, opts);
+
+        // Setup the places tree contents.
+        var tree = document.getElementById("tree");
+        tree.place = queryURI;
+
+        // loop through the rows and check them.
+        let treeView = tree.view;
+        let selection = treeView.selection;
+        let rc = treeView.rowCount;
+
+        for (let i = 0; i < rc; i++) {
+          selection.select(i);
+          let node = tree.selectedNode;
+          is(node.uri, places[rc - i - 1].uri.spec,
+             "Found expected node at position " + i + ".");
+        }
+
+        is(rc, 3, "Found expected number of rows.");
+
+        // First check live-update of the view when adding visits.
+        places.forEach(place => place.visitDate = newTimeInMicroseconds());
+        await PlacesTestUtils.addVisits(places);
+
+        for (let i = 0; i < rc; i++) {
+          selection.select(i);
+          let node = tree.selectedNode;
+          is(node.uri, places[rc - i - 1].uri.spec,
+             "Found expected node at position " + i + ".");
+        }
+
+        // Now remove the pages and verify live-update again.
+        for (let i = 0; i < rc; i++) {
+          selection.select(0);
+          let node = tree.selectedNode;
+
+          const promiseRemoved = PlacesTestUtils.waitForNotification(
+            "page-removed",
+            events => events[0].url === node.uri,
+            "places"
+          );
+
+          tree.controller.remove();
+
+          const removeEvents = await promiseRemoved;
+          ok(
+            removeEvents[0].isRemovedFromStore,
+            "isRemovedFromStore should be true"
+          );
+          ok(treeView.treeIndexForNode(node) == -1, node.uri + " removed.");
+          is(treeView.rowCount, rc - i - 1, "Rows count decreased");
+        }
+
+        // Cleanup.
+        await PlacesUtils.history.clear();
+      })().then(() => SimpleTest.finish());
+    }
+  ]]></script>
+</window>
diff --git a/browser/components/places/tests/chrome/test_bug549491.xhtml b/browser/components/places/tests/chrome/test_bug549491.xhtml
new file mode 100644
index 0000000000..80ca8c11f7
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_bug549491.xhtml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+
+<!--
+    Any copyright is dedicated to the Public Domain.
+    http://creativecommons.org/licenses/publicdomain/
+   -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="549491: 'The root node is never visible' exception when details of the root node are modified "
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flatList="true"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <treecol label="Date" anonid="date" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript"><![CDATA[
+    /**
+     * Bug 549491
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=549491
+     *
+     * Ensures that changing the details of places tree's root-node doesn't
+     * throw.
+     */
+
+    function runTest() {
+      SimpleTest.waitForExplicitFinish();
+
+      (async function() {
+        await PlacesUtils.history.clear();
+
+        await PlacesTestUtils.addVisits({
+          uri: Services.io.newURI("http://example.tld/"),
+          transition: PlacesUtils.history.TRANSITION_TYPED
+        });
+
+        // Make a history query.
+        let query = PlacesUtils.history.getNewQuery();
+        let opts = PlacesUtils.history.getNewQueryOptions();
+        let queryURI = PlacesUtils.history.queryToQueryString(query, opts);
+
+        // Setup the places tree contents.
+        let tree = document.getElementById("tree");
+        tree.place = queryURI;
+
+        let rootNode = tree.result.root;
+        let obs = tree.view.QueryInterface(Ci.nsINavHistoryResultObserver);
+        obs.nodeHistoryDetailsChanged(rootNode, rootNode.time, rootNode.accessCount);
+        obs.nodeTitleChanged(rootNode, rootNode.title);
+        ok(true, "No exceptions thrown");
+
+        // Cleanup.
+        await PlacesUtils.history.clear();
+      })().then(SimpleTest.finish);
+    }
+  ]]></script>
+</window>
diff --git a/browser/components/places/tests/chrome/test_selectItems_on_nested_tree.xhtml b/browser/components/places/tests/chrome/test_selectItems_on_nested_tree.xhtml
new file mode 100644
index 0000000000..724f46b6f3
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_selectItems_on_nested_tree.xhtml
@@ -0,0 +1,85 @@
+<?xml version="1.0"?>
+
+<!--
+    Any copyright is dedicated to the Public Domain.
+    http://creativecommons.org/licenses/publicdomain/
+   -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="549192:  History view not updated after deleting entry"
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript"><![CDATA[
+    /**
+     * Ensure that selectItems doesn't recurse infinitely in nested trees.
+     */
+
+    function runTest() {
+      SimpleTest.waitForExplicitFinish();
+
+      (async function() {
+        await PlacesUtils.bookmarks.insert({
+          parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+          index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+          type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+          url: `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
+          title: "shortcut"
+        });
+
+        await PlacesUtils.bookmarks.insert({
+          parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+          index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+          type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+          url: `place:parent=${PlacesUtils.bookmarks.unfiledGuid}&maxResults=10`,
+          title: "query"
+        });
+
+        let folder = await PlacesUtils.bookmarks.insert({
+          parentGuid: PlacesUtils.bookmarks.unfiledGuid,
+          index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+          type: PlacesUtils.bookmarks.TYPE_FOLDER,
+          title: "folder"
+        });
+
+        let bm = await PlacesUtils.bookmarks.insert({
+          parentGuid: folder.guid,
+          index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+          type: PlacesUtils.bookmarks.TYPE_BOOKMARK,
+          url: "http://www.mozilla.org/",
+          title: "bookmark"
+        });
+
+        // Setup the places tree contents.
+        let tree = document.getElementById("tree");
+        tree.place = `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`;
+
+        // Select the last bookmark.
+        tree.selectItems([bm.guid]);
+        is (tree.selectedNode.bookmarkGuid, bm.guid, "The right node was selected");
+      })().then(SimpleTest.finish);
+    }
+  ]]></script>
+</window>
diff --git a/browser/components/places/tests/chrome/test_treeview_date.xhtml b/browser/components/places/tests/chrome/test_treeview_date.xhtml
new file mode 100644
index 0000000000..075383cd66
--- /dev/null
+++ b/browser/components/places/tests/chrome/test_treeview_date.xhtml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+
+<!-- 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/. -->
+
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
+                 type="text/css"?>
+
+<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
+<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
+
+<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="435322: Places tree view's formatting"
+        onload="runTest();">
+
+  <script type="application/javascript"
+          src="chrome://browser/content/places/places-tree.js"/>
+  <script src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js" />
+  <script type="application/javascript" src="head.js" />
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+  <tree id="tree"
+        is="places-tree"
+        flatList="true"
+        flex="1">
+    <treecols>
+      <treecol label="Title" id="title" anonid="title" primary="true" style="-moz-box-ordinal-group: 1;" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <treecol label="Tags" id="tags" anonid="tags" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <treecol label="Url" id="url" anonid="url" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <treecol label="Visit Date" id="date" anonid="date" flex="1"/>
+      <splitter class="tree-splitter"/>
+      <treecol label="Visit Count" id="visitCount" anonid="visitCount" flex="1"/>
+    </treecols>
+    <treechildren flex="1"/>
+  </tree>
+
+  <script type="application/javascript">
+  <![CDATA[
+
+    /**
+     * Bug 435322
+     * https://bugzilla.mozilla.org/show_bug.cgi?id=435322
+     *
+     * Ensures that date in places treeviews is correctly formatted.
+     */
+
+    function runTest() {
+      SimpleTest.waitForExplicitFinish();
+
+      function uri(spec) {
+        return Services.io.newURI(spec);
+      }
+
+      (async function() {
+        await PlacesUtils.history.clear();
+
+        let midnight = new Date();
+        midnight.setHours(0);
+        midnight.setMinutes(0);
+        midnight.setSeconds(0);
+        midnight.setMilliseconds(0);
+
+        // Add a visit 1ms before midnight, a visit at midnight, and
+        // a visit 1ms after midnight.
+        await PlacesTestUtils.addVisits([
+          {uri: uri("http://before.midnight.com/"),
+           visitDate: (midnight.getTime() - 1) * 1000,
+           transition: PlacesUtils.history.TRANSITION_TYPED},
+          {uri: uri("http://at.midnight.com/"),
+           visitDate: (midnight.getTime()) * 1000,
+           transition: PlacesUtils.history.TRANSITION_TYPED},
+          {uri: uri("http://after.midnight.com/"),
+           visitDate: (midnight.getTime() + 1) * 1000,
+           transition: PlacesUtils.history.TRANSITION_TYPED}
+        ]);
+
+        // add a bookmark to the midnight visit
+        let bm = await PlacesUtils.bookmarks.insert({
+          parentGuid: PlacesUtils.bookmarks.toolbarGuid,
+          index: PlacesUtils.bookmarks.DEFAULT_INDEX,
+          url: "http://at.midnight.com/",
+          title: "A bookmark at midnight",
+          type: PlacesUtils.bookmarks.TYPE_BOOKMARK
+        });
+
+        // Make a history query.
+        let query = PlacesUtils.history.getNewQuery();
+        let opts = PlacesUtils.history.getNewQueryOptions();
+        let queryURI = PlacesUtils.history.queryToQueryString(query, opts);
+
+        // Setup the places tree contents.
+        let tree = document.getElementById("tree");
+        tree.place = queryURI;
+
+        // loop through the rows and check formatting
+        let treeView = tree.view;
+        let rc = treeView.rowCount;
+        ok(rc >= 3, "Rows found");
+        let columns = tree.columns;
+        ok(columns.count > 0, "Columns found");
+        for (let r = 0; r < rc; r++) {
+          let node = treeView.nodeForTreeIndex(r);
+          ok(node, "Places node found");
+          for (let ci = 0; ci < columns.count; ci++) {
+            let c = columns.getColumnAt(ci);
+            let text = treeView.getCellText(r, c);
+            switch (c.element.getAttribute("anonid")) {
+              case "title":
+                // The title can differ, we did not set any title so we would
+                // expect null, but in such a case the view will generate a title
+                // through PlacesUIUtils.getBestTitle.
+                if (node.title)
+                  is(text, node.title, "Title is correct");
+                break;
+              case "url":
+                is(text, node.uri, "Uri is correct");
+                break;
+              case "date":
+                let timeObj = new Date(node.time / 1000);
+                // Default is short date format.
+                let dtOptions = {
+                  dateStyle: "short",
+                  timeStyle: "short"
+                };
+
+                // For today's visits we don't show date portion.
+                if (node.uri == "http://at.midnight.com/" ||
+                    node.uri == "http://after.midnight.com/") {
+                  dtOptions.dateStyle = undefined;
+                } else if (node.uri != "http://before.midnight.com/") {
+                  // Avoid to test spurious uris, due to how the test works
+                  // a redirecting uri could be put in the tree while we test.
+                  break;
+                }
+                let timeStr = new Services.intl.DateTimeFormat(undefined, dtOptions).format(timeObj);
+
+                is(text, timeStr, "Date format is correct");
+                break;
+              case "visitCount":
+                is(text, 1, "Visit count is correct");
+                break;
+            }
+          }
+        }
+
+        // Cleanup.
+        await PlacesUtils.bookmarks.remove(bm.guid);
+        await PlacesUtils.history.clear();
+      })().then(SimpleTest.finish);
+    }
+  ]]>
+  </script>
+</window>
-- 
cgit v1.2.3