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

Side by Side Diff: components/suggestions/image_manager_unittest.cc

Issue 630073002: [Suggestions] Create ImageEncoder, to abstract away image encode/decode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn fix Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <string> 5 #include <string>
6 #include <vector>
6 7
7 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
8 #include "base/run_loop.h" 9 #include "base/run_loop.h"
9 #include "components/leveldb_proto/proto_database.h" 10 #include "components/leveldb_proto/proto_database.h"
10 #include "components/leveldb_proto/testing/fake_db.h" 11 #include "components/leveldb_proto/testing/fake_db.h"
12 #include "components/suggestions/image_encoder.h"
11 #include "components/suggestions/image_fetcher.h" 13 #include "components/suggestions/image_fetcher.h"
12 #include "components/suggestions/image_fetcher_delegate.h" 14 #include "components/suggestions/image_fetcher_delegate.h"
13 #include "components/suggestions/image_manager.h" 15 #include "components/suggestions/image_manager.h"
16 #include "components/suggestions/jpeg/jpeg_image_encoder.h"
14 #include "components/suggestions/proto/suggestions.pb.h" 17 #include "components/suggestions/proto/suggestions.pb.h"
15 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
16 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/gfx/image/image_skia.h" 20 #include "ui/gfx/image/image_skia.h"
18 #include "url/gurl.h" 21 #include "url/gurl.h"
19 22
20 using ::testing::Return; 23 using ::testing::Return;
21 using ::testing::StrictMock; 24 using ::testing::StrictMock;
22 using ::testing::_; 25 using ::testing::_;
23 26
(...skipping 15 matching lines...) Expand all
39 class MockImageFetcher : public suggestions::ImageFetcher { 42 class MockImageFetcher : public suggestions::ImageFetcher {
40 public: 43 public:
41 MockImageFetcher() {} 44 MockImageFetcher() {}
42 virtual ~MockImageFetcher() {} 45 virtual ~MockImageFetcher() {}
43 MOCK_METHOD3(StartOrQueueNetworkRequest, 46 MOCK_METHOD3(StartOrQueueNetworkRequest,
44 void(const GURL&, const GURL&, 47 void(const GURL&, const GURL&,
45 base::Callback<void(const GURL&, const SkBitmap*)>)); 48 base::Callback<void(const GURL&, const SkBitmap*)>));
46 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*)); 49 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
47 }; 50 };
48 51
52 class MockImageEncoder : public suggestions::ImageEncoder {
53 public:
54 MockImageEncoder() {}
55 virtual ~MockImageEncoder() {}
56 MOCK_METHOD1(DecodeImage,
57 SkBitmap*(const std::vector<unsigned char>&));
58 MOCK_METHOD2(EncodeImage, bool(const SkBitmap&, std::vector<unsigned char>*));
59 };
60
49 class ImageManagerTest : public testing::Test { 61 class ImageManagerTest : public testing::Test {
50 public: 62 public:
51 ImageManagerTest() 63 ImageManagerTest()
52 : mock_image_fetcher_(NULL), 64 : mock_image_fetcher_(NULL),
53 num_callback_null_called_(0), 65 num_callback_null_called_(0),
54 num_callback_valid_called_(0) {} 66 num_callback_valid_called_(0) {}
55 67
56 virtual void SetUp() override { 68 virtual void SetUp() override {
57 fake_db_ = new FakeDB<ImageData>(&db_model_); 69 fake_db_ = new FakeDB<ImageData>(&db_model_);
58 image_manager_.reset(CreateImageManager(fake_db_)); 70 jpeg_image_encoder_ = new JpegImageEncoder();
71 image_manager_.reset(CreateImageManager(fake_db_, jpeg_image_encoder_));
59 } 72 }
60 73
61 virtual void TearDown() override { 74 virtual void TearDown() override {
62 fake_db_ = NULL; 75 fake_db_ = NULL;
63 db_model_.clear(); 76 db_model_.clear();
64 image_manager_.reset(); 77 image_manager_.reset();
65 } 78 }
66 79
67 void InitializeDefaultImageMapAndDatabase(ImageManager* image_manager, 80 void InitializeDefaultImageMapAndDatabase(ImageManager* image_manager,
68 FakeDB<ImageData>* fake_db) { 81 FakeDB<ImageData>* fake_db) {
(...skipping 16 matching lines...) Expand all
85 ImageData GetSampleImageData(const std::string& url) { 98 ImageData GetSampleImageData(const std::string& url) {
86 // Create test bitmap. 99 // Create test bitmap.
87 SkBitmap bm; 100 SkBitmap bm;
88 // Being careful with the Bitmap. There are memory-related issue in 101 // Being careful with the Bitmap. There are memory-related issue in
89 // crbug.com/101781. 102 // crbug.com/101781.
90 bm.allocN32Pixels(4, 4); 103 bm.allocN32Pixels(4, 4);
91 bm.eraseColor(SK_ColorRED); 104 bm.eraseColor(SK_ColorRED);
92 ImageData data; 105 ImageData data;
93 data.set_url(url); 106 data.set_url(url);
94 std::vector<unsigned char> encoded; 107 std::vector<unsigned char> encoded;
95 EXPECT_TRUE(ImageManager::EncodeImage(bm, &encoded)); 108 EXPECT_TRUE(jpeg_image_encoder_->EncodeImage(bm, &encoded));
96 data.set_data(std::string(encoded.begin(), encoded.end())); 109 data.set_data(std::string(encoded.begin(), encoded.end()));
97 return data; 110 return data;
98 } 111 }
99 112
100 void OnImageAvailable(base::RunLoop* loop, const GURL& url, 113 void OnImageAvailable(base::RunLoop* loop, const GURL& url,
101 const SkBitmap* bitmap) { 114 const SkBitmap* bitmap) {
102 if (bitmap) { 115 if (bitmap) {
103 num_callback_valid_called_++; 116 num_callback_valid_called_++;
104 } else { 117 } else {
105 num_callback_null_called_++; 118 num_callback_null_called_++;
106 } 119 }
107 loop->Quit(); 120 loop->Quit();
108 } 121 }
109 122
110 ImageManager* CreateImageManager(FakeDB<ImageData>* fake_db) { 123 ImageManager* CreateImageManager(FakeDB<ImageData>* fake_db,
124 JpegImageEncoder* jpeg_image_encoder) {
111 mock_image_fetcher_ = new StrictMock<MockImageFetcher>(); 125 mock_image_fetcher_ = new StrictMock<MockImageFetcher>();
112 EXPECT_CALL(*mock_image_fetcher_, SetImageFetcherDelegate(_)); 126 EXPECT_CALL(*mock_image_fetcher_, SetImageFetcherDelegate(_));
113 return new ImageManager( 127 return new ImageManager(
114 scoped_ptr<ImageFetcher>(mock_image_fetcher_), 128 scoped_ptr<ImageFetcher>(mock_image_fetcher_),
129 scoped_ptr<ImageEncoder>(jpeg_image_encoder),
115 scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> >(fake_db), 130 scoped_ptr<leveldb_proto::ProtoDatabase<ImageData> >(fake_db),
116 FakeDB<ImageData>::DirectoryForTestDB()); 131 FakeDB<ImageData>::DirectoryForTestDB());
117 } 132 }
118 133
119 EntryMap db_model_; 134 EntryMap db_model_;
120 // Owned by the ImageManager under test. 135 // Owned by the ImageManager under test.
121 FakeDB<ImageData>* fake_db_; 136 FakeDB<ImageData>* fake_db_;
137 JpegImageEncoder* jpeg_image_encoder_;
122 138
123 MockImageFetcher* mock_image_fetcher_; 139 MockImageFetcher* mock_image_fetcher_;
124 140
125 int num_callback_null_called_; 141 int num_callback_null_called_;
126 int num_callback_valid_called_; 142 int num_callback_valid_called_;
127 // Under test. 143 // Under test.
128 scoped_ptr<ImageManager> image_manager_; 144 scoped_ptr<ImageManager> image_manager_;
129 }; 145 };
130 146
131 TEST_F(ImageManagerTest, InitializeTest) { 147 TEST_F(ImageManagerTest, InitializeTest) {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 TEST_F(ImageManagerTest, GetImageForURLNetworkCacheHit) { 184 TEST_F(ImageManagerTest, GetImageForURLNetworkCacheHit) {
169 SuggestionsProfile suggestions_profile; 185 SuggestionsProfile suggestions_profile;
170 ChromeSuggestion* suggestion = suggestions_profile.add_suggestions(); 186 ChromeSuggestion* suggestion = suggestions_profile.add_suggestions();
171 suggestion->set_url(kTestUrl1); 187 suggestion->set_url(kTestUrl1);
172 // The URL we set is invalid, to show that it will fail from network. 188 // The URL we set is invalid, to show that it will fail from network.
173 suggestion->set_thumbnail(kInvalidImagePath); 189 suggestion->set_thumbnail(kInvalidImagePath);
174 190
175 // Create the ImageManager with an added entry in the database. 191 // Create the ImageManager with an added entry in the database.
176 AddEntry(GetSampleImageData(kTestUrl1), &db_model_); 192 AddEntry(GetSampleImageData(kTestUrl1), &db_model_);
177 FakeDB<ImageData>* fake_db = new FakeDB<ImageData>(&db_model_); 193 FakeDB<ImageData>* fake_db = new FakeDB<ImageData>(&db_model_);
178 image_manager_.reset(CreateImageManager(fake_db)); 194 image_manager_.reset(CreateImageManager(fake_db, new JpegImageEncoder()));
179 image_manager_->Initialize(suggestions_profile); 195 image_manager_->Initialize(suggestions_profile);
180 fake_db->InitCallback(true); 196 fake_db->InitCallback(true);
181 fake_db->LoadCallback(true); 197 fake_db->LoadCallback(true);
182 // Expect something in the cache. 198 // Expect something in the cache.
183 SkBitmap* bitmap = image_manager_->GetBitmapFromCache(GURL(kTestUrl1)); 199 SkBitmap* bitmap = image_manager_->GetBitmapFromCache(GURL(kTestUrl1));
184 EXPECT_FALSE(bitmap->isNull()); 200 EXPECT_FALSE(bitmap->isNull());
185 201
186 base::RunLoop run_loop; 202 base::RunLoop run_loop;
187 image_manager_->GetImageForURL(GURL(kTestUrl1), 203 image_manager_->GetImageForURL(GURL(kTestUrl1),
188 base::Bind(&ImageManagerTest::OnImageAvailable, 204 base::Bind(&ImageManagerTest::OnImageAvailable,
189 base::Unretained(this), &run_loop)); 205 base::Unretained(this), &run_loop));
190 run_loop.Run(); 206 run_loop.Run();
191 207
192 EXPECT_EQ(0, num_callback_null_called_); 208 EXPECT_EQ(0, num_callback_null_called_);
193 EXPECT_EQ(1, num_callback_valid_called_); 209 EXPECT_EQ(1, num_callback_valid_called_);
194 } 210 }
195 211
196 } // namespace suggestions 212 } // namespace suggestions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698