1 files changed, 84 insertions, 0 deletions
diff --git a/toolkit/components/places/tests/chrome/test_341972b.xul b/toolkit/components/places/tests/chrome/test_341972b.xul
new file mode 100644
index 000000000..86cdc75f3
--- /dev/null
+++ b/toolkit/components/places/tests/chrome/test_341972b.xul
@@ -0,0 +1,84 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin" type="text/css"?>
+<?xml-stylesheet
+  href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?>
+<window title="Update Livemark SiteURI, null to start"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  onload="runTest()">
+  <script type="application/javascript"
+   src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
+
+  <body xmlns="http://www.w3.org/1999/xhtml" />
+
+<script type="application/javascript">
+<![CDATA[
+/*
+ Test updating livemark siteURI to the value from the feed, when it's null
+ */
+SimpleTest.waitForExplicitFinish();
+
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cr = Components.results;
+
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+Components.utils.import("resource://gre/modules/NetUtil.jsm");
+Components.utils.import("resource://gre/modules/PlacesUtils.jsm");
+
+function runTest() {
+  const FEEDSPEC = "http://mochi.test:8888/tests/toolkit/components/places/tests/chrome/sample_feed.atom";
+  const FEEDSITESPEC = "http://example.org/"; 
+
+  PlacesUtils.livemarks.addLivemark(
+    { title: "foo"
+    , parentGuid: PlacesUtils.bookmarks.toolbarGuid
+    , feedURI: NetUtil.newURI(FEEDSPEC)
+    })
+    .then(function (aLivemark) {
+      is(aLivemark.siteURI, null, "Has null livemark site URI");
+
+      waitForLivemarkLoad(aLivemark, function (aLivemark) {
+        is(aLivemark.siteURI.spec, FEEDSITESPEC,
+           "livemark site URI set to value in feed");
+
+        PlacesUtils.livemarks.removeLivemark(aLivemark).then(() => {
+          SimpleTest.finish();
+        });
+      });
+    }, function () {
+      is(true, false, "Should not fail adding a livemark");
+    }
+  );
+}
+
+function waitForLivemarkLoad(aLivemark, aCallback) {
+  // Don't need a real node here.
+  let node = {};
+  let resultObserver = {
+    nodeInserted: function() {},
+    nodeRemoved: function() {},
+    nodeAnnotationChanged: function() {},
+    nodeTitleChanged: function() {},
+    nodeHistoryDetailsChanged: function() {},
+    nodeMoved: function() {},
+    ontainerStateChanged: function () {},
+    sortingChanged: function() {},
+    batching: function() {},
+    invalidateContainer: function(node) {
+      isnot(aLivemark.status, Ci.mozILivemark.STATUS_FAILED,
+            "Loading livemark should success");
+      if (aLivemark.status == Ci.mozILivemark.STATUS_READY) {
+        aLivemark.unregisterForUpdates(node, resultObserver);
+        aCallback(aLivemark);
+      }
+    }
+  };
+  aLivemark.registerForUpdates(node, resultObserver);
+  aLivemark.reload();
+}
+
+]]>
+</script>
+
+</window>