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

Unified Diff: ios/web/web_state/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/crw_web_view_scroll_view_proxy.mm ('k') | ios/web/web_state/ui/crw_web_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/web/web_state/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/crw_web_view_scroll_view_proxy_unittest.mm
deleted file mode 100644
index 04a042823f014d985753861e94aa050b32083079..0000000000000000000000000000000000000000
--- a/ios/web/web_state/crw_web_view_scroll_view_proxy_unittest.mm
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// 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 <UIKit/UIKit.h>
-
-#include "base/compiler_specific.h"
-#import "base/mac/scoped_nsobject.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#import "third_party/ocmock/OCMock/OCMock.h"
-#include "third_party/ocmock/gtest_support.h"
-
-namespace {
-
-class CRWWebViewScrollViewProxyTest : public ::testing::Test {
- protected:
- void SetUp() override {
- mockScrollView_.reset(
- [[OCMockObject niceMockForClass:[UIScrollView class]] retain]);
- webViewScrollViewProxy_.reset([[CRWWebViewScrollViewProxy alloc] init]);
- }
- base::scoped_nsobject<id> mockScrollView_;
- base::scoped_nsobject<CRWWebViewScrollViewProxy> webViewScrollViewProxy_;
-};
-
-// Tests that the UIScrollViewDelegate is set correctly.
-TEST_F(CRWWebViewScrollViewProxyTest, testDelegate) {
- [static_cast<UIScrollView*>([mockScrollView_ expect])
- setDelegate:webViewScrollViewProxy_.get()];
- [webViewScrollViewProxy_ setScrollView:mockScrollView_];
- EXPECT_OCMOCK_VERIFY(mockScrollView_);
-}
-
-// Tests that setting 2 scroll views consecutively, clears the delegate of the
-// previous scroll view.
-TEST_F(CRWWebViewScrollViewProxyTest, testMultipleScrollView) {
- base::scoped_nsobject<UIScrollView> mockScrollView1(
- [[UIScrollView alloc] init]);
- base::scoped_nsobject<UIScrollView> mockScrollView2(
- [[UIScrollView alloc] init]);
- [webViewScrollViewProxy_ setScrollView:mockScrollView1];
- [webViewScrollViewProxy_ setScrollView:mockScrollView2];
- EXPECT_FALSE([mockScrollView1 delegate]);
- EXPECT_EQ(webViewScrollViewProxy_.get(), [mockScrollView2 delegate]);
- [webViewScrollViewProxy_ setScrollView:nil];
-}
-
-// Tests that when releasing a scroll view from the CRWWebViewScrollViewProxy,
-// the UIScrollView's delegate is also cleared.
-TEST_F(CRWWebViewScrollViewProxyTest, testDelegateClearingUp) {
- base::scoped_nsobject<UIScrollView> mockScrollView1(
- [[UIScrollView alloc] init]);
- [webViewScrollViewProxy_ setScrollView:mockScrollView1];
- EXPECT_EQ(webViewScrollViewProxy_.get(), [mockScrollView1 delegate]);
- [webViewScrollViewProxy_ setScrollView:nil];
- EXPECT_FALSE([mockScrollView1 delegate]);
-}
-
-// Tests that CRWWebViewScrollViewProxy returns the correct property values from
-// the underlying UIScrollView.
-TEST_F(CRWWebViewScrollViewProxyTest, testScrollViewPresent) {
- [webViewScrollViewProxy_ setScrollView:mockScrollView_];
- BOOL yes = YES;
- [[[mockScrollView_ stub] andReturnValue:OCMOCK_VALUE(yes)] isZooming];
- EXPECT_TRUE([webViewScrollViewProxy_ isZooming]);
-
- // Arbitrary point.
- const CGPoint point = CGPointMake(10, 10);
- [[[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]));
-
- // Arbitrary inset.
- const UIEdgeInsets scrollIndicatorInsets = UIEdgeInsetsMake(20, 20, 20, 20);
- [[[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]));
-
- // Arbitrary rect.
- const CGRect frame = CGRectMake(2, 4, 5, 1);
- [[[mockScrollView_ stub] andReturnValue:
- [NSValue valueWithCGRect:frame]] frame];
- EXPECT_TRUE(CGRectEqualToRect(frame,
- [webViewScrollViewProxy_ frame]));
-}
-
-// Tests that CRWWebViewScrollViewProxy returns the correct property values when
-// there is no underlying UIScrollView.
-TEST_F(CRWWebViewScrollViewProxyTest, testScrollViewAbsent) {
- [webViewScrollViewProxy_ setScrollView:nil];
-
- EXPECT_TRUE(CGPointEqualToPoint(CGPointZero,
- [webViewScrollViewProxy_ contentOffset]));
- EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(
- UIEdgeInsetsZero, [webViewScrollViewProxy_ contentInset]));
- EXPECT_TRUE(UIEdgeInsetsEqualToEdgeInsets(
- UIEdgeInsetsZero, [webViewScrollViewProxy_ scrollIndicatorInsets]));
- EXPECT_TRUE(CGSizeEqualToSize(CGSizeZero,
- [webViewScrollViewProxy_ contentSize]));
- EXPECT_TRUE(CGRectEqualToRect(CGRectZero,
- [webViewScrollViewProxy_ frame]));
-
- // Make sure setting the properties is fine too.
- // Arbitrary point.
- const CGPoint kPoint = CGPointMake(10, 10);
- [webViewScrollViewProxy_ setContentOffset:kPoint];
- // Arbitrary inset.
- const UIEdgeInsets kContentInset = UIEdgeInsetsMake(10, 10, 10, 10);
- [webViewScrollViewProxy_ setContentInset:kContentInset];
- [webViewScrollViewProxy_ setScrollIndicatorInsets:kContentInset];
- // Arbitrary size.
- const CGSize kContentSize = CGSizeMake(19, 19);
- [webViewScrollViewProxy_ setContentSize:kContentSize];
-}
-
-// Tests releasing a scroll view when none is owned by the
-// CRWWebViewScrollViewProxy.
-TEST_F(CRWWebViewScrollViewProxyTest, testReleasingAScrollView) {
- [webViewScrollViewProxy_ setScrollView:nil];
-}
-
-// Tests that multiple WebViewScrollViewProxies hold onto the same underlying
-// UIScrollView
-TEST_F(CRWWebViewScrollViewProxyTest, testMultipleWebViewScrollViewProxies) {
- [webViewScrollViewProxy_ setScrollView:mockScrollView_];
-
- base::scoped_nsobject<CRWWebViewScrollViewProxy> webViewScrollViewProxy1(
- [[CRWWebViewScrollViewProxy alloc] init]);
- [webViewScrollViewProxy1 setScrollView:mockScrollView_];
-
- base::scoped_nsobject<CRWWebViewScrollViewProxy> webViewScrollViewProxy2(
- [[CRWWebViewScrollViewProxy alloc] init]);
- [webViewScrollViewProxy2 setScrollView:mockScrollView_];
-
- // 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]));
-}
-
-} // namespace
-
« no previous file with comments | « ios/web/web_state/crw_web_view_scroll_view_proxy.mm ('k') | ios/web/web_state/ui/crw_web_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698