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

Side by Side Diff: base/threading/thread_id_name_manager_unittest.cc

Issue 1207823004: PlatformThreadHandle: remove public id() interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: the last two nits Created 5 years, 5 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
« no previous file with comments | « base/threading/thread.cc ('k') | base/threading/thread_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #include "base/threading/thread_id_name_manager.h" 5 #include "base/threading/thread_id_name_manager.h"
6 6
7 #include "base/threading/platform_thread.h" 7 #include "base/threading/platform_thread.h"
8 #include "base/threading/thread.h" 8 #include "base/threading/thread.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "testing/platform_test.h" 10 #include "testing/platform_test.h"
11 11
12 typedef PlatformTest ThreadIdNameManagerTest; 12 typedef PlatformTest ThreadIdNameManagerTest;
13 13
14 namespace { 14 namespace {
15 15
16 const char kAThread[] = "a thread"; 16 const char kAThread[] = "a thread";
17 const char kBThread[] = "b thread"; 17 const char kBThread[] = "b thread";
18 18
19 TEST_F(ThreadIdNameManagerTest, AddThreads) { 19 TEST_F(ThreadIdNameManagerTest, AddThreads) {
20 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance(); 20 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
21 base::Thread thread_a(kAThread); 21 base::Thread thread_a(kAThread);
22 base::Thread thread_b(kBThread); 22 base::Thread thread_b(kBThread);
23 23
24 thread_a.StartAndWaitForTesting(); 24 thread_a.StartAndWaitForTesting();
25 thread_b.StartAndWaitForTesting(); 25 thread_b.StartAndWaitForTesting();
26 26
27 EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id())); 27 EXPECT_STREQ(kAThread, manager->GetName(thread_a.GetThreadId()));
28 EXPECT_STREQ(kBThread, manager->GetName(thread_b.thread_id())); 28 EXPECT_STREQ(kBThread, manager->GetName(thread_b.GetThreadId()));
29 29
30 thread_b.Stop(); 30 thread_b.Stop();
31 thread_a.Stop(); 31 thread_a.Stop();
32 } 32 }
33 33
34 TEST_F(ThreadIdNameManagerTest, RemoveThreads) { 34 TEST_F(ThreadIdNameManagerTest, RemoveThreads) {
35 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance(); 35 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
36 base::Thread thread_a(kAThread); 36 base::Thread thread_a(kAThread);
37 37
38 thread_a.StartAndWaitForTesting(); 38 thread_a.StartAndWaitForTesting();
39 { 39 {
40 base::Thread thread_b(kBThread); 40 base::Thread thread_b(kBThread);
41 thread_b.StartAndWaitForTesting(); 41 thread_b.StartAndWaitForTesting();
42 thread_b.Stop(); 42 thread_b.Stop();
43 } 43 }
44 EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id())); 44 EXPECT_STREQ(kAThread, manager->GetName(thread_a.GetThreadId()));
45 45
46 thread_a.Stop(); 46 thread_a.Stop();
47 EXPECT_STREQ("", manager->GetName(thread_a.thread_id())); 47 EXPECT_STREQ("", manager->GetName(thread_a.GetThreadId()));
48 } 48 }
49 49
50 TEST_F(ThreadIdNameManagerTest, RestartThread) { 50 TEST_F(ThreadIdNameManagerTest, RestartThread) {
51 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance(); 51 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
52 base::Thread thread_a(kAThread); 52 base::Thread thread_a(kAThread);
53 53
54 thread_a.StartAndWaitForTesting(); 54 thread_a.StartAndWaitForTesting();
55 base::PlatformThreadId a_id = thread_a.thread_id(); 55 base::PlatformThreadId a_id = thread_a.GetThreadId();
56 EXPECT_STREQ(kAThread, manager->GetName(a_id)); 56 EXPECT_STREQ(kAThread, manager->GetName(a_id));
57 thread_a.Stop(); 57 thread_a.Stop();
58 58
59 thread_a.StartAndWaitForTesting(); 59 thread_a.StartAndWaitForTesting();
60 EXPECT_STREQ("", manager->GetName(a_id)); 60 EXPECT_STREQ("", manager->GetName(a_id));
61 EXPECT_STREQ(kAThread, manager->GetName(thread_a.thread_id())); 61 EXPECT_STREQ(kAThread, manager->GetName(thread_a.GetThreadId()));
62 thread_a.Stop(); 62 thread_a.Stop();
63 } 63 }
64 64
65 TEST_F(ThreadIdNameManagerTest, ThreadNameInterning) { 65 TEST_F(ThreadIdNameManagerTest, ThreadNameInterning) {
66 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance(); 66 base::ThreadIdNameManager* manager = base::ThreadIdNameManager::GetInstance();
67 67
68 base::PlatformThreadId a_id = base::PlatformThread::CurrentId(); 68 base::PlatformThreadId a_id = base::PlatformThread::CurrentId();
69 base::PlatformThread::SetName("First Name"); 69 base::PlatformThread::SetName("First Name");
70 std::string version = manager->GetName(a_id); 70 std::string version = manager->GetName(a_id);
71 71
(...skipping 12 matching lines...) Expand all
84 base::PlatformThread::SetName("New name"); 84 base::PlatformThread::SetName("New name");
85 EXPECT_NE(version, manager->GetName(a_id)); 85 EXPECT_NE(version, manager->GetName(a_id));
86 86
87 base::PlatformThread::SetName("Test Name"); 87 base::PlatformThread::SetName("Test Name");
88 EXPECT_EQ(version, manager->GetName(a_id)); 88 EXPECT_EQ(version, manager->GetName(a_id));
89 89
90 base::PlatformThread::SetName(""); 90 base::PlatformThread::SetName("");
91 } 91 }
92 92
93 } // namespace 93 } // namespace
OLDNEW
« no previous file with comments | « base/threading/thread.cc ('k') | base/threading/thread_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698