| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 <Foundation/Foundation.h> | 5 #import <Foundation/Foundation.h> |
| 6 #import <PassKit/PassKit.h> | 6 #import <PassKit/PassKit.h> |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 id webControllerMock = | 149 id webControllerMock = |
| 150 [OCMockObject niceMockForClass:[CRWWebController class]]; | 150 [OCMockObject niceMockForClass:[CRWWebController class]]; |
| 151 | 151 |
| 152 // Stub methods for TabModel. | 152 // Stub methods for TabModel. |
| 153 NSUInteger tabCount = 1; | 153 NSUInteger tabCount = 1; |
| 154 [[[tabModel stub] andReturnValue:OCMOCK_VALUE(tabCount)] count]; | 154 [[[tabModel stub] andReturnValue:OCMOCK_VALUE(tabCount)] count]; |
| 155 BOOL enabled = YES; | 155 BOOL enabled = YES; |
| 156 [[[tabModel stub] andReturnValue:OCMOCK_VALUE(enabled)] webUsageEnabled]; | 156 [[[tabModel stub] andReturnValue:OCMOCK_VALUE(enabled)] webUsageEnabled]; |
| 157 [[[tabModel stub] andReturn:currentTab] currentTab]; | 157 [[[tabModel stub] andReturn:currentTab] currentTab]; |
| 158 [[[tabModel stub] andReturn:currentTab] tabAtIndex:0]; | 158 [[[tabModel stub] andReturn:currentTab] tabAtIndex:0]; |
| 159 GURL URL("http://www.google.com"); | |
| 160 [[[tabModel stub] andReturn:currentTab] addTabWithURL:URL | |
| 161 referrer:web::Referrer() | |
| 162 windowName:[OCMArg any]]; | |
| 163 [[tabModel stub] addObserver:[OCMArg any]]; | 159 [[tabModel stub] addObserver:[OCMArg any]]; |
| 164 [[tabModel stub] removeObserver:[OCMArg any]]; | 160 [[tabModel stub] removeObserver:[OCMArg any]]; |
| 165 [[tabModel stub] saveSessionImmediately:NO]; | 161 [[tabModel stub] saveSessionImmediately:NO]; |
| 166 [[tabModel stub] setCurrentTab:[OCMArg any]]; | 162 [[tabModel stub] setCurrentTab:[OCMArg any]]; |
| 167 [[tabModel stub] closeAllTabs]; | 163 [[tabModel stub] closeAllTabs]; |
| 168 | 164 |
| 169 // Stub methods for Tab. | 165 // Stub methods for Tab. |
| 170 UIView* dummyView = [[[UIView alloc] initWithFrame:CGRectZero] autorelease]; | 166 UIView* dummyView = [[[UIView alloc] initWithFrame:CGRectZero] autorelease]; |
| 171 [[[currentTab stub] andReturn:dummyView] view]; | 167 [[[currentTab stub] andReturn:dummyView] view]; |
| 172 [[[currentTab stub] andReturn:webControllerMock] webController]; | 168 [[[currentTab stub] andReturn:webControllerMock] webController]; |
| (...skipping 19 matching lines...) Expand all Loading... |
| 192 // It will be owned (and destroyed) by the BVC. | 188 // It will be owned (and destroyed) by the BVC. |
| 193 toolbarModelIOS_ = new TestToolbarModelIOS(); | 189 toolbarModelIOS_ = new TestToolbarModelIOS(); |
| 194 | 190 |
| 195 // Set up a stub dependency factory. | 191 // Set up a stub dependency factory. |
| 196 id factory = [OCMockObject | 192 id factory = [OCMockObject |
| 197 mockForClass:[BrowserViewControllerDependencyFactory class]]; | 193 mockForClass:[BrowserViewControllerDependencyFactory class]]; |
| 198 [[[factory stub] andReturn:nil] | 194 [[[factory stub] andReturn:nil] |
| 199 newTabStripControllerWithTabModel:[OCMArg any]]; | 195 newTabStripControllerWithTabModel:[OCMArg any]]; |
| 200 [[[factory stub] andReturn:nil] newPreloadController]; | 196 [[[factory stub] andReturn:nil] newPreloadController]; |
| 201 [[[factory stub] andReturnValue:OCMOCK_VALUE(toolbarModelIOS_)] | 197 [[[factory stub] andReturnValue:OCMOCK_VALUE(toolbarModelIOS_)] |
| 202 newToolbarModelIOSWithDelegate:(ToolbarModelDelegateIOS*) | 198 newToolbarModelIOSWithDelegate:static_cast<ToolbarModelDelegateIOS*>( |
| 203 [OCMArg anyPointer]]; | 199 [OCMArg anyPointer])]; |
| 204 [[[factory stub] andReturn:nil] | 200 [[[factory stub] andReturn:nil] |
| 205 newWebToolbarControllerWithDelegate:[OCMArg any] | 201 newWebToolbarControllerWithDelegate:[OCMArg any] |
| 206 urlLoader:[OCMArg any] | 202 urlLoader:[OCMArg any] |
| 207 preloadProvider:[OCMArg any]]; | 203 preloadProvider:[OCMArg any]]; |
| 208 [[[factory stub] andReturn:shareController_.get()] shareControllerInstance]; | 204 [[[factory stub] andReturn:shareController_.get()] shareControllerInstance]; |
| 209 [[[factory stub] andReturn:passKitViewController_.get()] | 205 [[[factory stub] andReturn:passKitViewController_.get()] |
| 210 newPassKitViewControllerForPass:nil]; | 206 newPassKitViewControllerForPass:nil]; |
| 211 [[[factory stub] andReturn:nil] showPassKitErrorInfoBarForManager:nil]; | 207 [[[factory stub] andReturn:nil] showPassKitErrorInfoBarForManager:nil]; |
| 212 | 208 |
| 213 webController_.reset([webControllerMock retain]); | 209 webController_.reset([webControllerMock retain]); |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 } copy]); | 295 } copy]); |
| 300 id tabMock = (id)tab_.get(); | 296 id tabMock = (id)tab_.get(); |
| 301 [tabMock onSelector:@selector(url) callBlockExpectation:block]; | 297 [tabMock onSelector:@selector(url) callBlockExpectation:block]; |
| 302 [[tabMock expect] wasShown]; | 298 [[tabMock expect] wasShown]; |
| 303 [bvc_ tabSelected:tab_]; | 299 [bvc_ tabSelected:tab_]; |
| 304 EXPECT_EQ([[tab_ view] superview], static_cast<UIView*>([bvc_ contentArea])); | 300 EXPECT_EQ([[tab_ view] superview], static_cast<UIView*>([bvc_ contentArea])); |
| 305 EXPECT_OCMOCK_VERIFY(tabMock); | 301 EXPECT_OCMOCK_VERIFY(tabMock); |
| 306 } | 302 } |
| 307 | 303 |
| 308 TEST_F(BrowserViewControllerTest, TestTabDeselected) { | 304 TEST_F(BrowserViewControllerTest, TestTabDeselected) { |
| 309 OCMockObject* tabMock = (OCMockObject*)tab_.get(); | 305 OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get()); |
| 310 [[tabMock expect] wasHidden]; | 306 [[tabMock expect] wasHidden]; |
| 311 NSDictionary* userInfoWithThisTab = | 307 NSDictionary* userInfoWithThisTab = |
| 312 [NSDictionary dictionaryWithObject:tab_ forKey:kTabModelTabKey]; | 308 [NSDictionary dictionaryWithObject:tab_ forKey:kTabModelTabKey]; |
| 313 NSNotification* notification = | 309 NSNotification* notification = |
| 314 [NSNotification notificationWithName:kTabModelTabDeselectedNotification | 310 [NSNotification notificationWithName:kTabModelTabDeselectedNotification |
| 315 object:nil | 311 object:nil |
| 316 userInfo:userInfoWithThisTab]; | 312 userInfo:userInfoWithThisTab]; |
| 317 [bvc_ tabDeselected:notification]; | 313 [bvc_ tabDeselected:notification]; |
| 318 EXPECT_OCMOCK_VERIFY(tabMock); | 314 EXPECT_OCMOCK_VERIFY(tabMock); |
| 319 } | 315 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 EXPECT_FALSE([[bvc_ typingShield] isHidden]); | 355 EXPECT_FALSE([[bvc_ typingShield] isHidden]); |
| 360 [bvc_ shieldWasTapped:nil]; | 356 [bvc_ shieldWasTapped:nil]; |
| 361 EXPECT_TRUE([[bvc_ typingShield] superview] == nil); | 357 EXPECT_TRUE([[bvc_ typingShield] superview] == nil); |
| 362 EXPECT_TRUE([[bvc_ typingShield] isHidden]); | 358 EXPECT_TRUE([[bvc_ typingShield] isHidden]); |
| 363 } | 359 } |
| 364 | 360 |
| 365 // Verifies that editing the omnimbox while the page is loading will stop the | 361 // Verifies that editing the omnimbox while the page is loading will stop the |
| 366 // load on a handset, but not stop the load on a tablet. | 362 // load on a handset, but not stop the load on a tablet. |
| 367 TEST_F(BrowserViewControllerTest, | 363 TEST_F(BrowserViewControllerTest, |
| 368 TestLocationBarBeganEdit_whenPageLoadIsInProgress) { | 364 TestLocationBarBeganEdit_whenPageLoadIsInProgress) { |
| 369 OCMockObject* tabMock = (OCMockObject*)tab_.get(); | 365 OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get()); |
| 370 | 366 |
| 371 // Have the TestToolbarModel indicate that a page load is in progress. | 367 // Have the TestToolbarModel indicate that a page load is in progress. |
| 372 ((TestToolbarModelIOS*)toolbarModelIOS_)->set_is_loading(true); | 368 static_cast<TestToolbarModelIOS*>(toolbarModelIOS_)->set_is_loading(true); |
| 373 | 369 |
| 374 // The tab should only stop loading on handsets. | 370 // The tab should only stop loading on handsets. |
| 375 if (!IsIPadIdiom()) | 371 if (!IsIPadIdiom()) |
| 376 [[tabMock expect] stopLoading]; | 372 [[tabMock expect] stopLoading]; |
| 377 [bvc_ locationBarBeganEdit:nil]; | 373 [bvc_ locationBarBeganEdit:nil]; |
| 378 | 374 |
| 379 EXPECT_OCMOCK_VERIFY(tabMock); | 375 EXPECT_OCMOCK_VERIFY(tabMock); |
| 380 } | 376 } |
| 381 | 377 |
| 382 // Verifies that editing the omnibox when the page is not loading will not try | 378 // Verifies that editing the omnibox when the page is not loading will not try |
| 383 // to stop the load on a handset or a tablet. | 379 // to stop the load on a handset or a tablet. |
| 384 TEST_F(BrowserViewControllerTest, | 380 TEST_F(BrowserViewControllerTest, |
| 385 TestLocationBarBeganEdit_whenPageLoadIsComplete) { | 381 TestLocationBarBeganEdit_whenPageLoadIsComplete) { |
| 386 OCMockObject* tabMock = (OCMockObject*)tab_.get(); | 382 OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get()); |
| 387 | 383 |
| 388 // Have the TestToolbarModel indicate that the page load is complete. | 384 // Have the TestToolbarModel indicate that the page load is complete. |
| 389 ((TestToolbarModelIOS*)toolbarModelIOS_)->set_is_loading(false); | 385 static_cast<TestToolbarModelIOS*>(toolbarModelIOS_)->set_is_loading(false); |
| 390 | 386 |
| 391 // Don't set any expectation for stopLoading to be called on the mock tab. | 387 // Don't set any expectation for stopLoading to be called on the mock tab. |
| 392 [bvc_ locationBarBeganEdit:nil]; | 388 [bvc_ locationBarBeganEdit:nil]; |
| 393 | 389 |
| 394 EXPECT_OCMOCK_VERIFY(tabMock); | 390 EXPECT_OCMOCK_VERIFY(tabMock); |
| 395 } | 391 } |
| 396 | 392 |
| 397 // Verifies that BVC invokes -shareURL on ShareController with the correct | 393 // Verifies that BVC invokes -shareURL on ShareController with the correct |
| 398 // parameters in response to the IDC_SHARE_PAGE command. | 394 // parameters in response to the IDC_SHARE_PAGE command. |
| 399 TEST_F(BrowserViewControllerTest, TestSharePageCommandHandling) { | 395 TEST_F(BrowserViewControllerTest, TestSharePageCommandHandling) { |
| 400 GURL expectedUrl("http://www.testurl.net"); | 396 GURL expectedUrl("http://www.testurl.net"); |
| 401 NSString* expectedTitle = @"title"; | 397 NSString* expectedTitle = @"title"; |
| 402 [(BVCTestTabMock*)tab_.get() setUrl:expectedUrl]; | 398 [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl]; |
| 403 OCMockObject* tabMock = (OCMockObject*)tab_.get(); | 399 OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get()); |
| 404 ios::ChromeBrowserState* ptr = chrome_browser_state_.get(); | 400 ios::ChromeBrowserState* ptr = chrome_browser_state_.get(); |
| 405 [[[tabMock stub] andReturnValue:OCMOCK_VALUE(ptr)] browserState]; | 401 [[[tabMock stub] andReturnValue:OCMOCK_VALUE(ptr)] browserState]; |
| 406 [[[tabMock stub] andReturn:expectedTitle] title]; | 402 [[[tabMock stub] andReturn:expectedTitle] title]; |
| 407 [[[tabMock stub] andReturn:expectedTitle] originalTitle]; | 403 [[[tabMock stub] andReturn:expectedTitle] originalTitle]; |
| 408 | 404 |
| 409 UIImage* tabSnapshot = ui::test::uiimage_utils::UIImageWithSizeAndSolidColor( | 405 UIImage* tabSnapshot = ui::test::uiimage_utils::UIImageWithSizeAndSolidColor( |
| 410 CGSizeMake(300, 400), [UIColor blueColor]); | 406 CGSizeMake(300, 400), [UIColor blueColor]); |
| 411 [[[tabMock stub] andReturn:tabSnapshot] generateSnapshotWithOverlay:NO | 407 [[[tabMock stub] andReturn:tabSnapshot] generateSnapshotWithOverlay:NO |
| 412 visibleFrameOnly:YES]; | 408 visibleFrameOnly:YES]; |
| 413 OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get(); | 409 OCMockObject* shareControllerMock = |
| 410 static_cast<OCMockObject*>(shareController_.get()); |
| 414 // Passing non zero/nil |fromRect| and |inView| parameters to satisfy protocol | 411 // Passing non zero/nil |fromRect| and |inView| parameters to satisfy protocol |
| 415 // requirements. | 412 // requirements. |
| 416 BOOL (^shareDataChecker) | 413 BOOL (^shareDataChecker) |
| 417 (id value) = ^BOOL(id value) { | 414 (id value) = ^BOOL(id value) { |
| 418 if (![value isMemberOfClass:ShareToData.class]) | 415 if (![value isMemberOfClass:ShareToData.class]) |
| 419 return NO; | 416 return NO; |
| 420 ShareToData* shareToData = (ShareToData*)value; | 417 ShareToData* shareToData = static_cast<ShareToData*>(value); |
| 421 CGSize size = CGSizeMake(40, 40); | 418 CGSize size = CGSizeMake(40, 40); |
| 422 BOOL thumbnailDataIsEqual = ui::test::uiimage_utils::UIImagesAreEqual( | 419 BOOL thumbnailDataIsEqual = ui::test::uiimage_utils::UIImagesAreEqual( |
| 423 shareToData.thumbnailGenerator(size), | 420 shareToData.thumbnailGenerator(size), |
| 424 ui::test::uiimage_utils::UIImageWithSizeAndSolidColor( | 421 ui::test::uiimage_utils::UIImageWithSizeAndSolidColor( |
| 425 size, [UIColor blueColor])); | 422 size, [UIColor blueColor])); |
| 426 return shareToData.url == expectedUrl && | 423 return shareToData.url == expectedUrl && |
| 427 [shareToData.title isEqual:expectedTitle] && | 424 [shareToData.title isEqual:expectedTitle] && |
| 428 shareToData.isOriginalTitle == YES && | 425 shareToData.isOriginalTitle == YES && |
| 429 shareToData.isPagePrintable == NO && thumbnailDataIsEqual; | 426 shareToData.isPagePrintable == NO && thumbnailDataIsEqual; |
| 430 }; | 427 }; |
| 431 | 428 |
| 432 [[shareControllerMock expect] | 429 [[shareControllerMock expect] |
| 433 shareWithData:[OCMArg checkWithBlock:shareDataChecker] | 430 shareWithData:[OCMArg checkWithBlock:shareDataChecker] |
| 434 controller:bvc_ | 431 controller:bvc_ |
| 435 browserState:chrome_browser_state_.get() | 432 browserState:chrome_browser_state_.get() |
| 436 shareToDelegate:bvc_ | 433 shareToDelegate:bvc_ |
| 437 fromRect:[bvc_ testing_shareButtonAnchorRect] | 434 fromRect:[bvc_ testing_shareButtonAnchorRect] |
| 438 inView:[OCMArg any]]; | 435 inView:[OCMArg any]]; |
| 439 [bvc_ chromeExecuteCommand:GetCommandWithTag(IDC_SHARE_PAGE)]; | 436 [bvc_ chromeExecuteCommand:GetCommandWithTag(IDC_SHARE_PAGE)]; |
| 440 EXPECT_OCMOCK_VERIFY(shareControllerMock); | 437 EXPECT_OCMOCK_VERIFY(shareControllerMock); |
| 441 } | 438 } |
| 442 | 439 |
| 443 // Verifies that BVC does not invoke -shareURL on ShareController in response | 440 // Verifies that BVC does not invoke -shareURL on ShareController in response |
| 444 // to the IDC_SHARE_PAGE command if tab is in the process of being closed. | 441 // to the IDC_SHARE_PAGE command if tab is in the process of being closed. |
| 445 TEST_F(BrowserViewControllerTest, TestSharePageWhenClosing) { | 442 TEST_F(BrowserViewControllerTest, TestSharePageWhenClosing) { |
| 446 GURL expectedUrl("http://www.testurl.net"); | 443 GURL expectedUrl("http://www.testurl.net"); |
| 447 NSString* expectedTitle = @"title"; | 444 NSString* expectedTitle = @"title"; |
| 448 // Sets WebState to nil because [tab close] clears the WebState. | 445 // Sets WebState to nil because [tab close] clears the WebState. |
| 449 [(BVCTestTabMock*)tab_.get() setWebState:nil]; | 446 [static_cast<BVCTestTabMock*>(tab_.get()) setWebState:nil]; |
| 450 [(BVCTestTabMock*)tab_.get() setUrl:expectedUrl]; | 447 [static_cast<BVCTestTabMock*>(tab_.get()) setUrl:expectedUrl]; |
| 451 OCMockObject* tabMock = (OCMockObject*)tab_.get(); | 448 OCMockObject* tabMock = static_cast<OCMockObject*>(tab_.get()); |
| 452 [[[tabMock stub] andReturn:expectedTitle] title]; | 449 [[[tabMock stub] andReturn:expectedTitle] title]; |
| 453 [[[tabMock stub] andReturn:expectedTitle] originalTitle]; | 450 [[[tabMock stub] andReturn:expectedTitle] originalTitle]; |
| 454 // Explicitly disallow the execution of the ShareController. | 451 // Explicitly disallow the execution of the ShareController. |
| 455 OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get(); | 452 OCMockObject* shareControllerMock = |
| 453 static_cast<OCMockObject*>(shareController_.get()); |
| 456 [[shareControllerMock reject] | 454 [[shareControllerMock reject] |
| 457 shareWithData:[OCMArg any] | 455 shareWithData:[OCMArg any] |
| 458 controller:bvc_ | 456 controller:bvc_ |
| 459 browserState:chrome_browser_state_.get() | 457 browserState:chrome_browser_state_.get() |
| 460 shareToDelegate:bvc_ | 458 shareToDelegate:bvc_ |
| 461 fromRect:[bvc_ testing_shareButtonAnchorRect] | 459 fromRect:[bvc_ testing_shareButtonAnchorRect] |
| 462 inView:[OCMArg any]]; | 460 inView:[OCMArg any]]; |
| 463 [bvc_ chromeExecuteCommand:GetCommandWithTag(IDC_SHARE_PAGE)]; | 461 [bvc_ chromeExecuteCommand:GetCommandWithTag(IDC_SHARE_PAGE)]; |
| 464 EXPECT_OCMOCK_VERIFY(shareControllerMock); | 462 EXPECT_OCMOCK_VERIFY(shareControllerMock); |
| 465 } | 463 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 482 [[OCMockObject niceMockForClass:[AlertCoordinator class]] retain]); | 480 [[OCMockObject niceMockForClass:[AlertCoordinator class]] retain]); |
| 483 AlertCoordinator* alertCoordinator = | 481 AlertCoordinator* alertCoordinator = |
| 484 static_cast<AlertCoordinator*>(mockCoordinator.get()); | 482 static_cast<AlertCoordinator*>(mockCoordinator.get()); |
| 485 NSString* errorTitle = | 483 NSString* errorTitle = |
| 486 l10n_util::GetNSString(IDS_IOS_SHARE_TO_ERROR_ALERT_TITLE); | 484 l10n_util::GetNSString(IDS_IOS_SHARE_TO_ERROR_ALERT_TITLE); |
| 487 NSString* errorMessage = l10n_util::GetNSString(IDS_IOS_SHARE_TO_ERROR_ALERT); | 485 NSString* errorMessage = l10n_util::GetNSString(IDS_IOS_SHARE_TO_ERROR_ALERT); |
| 488 [[[dependencyFactory_ expect] andReturn:alertCoordinator] | 486 [[[dependencyFactory_ expect] andReturn:alertCoordinator] |
| 489 alertCoordinatorWithTitle:errorTitle | 487 alertCoordinatorWithTitle:errorTitle |
| 490 message:errorMessage | 488 message:errorMessage |
| 491 viewController:OCMOCK_ANY]; | 489 viewController:OCMOCK_ANY]; |
| 492 [((AlertCoordinator*)[mockCoordinator expect])start]; | 490 [static_cast<AlertCoordinator*>([mockCoordinator expect]) start]; |
| 493 | 491 |
| 494 [bvc_ shareDidComplete:ShareTo::SHARE_ERROR successMessage:@"dummy"]; | 492 [bvc_ shareDidComplete:ShareTo::SHARE_ERROR successMessage:@"dummy"]; |
| 495 EXPECT_OCMOCK_VERIFY(dependencyFactory_); | 493 EXPECT_OCMOCK_VERIFY(dependencyFactory_); |
| 496 EXPECT_OCMOCK_VERIFY(mockCoordinator); | 494 EXPECT_OCMOCK_VERIFY(mockCoordinator); |
| 497 } | 495 } |
| 498 | 496 |
| 499 // Verifies that BVC does not show a success bubble or error alert on receiving | 497 // Verifies that BVC does not show a success bubble or error alert on receiving |
| 500 // a -shareDidComplete callback for a cancelled share. | 498 // a -shareDidComplete callback for a cancelled share. |
| 501 TEST_F(BrowserViewControllerTest, TestShareDidCompleteWithCancellation) { | 499 TEST_F(BrowserViewControllerTest, TestShareDidCompleteWithCancellation) { |
| 502 [[dependencyFactory_ reject] showSnackbarWithMessage:OCMOCK_ANY]; | 500 [[dependencyFactory_ reject] showSnackbarWithMessage:OCMOCK_ANY]; |
| (...skipping 25 matching lines...) Expand all Loading... |
| 528 bad_pass_path = bad_pass_path.Append(FILE_PATH_LITERAL("testbadpass.pkpass")); | 526 bad_pass_path = bad_pass_path.Append(FILE_PATH_LITERAL("testbadpass.pkpass")); |
| 529 NSData* badPassKitObject = [NSData | 527 NSData* badPassKitObject = [NSData |
| 530 dataWithContentsOfFile:base::SysUTF8ToNSString(bad_pass_path.value())]; | 528 dataWithContentsOfFile:base::SysUTF8ToNSString(bad_pass_path.value())]; |
| 531 EXPECT_TRUE(badPassKitObject); | 529 EXPECT_TRUE(badPassKitObject); |
| 532 [[dependencyFactory_ reject] newPassKitViewControllerForPass:OCMOCK_ANY]; | 530 [[dependencyFactory_ reject] newPassKitViewControllerForPass:OCMOCK_ANY]; |
| 533 [bvc_ presentPassKitDialog:badPassKitObject]; | 531 [bvc_ presentPassKitDialog:badPassKitObject]; |
| 534 EXPECT_OCMOCK_VERIFY(dependencyFactory_); | 532 EXPECT_OCMOCK_VERIFY(dependencyFactory_); |
| 535 } | 533 } |
| 536 | 534 |
| 537 TEST_F(BrowserViewControllerTest, TestClearPresentedState) { | 535 TEST_F(BrowserViewControllerTest, TestClearPresentedState) { |
| 538 OCMockObject* shareControllerMock = (OCMockObject*)shareController_.get(); | 536 OCMockObject* shareControllerMock = |
| 537 static_cast<OCMockObject*>(shareController_.get()); |
| 539 [[shareControllerMock expect] cancelShareAnimated:NO]; | 538 [[shareControllerMock expect] cancelShareAnimated:NO]; |
| 540 EXPECT_CALL(*this, OnCompletionCalled()); | 539 EXPECT_CALL(*this, OnCompletionCalled()); |
| 541 [bvc_ clearPresentedStateWithCompletion:^{ | 540 [bvc_ clearPresentedStateWithCompletion:^{ |
| 542 this->OnCompletionCalled(); | 541 this->OnCompletionCalled(); |
| 543 }]; | 542 }]; |
| 544 EXPECT_OCMOCK_VERIFY(shareControllerMock); | 543 EXPECT_OCMOCK_VERIFY(shareControllerMock); |
| 545 } | 544 } |
| 546 | 545 |
| 547 } // namespace | 546 } // namespace |
| OLD | NEW |