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

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc

Issue 7744039: Switch ChromeTestSuite to the same convention as ContentTestSuite: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more fixing Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
11 #include "chrome/browser/bookmarks/bookmark_model.h" 11 #include "chrome/browser/bookmarks/bookmark_model.h"
12 #include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h" 12 #include "chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk.h"
13 #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h" 13 #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
14 #include "chrome/test/base/testing_browser_process_test.h"
15 #include "chrome/test/base/testing_profile.h" 14 #include "chrome/test/base/testing_profile.h"
16 #include "content/browser/browser_thread.h" 15 #include "content/browser/browser_thread.h"
17 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
18 17
19 using base::Time; 18 using base::Time;
20 using base::TimeDelta; 19 using base::TimeDelta;
21 using bookmark_utils::GetTitleFromTreeIter; 20 using bookmark_utils::GetTitleFromTreeIter;
22 21
23 // Base class for bookmark editor tests. This class is a copy from 22 // Base class for bookmark editor tests. This class is a copy from
24 // bookmark_editor_view_unittest.cc, and all the tests in this file are 23 // bookmark_editor_view_unittest.cc, and all the tests in this file are
25 // GTK-ifications of the corresponding views tests. Testing here is really 24 // GTK-ifications of the corresponding views tests. Testing here is really
26 // important because on Linux, we make round trip copies from chrome's 25 // important because on Linux, we make round trip copies from chrome's
27 // BookmarkModel class to GTK's native GtkTreeStore. 26 // BookmarkModel class to GTK's native GtkTreeStore.
28 class BookmarkEditorGtkTest : public TestingBrowserProcessTest { 27 class BookmarkEditorGtkTest : public testing::Test {
29 public: 28 public:
30 BookmarkEditorGtkTest() 29 BookmarkEditorGtkTest()
31 : ui_thread_(BrowserThread::UI, &message_loop_), 30 : ui_thread_(BrowserThread::UI, &message_loop_),
32 file_thread_(BrowserThread::FILE, &message_loop_), 31 file_thread_(BrowserThread::FILE, &message_loop_),
33 model_(NULL) { 32 model_(NULL) {
34 } 33 }
35 34
36 virtual void SetUp() { 35 virtual void SetUp() {
37 profile_.reset(new TestingProfile()); 36 profile_.reset(new TestingProfile());
38 profile_->CreateBookmarkModel(true); 37 profile_->CreateBookmarkModel(true);
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a"); 329 gtk_entry_set_text(GTK_ENTRY(editor.name_entry_), "new_a");
331 330
332 editor.ApplyEdits(); 331 editor.ApplyEdits();
333 332
334 const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node(); 333 const BookmarkNode* other_node = profile_->GetBookmarkModel()->other_node();
335 ASSERT_EQ(2, other_node->child_count()); 334 ASSERT_EQ(2, other_node->child_count());
336 335
337 const BookmarkNode* new_node = other_node->GetChild(0); 336 const BookmarkNode* new_node = other_node->GetChild(0);
338 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle()); 337 EXPECT_EQ(ASCIIToUTF16("new_a"), new_node->GetTitle());
339 } 338 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698