Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #import "ios/chrome/browser/ui/history/favicon_view_provider.h" | 5 #import "ios/chrome/browser/ui/history/favicon_view_provider.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
| 10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
| 11 #include "base/location.h" | 11 #include "base/location.h" |
| 12 #include "base/mac/scoped_nsobject.h" | |
| 13 #include "base/path_service.h" | 12 #include "base/path_service.h" |
| 14 #include "base/single_thread_task_runner.h" | 13 #include "base/single_thread_task_runner.h" |
| 15 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
| 16 #include "base/threading/thread_task_runner_handle.h" | 15 #include "base/threading/thread_task_runner_handle.h" |
| 17 #include "components/favicon/core/favicon_client.h" | 16 #include "components/favicon/core/favicon_client.h" |
| 18 #include "components/favicon/core/favicon_service.h" | 17 #include "components/favicon/core/favicon_service.h" |
| 19 #include "components/favicon/core/large_icon_service.h" | 18 #include "components/favicon/core/large_icon_service.h" |
| 20 #include "components/favicon_base/fallback_icon_style.h" | 19 #include "components/favicon_base/fallback_icon_style.h" |
| 21 #include "components/favicon_base/favicon_types.h" | 20 #include "components/favicon_base/favicon_types.h" |
| 22 #include "ios/chrome/browser/chrome_paths.h" | 21 #include "ios/chrome/browser/chrome_paths.h" |
| 23 #include "ios/web/public/test/test_web_thread.h" | 22 #include "ios/web/public/test/test_web_thread.h" |
| 24 #include "ios/web/public/test/test_web_thread_bundle.h" | 23 #include "ios/web/public/test/test_web_thread_bundle.h" |
| 25 #include "skia/ext/skia_utils_ios.h" | 24 #include "skia/ext/skia_utils_ios.h" |
| 26 #include "testing/gtest_mac.h" | 25 #include "testing/gtest_mac.h" |
| 27 #include "testing/platform_test.h" | 26 #include "testing/platform_test.h" |
| 28 #include "third_party/ocmock/OCMock/OCMock.h" | 27 #include "third_party/ocmock/OCMock/OCMock.h" |
| 29 #include "third_party/ocmock/gtest_support.h" | 28 #include "third_party/ocmock/gtest_support.h" |
| 30 #include "third_party/skia/include/core/SkColor.h" | 29 #include "third_party/skia/include/core/SkColor.h" |
| 31 #include "url/gurl.h" | 30 #include "url/gurl.h" |
| 32 | 31 |
| 32 #if !defined(__has_feature) || !__has_feature(objc_arc) | |
| 33 #error "This file requires ARC support." | |
| 34 #endif | |
| 35 | |
| 33 @interface FaviconViewProvider (Testing) | 36 @interface FaviconViewProvider (Testing) |
| 34 @property(nonatomic, retain) UIImage* favicon; | 37 @property(nonatomic, retain) UIImage* favicon; |
| 35 @property(nonatomic, copy) NSString* fallbackText; | 38 @property(nonatomic, copy) NSString* fallbackText; |
| 36 @property(nonatomic, retain) UIColor* fallbackBackgroundColor; | 39 @property(nonatomic, retain) UIColor* fallbackBackgroundColor; |
| 37 @property(nonatomic, retain) UIColor* fallbackTextColor; | 40 @property(nonatomic, retain) UIColor* fallbackTextColor; |
| 38 @end | 41 @end |
| 39 | 42 |
| 40 namespace { | 43 namespace { |
| 41 | 44 |
| 42 // Dummy URL for the favicon case. | 45 // Dummy URL for the favicon case. |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 124 web::TestWebThreadBundle thread_bundle_; | 127 web::TestWebThreadBundle thread_bundle_; |
| 125 std::unique_ptr<MockFaviconService> mock_favicon_service_; | 128 std::unique_ptr<MockFaviconService> mock_favicon_service_; |
| 126 std::unique_ptr<TestLargeIconService> large_icon_service_; | 129 std::unique_ptr<TestLargeIconService> large_icon_service_; |
| 127 base::CancelableTaskTracker cancelable_task_tracker_; | 130 base::CancelableTaskTracker cancelable_task_tracker_; |
| 128 }; | 131 }; |
| 129 | 132 |
| 130 // Tests that image is set when a favicon is returned from LargeIconService. | 133 // Tests that image is set when a favicon is returned from LargeIconService. |
| 131 TEST_F(FaviconViewProviderTest, Favicon) { | 134 TEST_F(FaviconViewProviderTest, Favicon) { |
| 132 id mock_delegate = | 135 id mock_delegate = |
| 133 [OCMockObject mockForProtocol:@protocol(FaviconViewProviderDelegate)]; | 136 [OCMockObject mockForProtocol:@protocol(FaviconViewProviderDelegate)]; |
| 134 base::scoped_nsobject<FaviconViewProvider> viewProvider( | 137 FaviconViewProvider* viewProvider = |
| 135 [[FaviconViewProvider alloc] initWithURL:GURL(kTestFaviconURL) | 138 [[FaviconViewProvider alloc] initWithURL:GURL(kTestFaviconURL) |
| 136 faviconSize:kTestFaviconSize | 139 faviconSize:kTestFaviconSize |
| 137 minFaviconSize:kTestFaviconSize | 140 minFaviconSize:kTestFaviconSize |
| 138 largeIconService:large_icon_service_.get() | 141 largeIconService:large_icon_service_.get() |
| 139 delegate:mock_delegate]); | 142 delegate:mock_delegate]; |
| 140 void (^confirmationBlock)(NSInvocation*) = ^(NSInvocation* invocation) { | 143 void (^confirmationBlock)(NSInvocation*) = ^(NSInvocation* invocation) { |
| 141 FaviconViewProvider* viewProvider; | 144 __unsafe_unretained FaviconViewProvider* viewProvider; |
|
noyau (Ping after 24h)
2017/01/27 16:04:38
Needs a comment.
stkhapugin
2017/02/02 15:29:23
Don't think this needs a comment:
This is the only
| |
| 142 [invocation getArgument:&viewProvider atIndex:2]; | 145 [invocation getArgument:&viewProvider atIndex:2]; |
| 143 EXPECT_NSNE(nil, viewProvider.favicon); | 146 EXPECT_NSNE(nil, viewProvider.favicon); |
| 144 }; | 147 }; |
| 145 [[[mock_delegate stub] andDo:confirmationBlock] | 148 [[[mock_delegate stub] andDo:confirmationBlock] |
| 146 faviconViewProviderFaviconDidLoad:viewProvider]; | 149 faviconViewProviderFaviconDidLoad:viewProvider]; |
| 147 EXPECT_OCMOCK_VERIFY(mock_delegate); | 150 EXPECT_OCMOCK_VERIFY(mock_delegate); |
| 148 } | 151 } |
| 149 | 152 |
| 150 // Tests that fallback data is set when no favicon is returned from | 153 // Tests that fallback data is set when no favicon is returned from |
| 151 // LargeIconService. | 154 // LargeIconService. |
| 152 TEST_F(FaviconViewProviderTest, FallbackIcon) { | 155 TEST_F(FaviconViewProviderTest, FallbackIcon) { |
| 153 id mock_delegate = | 156 id mock_delegate = |
| 154 [OCMockObject mockForProtocol:@protocol(FaviconViewProviderDelegate)]; | 157 [OCMockObject mockForProtocol:@protocol(FaviconViewProviderDelegate)]; |
| 155 base::scoped_nsobject<FaviconViewProvider> item([[FaviconViewProvider alloc] | 158 FaviconViewProvider* item = |
| 156 initWithURL:GURL(kTestFallbackURL) | 159 [[FaviconViewProvider alloc] initWithURL:GURL(kTestFallbackURL) |
| 157 faviconSize:kTestFaviconSize | 160 faviconSize:kTestFaviconSize |
| 158 minFaviconSize:kTestFaviconSize | 161 minFaviconSize:kTestFaviconSize |
| 159 largeIconService:large_icon_service_.get() | 162 largeIconService:large_icon_service_.get() |
| 160 delegate:mock_delegate]); | 163 delegate:mock_delegate]; |
| 161 | 164 |
| 162 // Confirm that fallback text and color have been set before delegate call. | 165 // Confirm that fallback text and color have been set before delegate call. |
| 163 void (^confirmationBlock)(NSInvocation*) = ^(NSInvocation* invocation) { | 166 void (^confirmationBlock)(NSInvocation*) = ^(NSInvocation* invocation) { |
| 164 FaviconViewProvider* viewProvider; | 167 __unsafe_unretained FaviconViewProvider* viewProvider; |
|
sczs
2017/01/27 18:55:40
There's probably a good reason, just want to know
stkhapugin
2017/02/02 15:29:23
Unfortunately in this case only __unsafe_uretained
| |
| 165 [invocation getArgument:&viewProvider atIndex:2]; | 168 [invocation getArgument:&viewProvider atIndex:2]; |
| 166 // Fallback text is the first letter of the URL. | 169 // Fallback text is the first letter of the URL. |
| 167 NSString* defaultText = @"T"; | 170 NSString* defaultText = @"T"; |
| 168 // Default colors are defined in | 171 // Default colors are defined in |
| 169 // components/favicon_base/fallback_icon_style.h. | 172 // components/favicon_base/fallback_icon_style.h. |
| 170 UIColor* defaultTextColor = skia::UIColorFromSkColor(SK_ColorWHITE); | 173 UIColor* defaultTextColor = skia::UIColorFromSkColor(SK_ColorWHITE); |
| 171 UIColor* defaultBackgroundColor = | 174 UIColor* defaultBackgroundColor = |
| 172 skia::UIColorFromSkColor(SkColorSetRGB(0x78, 0x78, 0x78)); | 175 skia::UIColorFromSkColor(SkColorSetRGB(0x78, 0x78, 0x78)); |
| 173 EXPECT_NSEQ(defaultText, viewProvider.fallbackText); | 176 EXPECT_NSEQ(defaultText, viewProvider.fallbackText); |
| 174 EXPECT_NSEQ(defaultTextColor, viewProvider.fallbackTextColor); | 177 EXPECT_NSEQ(defaultTextColor, viewProvider.fallbackTextColor); |
| 175 EXPECT_NSEQ(defaultBackgroundColor, viewProvider.fallbackBackgroundColor); | 178 EXPECT_NSEQ(defaultBackgroundColor, viewProvider.fallbackBackgroundColor); |
| 176 }; | 179 }; |
| 177 [[[mock_delegate stub] andDo:confirmationBlock] | 180 [[[mock_delegate stub] andDo:confirmationBlock] |
| 178 faviconViewProviderFaviconDidLoad:item]; | 181 faviconViewProviderFaviconDidLoad:item]; |
| 179 EXPECT_OCMOCK_VERIFY(mock_delegate); | 182 EXPECT_OCMOCK_VERIFY(mock_delegate); |
| 180 } | 183 } |
| 181 | 184 |
| 182 } // namespace | 185 } // namespace |
| OLD | NEW |