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

Side by Side Diff: chrome/browser/android/contextualsearch/contextual_search_delegate_unittest.cc

Issue 2322793002: [Contextual Search] Fetch and display thumbnails returned in resolution response (Closed)
Patch Set: std::unique_ptr Created 4 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/android/contextualsearch/contextual_search_delegate.h" 5 #include "chrome/browser/android/contextualsearch/contextual_search_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 "\"display_text\":\"Barack Obama\", \"mentions\":[0,15]," 498 "\"display_text\":\"Barack Obama\", \"mentions\":[0,15],"
499 "\"selected_text\":\"obama\", \"resolved_term\":\"barack obama\"}"; 499 "\"selected_text\":\"obama\", \"resolved_term\":\"barack obama\"}";
500 std::string search_term; 500 std::string search_term;
501 std::string display_text; 501 std::string display_text;
502 std::string alternate_term; 502 std::string alternate_term;
503 std::string mid; 503 std::string mid;
504 std::string prevent_preload; 504 std::string prevent_preload;
505 int mention_start; 505 int mention_start;
506 int mention_end; 506 int mention_end;
507 std::string context_language; 507 std::string context_language;
508 std::string thumbnail_url;
508 delegate_->DecodeSearchTermFromJsonResponse( 509 delegate_->DecodeSearchTermFromJsonResponse(
509 json_with_escape, &search_term, &display_text, &alternate_term, 510 json_with_escape, &search_term, &display_text, &alternate_term,
510 &mid, &prevent_preload, &mention_start, &mention_end, &context_language); 511 &mid, &prevent_preload, &mention_start, &mention_end, &context_language,
512 &thumbnail_url);
511 EXPECT_EQ("obama", search_term); 513 EXPECT_EQ("obama", search_term);
512 EXPECT_EQ("Barack Obama", display_text); 514 EXPECT_EQ("Barack Obama", display_text);
513 EXPECT_EQ("barack obama", alternate_term); 515 EXPECT_EQ("barack obama", alternate_term);
514 EXPECT_EQ("/m/02mjmr", mid); 516 EXPECT_EQ("/m/02mjmr", mid);
515 EXPECT_EQ("", prevent_preload); 517 EXPECT_EQ("", prevent_preload);
516 EXPECT_EQ("", context_language); 518 EXPECT_EQ("", context_language);
519 EXPECT_EQ("", thumbnail_url);
517 } 520 }
518 521
519 TEST_F(ContextualSearchDelegateTest, ResponseWithLanguage) { 522 TEST_F(ContextualSearchDelegateTest, ResponseWithLanguage) {
520 CreateDefaultSearchContextAndRequestSearchTerm(); 523 CreateDefaultSearchContextAndRequestSearchTerm();
521 fetcher()->set_response_code(200); 524 fetcher()->set_response_code(200);
522 fetcher()->SetResponseString( 525 fetcher()->SetResponseString(
523 "{\"mid\":\"/m/02mjmr\",\"search_term\":\"obama\"," 526 "{\"mid\":\"/m/02mjmr\",\"search_term\":\"obama\","
524 "\"mentions\":[0,15],\"prevent_preload\":\"1\", " 527 "\"mentions\":[0,15],\"prevent_preload\":\"1\", "
525 "\"lang\":\"de\"}"); 528 "\"lang\":\"de\"}");
526 fetcher()->delegate()->OnURLFetchComplete(fetcher()); 529 fetcher()->delegate()->OnURLFetchComplete(fetcher());
527 530
528 EXPECT_FALSE(is_invalid()); 531 EXPECT_FALSE(is_invalid());
529 EXPECT_EQ(200, response_code()); 532 EXPECT_EQ(200, response_code());
530 EXPECT_EQ("obama", search_term()); 533 EXPECT_EQ("obama", search_term());
531 EXPECT_EQ("obama", display_text()); 534 EXPECT_EQ("obama", display_text());
532 EXPECT_EQ("/m/02mjmr", mid()); 535 EXPECT_EQ("/m/02mjmr", mid());
533 EXPECT_TRUE(do_prevent_preload()); 536 EXPECT_TRUE(do_prevent_preload());
534 EXPECT_EQ("de", context_language()); 537 EXPECT_EQ("de", context_language());
535 } 538 }
536 539
537 TEST_F(ContextualSearchDelegateTest, HeaderContainsBasePageUrl) { 540 TEST_F(ContextualSearchDelegateTest, HeaderContainsBasePageUrl) {
538 CreateDefaultSearchContextAndRequestSearchTerm(); 541 CreateDefaultSearchContextAndRequestSearchTerm();
539 EXPECT_EQ(kSomeSpecificBasePage, getBasePageUrlFromRequest()); 542 EXPECT_EQ(kSomeSpecificBasePage, getBasePageUrlFromRequest());
540 } 543 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698