Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(88)

Side by Side Diff: chrome/browser/search_engines/template_url_parser_unittest.cc

Issue 9982018: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate t… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/file_util.h" 5 #include "base/file_util.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/search_engines/template_url.h" 9 #include "chrome/browser/search_engines/template_url.h"
10 #include "chrome/browser/search_engines/template_url_parser.h" 10 #include "chrome/browser/search_engines/template_url_parser.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 const std::string& file_name, 92 const std::string& file_name,
93 TemplateURLParser::ParameterFilter* filter) { 93 TemplateURLParser::ParameterFilter* filter) {
94 FilePath full_path; 94 FilePath full_path;
95 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &full_path)); 95 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &full_path));
96 full_path = full_path.AppendASCII("osdd"); 96 full_path = full_path.AppendASCII("osdd");
97 full_path = full_path.AppendASCII(file_name); 97 full_path = full_path.AppendASCII(file_name);
98 ASSERT_TRUE(file_util::PathExists(full_path)); 98 ASSERT_TRUE(file_util::PathExists(full_path));
99 99
100 std::string contents; 100 std::string contents;
101 ASSERT_TRUE(file_util::ReadFileToString(full_path, &contents)); 101 ASSERT_TRUE(file_util::ReadFileToString(full_path, &contents));
102 template_url_.reset(TemplateURLParser::Parse(NULL, contents.data(), 102 template_url_.reset(TemplateURLParser::Parse(NULL, false, contents.data(),
103 contents.length(), filter)); 103 contents.length(), filter));
104 } 104 }
105 105
106 106
107 // Actual tests --------------------------------------------------------------- 107 // Actual tests ---------------------------------------------------------------
108 108
109 TEST_F(TemplateURLParserTest, FailOnBogusURL) { 109 TEST_F(TemplateURLParserTest, FailOnBogusURL) {
110 if (is_disabled()) 110 if (is_disabled())
111 return; 111 return;
112 ASSERT_NO_FATAL_FAILURE(ParseFile("bogus.xml", NULL)); 112 ASSERT_NO_FATAL_FAILURE(ParseFile("bogus.xml", NULL));
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name()); 250 EXPECT_EQ(ASCIIToUTF16("Yahoo"), template_url_->short_name());
251 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement()); 251 EXPECT_TRUE(template_url_->url_ref().SupportsReplacement());
252 EXPECT_TRUE(template_url_->suggestions_url().empty()); 252 EXPECT_TRUE(template_url_->suggestions_url().empty());
253 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8", 253 EXPECT_EQ("http://search.yahoo.com/search?p={searchTerms}&ei=UTF-8",
254 template_url_->url()); 254 template_url_->url());
255 ASSERT_EQ(1U, template_url_->input_encodings().size()); 255 ASSERT_EQ(1U, template_url_->input_encodings().size());
256 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]); 256 EXPECT_EQ("UTF-8", template_url_->input_encodings()[0]);
257 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"), 257 EXPECT_EQ(GURL("http://search.yahoo.com/favicon.ico"),
258 template_url_->favicon_url()); 258 template_url_->favicon_url());
259 } 259 }
OLDNEW
« no previous file with comments | « chrome/browser/search_engines/template_url_parser.cc ('k') | chrome/browser/search_engines/template_url_prepopulate_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698