History: Add search browser test.

chrome/test/data/webui/history_browsertest.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.
 
 /** @const */ var TOTAL_RESULT_COUNT = 160;
 /** @const */ var WAIT_TIMEOUT = 200;
 
 /**
  * Create a fake history result with the given timestamp.
  * @param {Number} timestamp Timestamp of the entry, in ms since the epoch.
@@ skipping 161 matching lines @@
   var offset = args[1];
   var range = args[2];
   var endTime = args[3] || Number.MAX_VALUE;
   var maxCount = args[4];
 
   // Advance past all entries newer than the specified end time.
   var i = 0;
   while (i < history.length && history[i].time >= endTime)
     ++i;
 
   var results = new Array();

[Patrick Dubroy, 2013/04/03 09:52:10]

Oh, I just noticed this. Should be "[]" instead of the Array constructor.

[Sergiu, 2013/04/03 13:43:39]

Done.

   if (beginTime) {
     var j = i;
     while (j < history.length && history[j].time >= beginTime)
       ++j;
 
     results = history.slice(i, j);
   } else {
     results = history.slice(i);
   }
 
   if (maxCount)
     results = results.slice(0, maxCount);
 
+  // Search only by title in this stub.
+  if (searchText) {

[Patrick Dubroy, 2013/04/03 09:52:10]

I feel like this should probably be moved to above "if (beginTime)", so that
maxCount, etc. will still apply.

Maybe you could do something like:

  if (searchText) {
    ...
  } else {
    results = history;  // Make a copy.
  }

And then change the code inside the "if (beginTime)" block to be results =
results.slice(...).

Alternatively, maybe use console.error() to ensure that searchText is never set
when maxCount or beginTime/endTime is, and put a note in that the stub is
deliberately limited.

But, it shouldn't be too difficult to get it all working together.

[Sergiu, 2013/04/03 13:43:39]

Makes sense, fixed.

+    var newResults = new Array();

[Patrick Dubroy, 2013/04/03 09:52:10]

Use "[]" instead of the Array constructor.

[Sergiu, 2013/04/03 13:43:39]

Done.

+    for (var k = 0; k < results.length; k++) {
+      if (results[k].title.indexOf(searchText) != -1)
+        newResults.push(results[k]);
+    }
+    results = newResults;
+  }
+
   var queryStartTime = '';
   var queryEndTime = '';
   if (results.length) {
     queryStartTime = results[results.length - 1].dateRelativeDay;
     queryEndTime = results[0].dateRelativeDay;
   } else if (beginTime) {
     queryStartTime = Date(beginTime);
     queryEndTime = Date(endTime);
   }
 
   callFrontendAsync(
       'historyResult',
       {
         term: searchText,
-        finished: (history.length <= i + results.length),
+        finished: (searchText || history.length <= i + results.length),
         queryStartTime: queryStartTime,
         queryEndTime: queryEndTime
       },
       results);
 }
 
 /**
  * Fixture for History WebUI testing which returns some fake history results
  * to the frontend.
  * @extends {BaseHistoryWebUITest}
@@ skipping 273 matching lines @@
   // checkbox-20 to checkbox-24 should be deselected now.
   expectEquals(12, checked.length);
   // First set of checkboxes (11).
   checkInterval(checked, 4, 14);
   // Only checkbox-19 should still be selected.
   expectEquals('checkbox-19', checked[11].id);
 
   testDone();
 });
 
+TEST_F('HistoryWebUITest', 'searchHistory', function() {
+  var getResultCount = function() {
+    return document.querySelectorAll('.entry').length;
+  };
+  // See that all the elements are there.
+  expectEquals(RESULTS_PER_PAGE, getResultCount());
+
+  // See that the search works.
+  $('search-field').value = 'Thu Oct 02 2008';
+  $('search-button').click();
+
+  waitForCallback('historyResult', function() {
+    expectEquals(31, getResultCount());
+
+    // Clear the search.
+    $('search-field').value = '';
+    $('search-button').click();
+    waitForCallback('historyResult', function() {
+      expectEquals(RESULTS_PER_PAGE, getResultCount());
+      testDone();
+    });
+  });
+});
+
 function setPageState(searchText, page, groupByDomain, range, offset) {
   window.location = '#' + PageState.getHashString(
       searchText, page, groupByDomain, range, offset);
 }
 
 function RangeHistoryWebUITest() {}
 
 RangeHistoryWebUITest.prototype = {
   __proto__: HistoryWebUITest.prototype,
 
@@ skipping 149 matching lines @@
 
   waitForCallback('historyResult', function() {
     // See if the correct number of days is shown.
     var resultsDisplay = $('results-display');
     assertEquals(0, resultsDisplay.querySelectorAll('.months-results').length);
     assertEquals(1, resultsDisplay.querySelectorAll('div').length);
 
     testDone();
   });
 });