Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest .h" | 5 #import "chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_browsert est.h" |
|
tapted
2017/03/02 23:17:17
this .cc file doesn't have any tests, it should ju
snake
2017/03/06 12:53:34
Done.
tapted
2017/03/07 07:07:50
That's not quite what I suggested. I guess this is
| |
| 6 | 6 |
| 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 7 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
| 8 #include "chrome/browser/ui/browser.h" | |
| 8 #include "chrome/test/base/testing_profile.h" | 9 #include "chrome/test/base/testing_profile.h" |
| 9 #include "components/bookmarks/browser/bookmark_model.h" | 10 #include "components/bookmarks/browser/bookmark_model.h" |
| 10 #include "components/bookmarks/test/bookmark_test_helpers.h" | 11 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 11 | 12 |
| 12 using bookmarks::BookmarkModel; | 13 using bookmarks::BookmarkModel; |
| 13 using bookmarks::BookmarkNode; | 14 using bookmarks::BookmarkNode; |
| 14 | 15 |
| 15 @implementation FakeAppDelegate | 16 @implementation FakeAppDelegate |
| 16 | 17 |
| 17 @synthesize test = test_; | 18 @synthesize test = test_; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 49 kFakeCurrentCommand = nil; | 50 kFakeCurrentCommand = nil; |
| 50 [super dealloc]; | 51 [super dealloc]; |
| 51 } | 52 } |
| 52 | 53 |
| 53 @end | 54 @end |
| 54 | 55 |
| 55 BookmarkAppleScriptTest::BookmarkAppleScriptTest() { | 56 BookmarkAppleScriptTest::BookmarkAppleScriptTest() { |
| 56 } | 57 } |
| 57 | 58 |
| 58 BookmarkAppleScriptTest::~BookmarkAppleScriptTest() { | 59 BookmarkAppleScriptTest::~BookmarkAppleScriptTest() { |
| 59 [NSApp setDelegate:nil]; | 60 [NSApp setDelegate:nil]; |
|
tapted
2017/03/02 23:17:17
this doesn't belong here without a corresponding c
snake
2017/03/06 12:53:34
Done.
| |
| 60 } | 61 } |
| 61 | 62 |
| 62 void BookmarkAppleScriptTest::SetUp() { | 63 void BookmarkAppleScriptTest::SetUpOnMainThread() { |
| 63 CocoaProfileTest::SetUp(); | 64 InProcessBrowserTest::SetUpOnMainThread(); |
| 64 ASSERT_TRUE(profile()); | 65 ASSERT_TRUE(profile()); |
| 65 | 66 |
| 66 appDelegate_.reset([[FakeAppDelegate alloc] init]); | |
| 67 [appDelegate_.get() setTest:this]; | |
| 68 DCHECK([NSApp delegate] == nil); | |
| 69 [NSApp setDelegate:appDelegate_]; | |
| 70 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); | 67 BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile()); |
| 71 const BookmarkNode* root = model->bookmark_bar_node(); | 68 const BookmarkNode* root = model->bookmark_bar_node(); |
| 72 const std::string modelString("a f1:[ b d c ] d f2:[ e f g ] h "); | 69 const std::string modelString("a f1:[ b d c ] d f2:[ e f g ] h "); |
| 73 bookmarks::test::AddNodesFromModelString(model, root, modelString); | 70 bookmarks::test::AddNodesFromModelString(model, root, modelString); |
| 74 bookmarkBar_.reset([[BookmarkFolderAppleScript alloc] | 71 bookmarkBar_.reset([[BookmarkFolderAppleScript alloc] |
| 75 initWithBookmarkNode:model->bookmark_bar_node()]); | 72 initWithBookmarkNode:model->bookmark_bar_node()]); |
| 76 } | 73 } |
| 74 | |
| 75 Profile* BookmarkAppleScriptTest::profile() const { | |
| 76 return browser()->profile(); | |
| 77 } | |
| OLD | NEW |