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

Unified Diff: ios/web/web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm

Issue 2752113002: Moved WebView(ScrollView)Proxy files to ui subdirectory. (Closed)
Patch Set: Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/web/web_state/ui/crw_web_view_scroll_view_proxy.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm
diff --git a/ios/web/web_state/crw_web_view_scroll_view_proxy_unittest.mm b/ios/web/web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm
similarity index 74%
rename from ios/web/web_state/crw_web_view_scroll_view_proxy_unittest.mm
rename to ios/web/web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm
index 04a042823f014d985753861e94aa050b32083079..2f3581b8e2a80d127fe238e4744a472cce1c19ef 100644
--- a/ios/web/web_state/crw_web_view_scroll_view_proxy_unittest.mm
+++ b/ios/web/web_state/ui/crw_web_view_scroll_view_proxy_unittest.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "ios/web/public/web_state/crw_web_view_scroll_view_proxy.h"
+#import "ios/web/public/web_state/ui/crw_web_view_scroll_view_proxy.h"
#import <UIKit/UIKit.h>
@@ -68,38 +68,39 @@ TEST_F(CRWWebViewScrollViewProxyTest, testScrollViewPresent) {
// Arbitrary point.
const CGPoint point = CGPointMake(10, 10);
- [[[mockScrollView_ stub]
- andReturnValue:[NSValue valueWithCGPoint:point]] contentOffset];
- EXPECT_TRUE(CGPointEqualToPoint(point,
- [webViewScrollViewProxy_ contentOffset]));
+ [[[mockScrollView_ stub] andReturnValue:[NSValue valueWithCGPoint:point]]
+ contentOffset];
+ EXPECT_TRUE(
+ CGPointEqualToPoint(point, [webViewScrollViewProxy_ contentOffset]));
// Arbitrary inset.
const UIEdgeInsets contentInset = UIEdgeInsetsMake(10, 10, 10, 10);
- [[[mockScrollView_ stub] andReturnValue:
- [NSValue valueWithUIEdgeInsets:contentInset]] contentInset];
- EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(contentInset,
- [webViewScrollViewProxy_ contentInset]));
+ [[[mockScrollView_ stub]
+ andReturnValue:[NSValue valueWithUIEdgeInsets:contentInset]]
+ contentInset];
+ EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(
+ contentInset, [webViewScrollViewProxy_ contentInset]));
// Arbitrary inset.
const UIEdgeInsets scrollIndicatorInsets = UIEdgeInsetsMake(20, 20, 20, 20);
- [[[mockScrollView_ stub] andReturnValue:[NSValue
- valueWithUIEdgeInsets:scrollIndicatorInsets]] scrollIndicatorInsets];
- EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(scrollIndicatorInsets,
- [webViewScrollViewProxy_ scrollIndicatorInsets]));
+ [[[mockScrollView_ stub]
+ andReturnValue:[NSValue valueWithUIEdgeInsets:scrollIndicatorInsets]]
+ scrollIndicatorInsets];
+ EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(
+ scrollIndicatorInsets, [webViewScrollViewProxy_ scrollIndicatorInsets]));
// Arbitrary size.
const CGSize contentSize = CGSizeMake(19, 19);
- [[[mockScrollView_ stub] andReturnValue:
- [NSValue valueWithCGSize:contentSize]] contentSize];
- EXPECT_TRUE(CGSizeEqualToSize(contentSize,
- [webViewScrollViewProxy_ contentSize]));
+ [[[mockScrollView_ stub] andReturnValue:[NSValue valueWithCGSize:contentSize]]
+ contentSize];
+ EXPECT_TRUE(
+ CGSizeEqualToSize(contentSize, [webViewScrollViewProxy_ contentSize]));
// Arbitrary rect.
const CGRect frame = CGRectMake(2, 4, 5, 1);
- [[[mockScrollView_ stub] andReturnValue:
- [NSValue valueWithCGRect:frame]] frame];
- EXPECT_TRUE(CGRectEqualToRect(frame,
- [webViewScrollViewProxy_ frame]));
+ [[[mockScrollView_ stub] andReturnValue:[NSValue valueWithCGRect:frame]]
+ frame];
+ EXPECT_TRUE(CGRectEqualToRect(frame, [webViewScrollViewProxy_ frame]));
}
// Tests that CRWWebViewScrollViewProxy returns the correct property values when
@@ -113,10 +114,9 @@ TEST_F(CRWWebViewScrollViewProxyTest, testScrollViewAbsent) {
UIEdgeInsetsZero, [webViewScrollViewProxy_ contentInset]));
EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(
UIEdgeInsetsZero, [webViewScrollViewProxy_ scrollIndicatorInsets]));
- EXPECT_TRUE(CGSizeEqualToSize(CGSizeZero,
- [webViewScrollViewProxy_ contentSize]));
- EXPECT_TRUE(CGRectEqualToRect(CGRectZero,
- [webViewScrollViewProxy_ frame]));
+ EXPECT_TRUE(
+ CGSizeEqualToSize(CGSizeZero, [webViewScrollViewProxy_ contentSize]));
+ EXPECT_TRUE(CGRectEqualToRect(CGRectZero, [webViewScrollViewProxy_ frame]));
// Make sure setting the properties is fine too.
// Arbitrary point.
@@ -152,15 +152,14 @@ TEST_F(CRWWebViewScrollViewProxyTest, testMultipleWebViewScrollViewProxies) {
// Arbitrary point.
const CGPoint point = CGPointMake(10, 10);
- [[[mockScrollView_ stub]
- andReturnValue:[NSValue valueWithCGPoint:point]] contentOffset];
- EXPECT_TRUE(CGPointEqualToPoint(point,
- [webViewScrollViewProxy_ contentOffset]));
- EXPECT_TRUE(CGPointEqualToPoint(point,
- [webViewScrollViewProxy1 contentOffset]));
- EXPECT_TRUE(CGPointEqualToPoint(point,
- [webViewScrollViewProxy2 contentOffset]));
+ [[[mockScrollView_ stub] andReturnValue:[NSValue valueWithCGPoint:point]]
+ contentOffset];
+ EXPECT_TRUE(
+ CGPointEqualToPoint(point, [webViewScrollViewProxy_ contentOffset]));
+ EXPECT_TRUE(
+ CGPointEqualToPoint(point, [webViewScrollViewProxy1 contentOffset]));
+ EXPECT_TRUE(
+ CGPointEqualToPoint(point, [webViewScrollViewProxy2 contentOffset]));
}
} // namespace
-
« no previous file with comments | « ios/web/web_state/ui/crw_web_view_scroll_view_proxy.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698