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

Side by Side Diff: net/proxy/proxy_resolver_v8_unittest.cc

Issue 2819011: TTF: Reenable some disabled tests. (Closed)
Patch Set: Created 10 years, 6 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
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/string_util.h" 6 #include "base/string_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "googleurl/src/gurl.h" 8 #include "googleurl/src/gurl.h"
9 #include "net/base/net_log_unittest.h" 9 #include "net/base/net_log_unittest.h"
10 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result); 299 EXPECT_EQ(ERR_PAC_SCRIPT_FAILED, result);
300 300
301 MockJSBindings* bindings = resolver.mock_js_bindings(); 301 MockJSBindings* bindings = resolver.mock_js_bindings();
302 EXPECT_EQ(0U, bindings->alerts.size()); 302 EXPECT_EQ(0U, bindings->alerts.size());
303 ASSERT_EQ(1U, bindings->errors.size()); 303 ASSERT_EQ(1U, bindings->errors.size());
304 EXPECT_EQ("Uncaught ReferenceError: undefined_variable is not defined", 304 EXPECT_EQ("Uncaught ReferenceError: undefined_variable is not defined",
305 bindings->errors[0]); 305 bindings->errors[0]);
306 EXPECT_EQ(3, bindings->errors_line_number[0]); 306 EXPECT_EQ(3, bindings->errors_line_number[0]);
307 } 307 }
308 308
309 // TODO(eroman): This test is disabed right now, since the parsing of 309 // TODO(eroman): This test fails right now, since the parsing of
310 // host/port doesn't check for non-ascii characters. 310 // host/port doesn't check for non-ascii characters. http://crbug.com/46608
311 TEST(ProxyResolverV8Test, DISABLED_ReturnUnicode) { 311 TEST(ProxyResolverV8Test, FAILS_ReturnUnicode) {
312 ProxyResolverV8WithMockBindings resolver; 312 ProxyResolverV8WithMockBindings resolver;
313 int result = resolver.SetPacScriptFromDisk("return_unicode.js"); 313 int result = resolver.SetPacScriptFromDisk("return_unicode.js");
314 EXPECT_EQ(OK, result); 314 EXPECT_EQ(OK, result);
315 315
316 ProxyInfo proxy_info; 316 ProxyInfo proxy_info;
317 result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, 317 result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
318 BoundNetLog()); 318 BoundNetLog());
319 319
320 // The result from this resolve was unparseable, because it 320 // The result from this resolve was unparseable, because it
321 // wasn't ascii. 321 // wasn't ascii.
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL, 539 result = resolver.GetProxyForURL(kQueryUrl, &proxy_info, NULL, NULL,
540 BoundNetLog()); 540 BoundNetLog());
541 541
542 EXPECT_EQ(OK, result); 542 EXPECT_EQ(OK, result);
543 EXPECT_FALSE(proxy_info.is_direct()); 543 EXPECT_FALSE(proxy_info.is_direct());
544 EXPECT_EQ("success:80", proxy_info.proxy_server().ToURI()); 544 EXPECT_EQ("success:80", proxy_info.proxy_server().ToURI());
545 } 545 }
546 546
547 } // namespace 547 } // namespace
548 } // namespace net 548 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698