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

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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_perftest.cc ('k') | base/threading/watchdog_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.h" 5 #include "base/threading/thread.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 #include "base/synchronization/waitable_event.h" 12 #include "base/synchronization/waitable_event.h"
13 #include "base/third_party/dynamic_annotations/dynamic_annotations.h" 13 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/googletest/include/gtest/gtest.h"
15 #include "testing/platform_test.h" 15 #include "testing/platform_test.h"
16 16
17 using base::Thread; 17 using base::Thread;
18 18
19 typedef PlatformTest ThreadTest; 19 typedef PlatformTest ThreadTest;
20 20
21 namespace { 21 namespace {
22 22
23 void ToggleValue(bool* value) { 23 void ToggleValue(bool* value) {
24 ANNOTATE_BENIGN_RACE(value, "Test-only data race on boolean " 24 ANNOTATE_BENIGN_RACE(value, "Test-only data race on boolean "
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 ASSERT_EQ(static_cast<size_t>(THREAD_NUM_EVENTS), captured_events.size()); 283 ASSERT_EQ(static_cast<size_t>(THREAD_NUM_EVENTS), captured_events.size());
284 EXPECT_EQ(THREAD_EVENT_INIT, captured_events[0]); 284 EXPECT_EQ(THREAD_EVENT_INIT, captured_events[0]);
285 EXPECT_EQ(THREAD_EVENT_CLEANUP, captured_events[1]); 285 EXPECT_EQ(THREAD_EVENT_CLEANUP, captured_events[1]);
286 EXPECT_EQ(THREAD_EVENT_MESSAGE_LOOP_DESTROYED, captured_events[2]); 286 EXPECT_EQ(THREAD_EVENT_MESSAGE_LOOP_DESTROYED, captured_events[2]);
287 } 287 }
288 288
289 TEST_F(ThreadTest, ThreadNotStarted) { 289 TEST_F(ThreadTest, ThreadNotStarted) {
290 Thread a("Inert"); 290 Thread a("Inert");
291 EXPECT_EQ(nullptr, a.task_runner()); 291 EXPECT_EQ(nullptr, a.task_runner());
292 } 292 }
OLDNEW
« no previous file with comments | « base/threading/thread_perftest.cc ('k') | base/threading/watchdog_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698