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

chrome/browser/history/query_parser_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/query_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class QueryParserTest : public testing::Test {
@@ skipping 28 matching lines @@
   EXPECT_EQ("f b", QueryToString(" f b"));
   // KA JANG
   EXPECT_EQ(WideToUTF8(L"\xAC00 \xC7A5"),
             QueryToString(WideToUTF8(L" \xAC00 \xC7A5")));
   EXPECT_EQ("foo* bar*", QueryToString(" foo   bar "));
   // KA-JANG BICH-GO
   EXPECT_EQ(WideToUTF8(L"\xAC00\xC7A5* \xBE5B\xACE0*"),
             QueryToString(WideToUTF8(L"\xAC00\xC7A5 \xBE5B\xACE0")));
 }
 
-TEST_F(QueryParserTest, Numbers) {
-  EXPECT_EQ("66", QueryToString("66"));
-  EXPECT_EQ("wayne99gretzky*", QueryToString("wayne99gretzky"));
-}
-
 // Quoted substring parsing.
 TEST_F(QueryParserTest, Quoted) {
   // ASCII quotes
   EXPECT_EQ("\"Quoted\"", QueryToString("\"Quoted\""));
   // Missing end quotes
   EXPECT_EQ("\"miss end\"", QueryToString("\"miss end"));
   // Missing begin quotes
   EXPECT_EQ("miss* beg*", QueryToString("miss beg\""));
   // Weird formatting
   EXPECT_EQ("\"Many\" \"quotes\"", QueryToString("\"Many   \"\"quotes"));
-  EXPECT_EQ("\"ab\" cd \"ef\"", QueryToString("\"ab\" cd \"ef\""));
-  EXPECT_EQ("tra* \"la\" la", QueryToString("tra \"la\" la"));
 }
 
 // Apostrophes within words should be preserved, but otherwise stripped.
 TEST_F(QueryParserTest, Apostrophes) {
   EXPECT_EQ("foo* bar's*", QueryToString("foo bar's"));
   EXPECT_EQ("l'foo*", QueryToString("l'foo"));
   EXPECT_EQ("foo*", QueryToString("'foo"));
 }
 
 // Special characters.
 TEST_F(QueryParserTest, SpecialChars) {
   EXPECT_EQ("foo* the* bar*", QueryToString("!#:/*foo#$*;'* the!#:/*bar"));
-
-  // Domain-name-like strings should be left intact.
-  EXPECT_EQ("chromium.org*", QueryToString("chromium.org"));
-  EXPECT_EQ("a.b.c*", QueryToString("a.b.c"));
-
-  // More complex queries will get broken up, but that's ok.
-  EXPECT_EQ("hhof.com* cup* a b c d 20e*",
-            QueryToString("hhof.com/cup?a=b&c=d%20e"));
-
-  // Special chars inside quotes should be preserved.
-  EXPECT_EQ("\"$FOO\" bar*", QueryToString("\"$FOO\" .bar*"));
-  EXPECT_EQ("\"hhof.com/cup?a=b&c=d%20e\"",
-            QueryToString("\"hhof.com/cup?a=b&c=d%20e\""));
-
-  // Leading punctuation should always be stripped.
-  EXPECT_EQ("test*", QueryToString(".test"));
-  EXPECT_EQ("test.*", QueryToString("~test."));
-  EXPECT_EQ("test*", QueryToString("--test"));
 }
 
 TEST_F(QueryParserTest, NumWords) {
   TestData data[] = {
     { "blah",                  1 },
     { "foo \"bar baz\"",       3 },
     { "foo \"baz\"",           2 },
     { "foo \"bar baz\"  blah", 4 },
   };
 
@@ skipping 72 matching lines @@
     QueryParser parser;
     parser.ParseQueryWords(UTF8ToUTF16(data[i].text), &results);
     ASSERT_EQ(data[i].word_count, results.size());
     EXPECT_EQ(data[i].w1, UTF16ToUTF8(results[0]));
     if (results.size() == 2)
       EXPECT_EQ(data[i].w2, UTF16ToUTF8(results[1]));
     if (results.size() == 3)
       EXPECT_EQ(data[i].w3, UTF16ToUTF8(results[2]));
   }
 }