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

Side by Side Diff: ios/chrome/browser/ui/ntp/new_tab_page_controller_unittest.mm

Issue 2955433002: [ObjC ARC] Converts ios/chrome/browser/ui/ntp:ntp_controller to ARC. (Closed)
Patch Set: Fix eg tests Created 3 years, 6 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 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 "ios/chrome/browser/ui/ntp/new_tab_page_controller.h" 5 #import "ios/chrome/browser/ui/ntp/new_tab_page_controller.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
(...skipping 16 matching lines...) Expand all
27 #include "ios/web/public/test/test_web_thread_bundle.h" 27 #include "ios/web/public/test/test_web_thread_bundle.h"
28 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
29 #include "testing/gtest_mac.h" 29 #include "testing/gtest_mac.h"
30 #import "third_party/ocmock/OCMock/OCMock.h" 30 #import "third_party/ocmock/OCMock/OCMock.h"
31 #import "third_party/ocmock/gtest_support.h" 31 #import "third_party/ocmock/gtest_support.h"
32 32
33 #if !defined(__has_feature) || !__has_feature(objc_arc) 33 #if !defined(__has_feature) || !__has_feature(objc_arc)
34 #error "This file requires ARC support." 34 #error "This file requires ARC support."
35 #endif 35 #endif
36 36
37 @interface NewTabPageController (TestSupport)
38 - (id<NewTabPagePanelProtocol>)currentController;
39 - (BookmarkHomeTabletNTPController*)bookmarkController;
40 - (id<NewTabPagePanelProtocol>)incognitoController;
41 @end
42
43 @interface NewTabPageController (PrivateMethods)
44 @property(nonatomic, retain) NewTabPageView* ntpView;
45 @end
46
47 @implementation NewTabPageController (TestSupport)
48
49 - (id<NewTabPagePanelProtocol>)currentController {
50 return currentController_;
51 }
52
53 - (BookmarkHomeTabletNTPController*)bookmarkController {
54 return bookmarkController_.get();
55 }
56
57 - (id<NewTabPagePanelProtocol>)incognitoController {
58 return incognitoController_;
59 }
60
61 @end
62 37
63 namespace { 38 namespace {
64 39
65 class NewTabPageControllerTest : public BlockCleanupTest { 40 class NewTabPageControllerTest : public BlockCleanupTest {
66 protected: 41 protected:
67 void SetUp() override { 42 void SetUp() override {
68 BlockCleanupTest::SetUp(); 43 BlockCleanupTest::SetUp();
69 44
70 // Set up a test ChromeBrowserState instance. 45 // Set up a test ChromeBrowserState instance.
71 TestChromeBrowserState::Builder test_cbs_builder; 46 TestChromeBrowserState::Builder test_cbs_builder;
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 EXPECT_EQ("open_tabs", 199 EXPECT_EQ("open_tabs",
225 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel)); 200 NewTabPage::FragmentFromIdentifier(NewTabPage::kOpenTabsPanel));
226 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone)); 201 EXPECT_EQ("", NewTabPage::FragmentFromIdentifier(NewTabPage::kNone));
227 EXPECT_EQ(NewTabPage::kBookmarksPanel, 202 EXPECT_EQ(NewTabPage::kBookmarksPanel,
228 NewTabPage::IdentifierFromFragment("bookmarks")); 203 NewTabPage::IdentifierFromFragment("bookmarks"));
229 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage")); 204 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("garbage"));
230 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment("")); 205 EXPECT_EQ(NewTabPage::kNone, NewTabPage::IdentifierFromFragment(""));
231 } 206 }
232 207
233 } // anonymous namespace 208 } // anonymous namespace
OLDNEW
« no previous file with comments | « ios/chrome/browser/ui/ntp/new_tab_page_controller.mm ('k') | ios/chrome/browser/ui/ntp/new_tab_page_egtest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698