Don't strip punctuation inside quotes in history search queries.

chrome/browser/history/text_database_manager_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/text_database_manager.h"
 #include "chrome/browser/history/visit_database.h"
@@ skipping 17 matching lines @@
 const char* kBody2 = "FOO two.";
 
 const char* kURL3 = "http://www.google.com/zxcv";
 const char* kTitle3 = "Google C";
 const char* kBody3 = "FOO drei";
 
 const char* kURL4 = "http://www.google.com/hjkl";
 const char* kTitle4 = "Google D";
 const char* kBody4 = "FOO lalala four.";
 
 const char* kURL5 = "http://www.google.com/uiop";

[mrossetti, 2012/02/09 00:27:03]

Again I might suggest adding an URL with at least one escaped character and
doing a search that matches.

[Patrick Dubroy, 2012/02/09 14:47:00]

Done.

 const char* kTitle5 = "Google cinq";
-const char* kBody5 = "FOO page one.";
+const char* kBody5 = "FOO page one. Including: punctuation.";
 
 // This provides a simple implementation of a URL+VisitDatabase using an
 // in-memory sqlite connection. The text database manager expects to be able to
 // update the visit database to keep in sync.
 class InMemDB : public URLDatabase, public VisitDatabase {
  public:
   InMemDB() {
     EXPECT_TRUE(db_.OpenInMemory());
     CreateURLTable(false);
     InitVisitTable();
@@ skipping 476 matching lines @@
   EXPECT_TRUE(first_time_searched <= times[0]);
   EXPECT_TRUE(ResultsHaveURL(results, kURL2));
   EXPECT_TRUE(ResultsHaveURL(results, kURL1));
 
   // Try to query some more, there should be no results.
   options.end_time = first_time_searched;
   manager.GetTextMatches(foo, options, &results, &first_time_searched);
   EXPECT_EQ(0U, results.size());
 }
 
+TEST_F(TextDatabaseManagerTest, Query) {
+  ASSERT_TRUE(Init());
+
+  QueryOptions options;
+  std::vector<TextDatabase::Match> results;
+  Time first_time_searched;
+
+  InMemDB visit_db;
+
+  TextDatabaseManager manager(dir_, &visit_db, &visit_db);
+  ASSERT_TRUE(manager.Init(NULL));
+
+  std::vector<Time> times;
+  AddAllPages(manager, &visit_db, &times);
+
+  // Try a multi-word query.
+  manager.GetTextMatches(UTF8ToUTF16("FOO drei"), options,

[mrossetti, 2012/02/09 00:27:03]

Use ASCIIToUTF16 instead of UTF8ToUTF16 when you have a hard-coded constant
string like this. 4 places.

Note: For extra credit you could change the other 18 places where ASCIIToUTF16
should be used instead of UTF8ToUTF16 in the existing code.

[Patrick Dubroy, 2012/02/09 14:47:00]

Done.

+                         &results, &first_time_searched);
+  EXPECT_EQ(1U, results.size());
+  results.clear();
+
+  // Try a quoted query that should match every URL.
+  manager.GetTextMatches(UTF8ToUTF16("\"google.com\""), options,
+                         &results, &first_time_searched);
+  EXPECT_EQ(6U, results.size());
+  results.clear();
+
+  // Try a quoted query that should match the body.
+  manager.GetTextMatches(UTF8ToUTF16("\"Including: punctuation.\""), options,
+                         &results, &first_time_searched);
+  EXPECT_EQ(1U, results.size());
+  results.clear();
+
+  // Ensure that punctuation is not ignored in quoted strings.
+  manager.GetTextMatches(UTF8ToUTF16("\"Including punctuation\""), options,
+                         &results, &first_time_searched);
+  EXPECT_EQ(0U, results.size());
+  results.clear();
+}
+
 }  // namespace history