Support folders in bookmark search

chrome/test/data/extensions/api_test/bookmarks/test.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // bookmarks api test
 // browser_tests.exe --gtest_filter=ExtensionApiTest.Bookmarks
 
 // This is global state that is maintained across tests as a reference
 // to compare against what's fetched from the browser (using compareTrees).
 // TODO(erikkay) It would be better if each test was self-contained and
 // didn't depend on global state.
 var expected = [
   {"children": [
       {children:[], id:"1", parentId:"0", index:0, title:"Bookmarks bar"},
       {children:[], id:"2", parentId:"0", index:1, title:"Other bookmarks"}
     ],
    id:"0", title:""
   }
 ];
 
 function bookmarksBar() { return expected[0].children[0]; }
 function otherBookmarks() { return expected[0].children[1]; }
 
 // Some variables that are used across multiple tests.
-var node1 = {parentId:"1", title:"Foo bar baz",
+var node1 = {parentId:"1", title:"bar baz",
              url:"http://www.example.com/hello"};
 var node2 = {parentId:"1", title:"foo quux",
              url:"http://www.example.com/bar"};
-var node3 = {parentId:"1", title:"bar baz",
+var node3 = {parentId:"1", title:"Foo bar baz",
              url:"http://www.google.com/hello/quux"};
 var quota_node1 = {parentId:"1", title:"Dave",
                    url:"http://www.dmband.com/"};
 var quota_node2 = {parentId:"1", title:"UW",
                    url:"http://www.uwaterloo.ca/"};
 var quota_node3 = {parentId:"1", title:"Whistler",
                    url:"http://www.whistlerblackcomb.com/"};
 
 var pass = chrome.test.callbackPass;
 var fail = chrome.test.callbackFail;
@@ skipping 254 matching lines @@
     chrome.bookmarks.search("www hello", pass(function(results) {
       // matches node1 & node3
       chrome.test.assertEq(2, results.length);
     }));
     chrome.bookmarks.search("bar example",
                             pass(function(results) {
       // matches node2
       chrome.test.assertEq(1, results.length);
     }));
     chrome.bookmarks.search("foo bar", pass(function(results) {
-      // matches node1 & folder "foo bar" from createFolder
+      // matches node3 & folder "foo bar" from createFolder
       chrome.test.assertEq(2, results.length);
     }));
     chrome.bookmarks.search("quux", pass(function(results) {
-      // matches node2 & node3
+      // matches node2 & node1
       chrome.test.assertEq(2, results.length);
     }));
+    chrome.bookmarks.search("Bookmark Bar", pass(function(results) {
+      // Does not match any node since permanent nodes are stripped from search
+      chrome.test.assertEq(0, results.length);
+    }));
   },
 
   function update() {
     var title = "hello world";
     chrome.test.listenOnce(chrome.bookmarks.onChanged, function(id, changes) {
       chrome.test.assertEq(title, changes.title);
     });
     chrome.bookmarks.update(node1.id, {"title": title}, pass(function(results) {
       chrome.test.assertEq(title, results.title);
     }));
@@ skipping 36 matching lines @@
       chrome.test.assertEq(removeInfo.parentId, parentId);
       chrome.test.assertEq(removeInfo.index, node1.index);
     });
     chrome.bookmarks.remove(node1.id, pass(function() {
       // Update expected to match.
       // We removed node1, which means that the index of the other two nodes
       // changes as well.
       expected[0].children[1].children[1].children.shift();
       expected[0].children[1].children[1].children[0].index = 0;
       expected[0].children[1].children[1].children[1].index = 1;
-
       verifyTreeIsExpected(pass());
     }));
   },
 
+  function searchRemoved() {
+      // Search for deleted node
+      chrome.bookmarks.search("baz bar", pass(function(results) {
+        // matches only node3 since node1 was removed
+        chrome.test.assertEq(1, results.length);
+      }));
+  },
+
   function removeTree() {
     var parentId = node2.parentId;
     var folder = expected[0].children[1].children[1];
     chrome.test.listenOnce(chrome.bookmarks.onRemoved,
                            function(id, removeInfo) {
       chrome.test.assertEq(id, folder.id);
       chrome.test.assertEq(removeInfo.parentId, folder.parentId);
       chrome.test.assertEq(removeInfo.index, folder.index);
     });
     chrome.bookmarks.removeTree(parentId, pass(function(){
       // Update expected to match.
       expected[0].children[1].children.pop();
       verifyTreeIsExpected(pass());
     }));
   },
 
+  function searchRemovedTree() {
+    // Search for deleted folder and enclosed node3
+    chrome.bookmarks.search("foo bar", pass(function(results) {
+      // Does not match anything since folder was removed with node3 in it
+      chrome.test.assertEq(0, results.length);
+    }));
+  },
+
   function quotaLimitedCreate() {
     var node = {parentId:"1", title:"quotacreate", url:"http://www.quota.com/"};
     for (i = 0; i < 100; i++) {
       chrome.bookmarks.create(node, pass(function(results) {
         expected[0].children[0].children.push(results);
       }));
     }
     chrome.bookmarks.create(
         node,
         fail("This request exceeds the MAX_WRITE_OPERATIONS_PER_HOUR quota."));
@@ skipping 46 matching lines @@
     });
 
     function afterRemove() {
       // Once done add 3 nodes
       chrome.bookmarks.getTree(pass(function(results) {
         chrome.test.assertEq(0, results[0].children[0].children.length);
         chrome.test.assertEq(0, results[0].children[1].children.length);
         expected = results;
 
         // Reset the nodes
-        node1 = {parentId:"1", title:"Foo bar baz",
+        node1 = {parentId:"1", title:"bar baz",
                  url:"http://www.example.com/hello"};
         node2 = {parentId:"1", title:"foo quux",
                  url:"http://www.example.com/bar"};
-        node3 = {parentId:"1", title:"bar baz",
+        node3 = {parentId:"1", title:"Foo bar baz",
                   url:"http://www.google.com/hello/quux"};
         createNodes(bookmarksBar(), [node1, node2, node3], pass(function() {
           verifyTreeIsExpected(pass());
         }));
       }));
     }
   },
 
   function getRecent() {
     var failed = false;
@@ skipping 14 matching lines @@
                            "Should only get the last 2 bookmarks");
 
       chrome.test.assertTrue(compareNode(node3, results[0]));
       chrome.test.assertTrue(compareNode(node2, results[1]));
     }));
   }
 ]);
 }
 
 run();