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

Side by Side Diff: components/copresence/handlers/audio/audio_directive_list_unittest.cc

Issue 691223002: Replacing NULL with nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using EXPECT_THAT Created 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "components/copresence/handlers/audio/audio_directive_list.h" 5 #include "components/copresence/handlers/audio/audio_directive_list.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11
12 using testing::IsNull;
11 13
12 namespace copresence { 14 namespace copresence {
13 15
14 class AudioDirectiveListTest : public testing::Test { 16 class AudioDirectiveListTest : public testing::Test {
15 public: 17 public:
16 AudioDirectiveListTest() : directive_list_(new AudioDirectiveList()) {} 18 AudioDirectiveListTest() : directive_list_(new AudioDirectiveList()) {}
17 19
18 ~AudioDirectiveListTest() override {} 20 ~AudioDirectiveListTest() override {}
19 21
20 protected: 22 protected:
21 base::MessageLoop message_loop_; 23 base::MessageLoop message_loop_;
22 scoped_ptr<AudioDirectiveList> directive_list_; 24 scoped_ptr<AudioDirectiveList> directive_list_;
23 }; 25 };
24 26
25 TEST_F(AudioDirectiveListTest, Basic) { 27 TEST_F(AudioDirectiveListTest, Basic) {
26 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999); 28 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
27 29
28 EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get()); 30 EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
29 31
30 directive_list_->AddDirective("op_id1", kTtl); 32 directive_list_->AddDirective("op_id1", kTtl);
31 directive_list_->AddDirective("op_id2", kTtl * 3); 33 directive_list_->AddDirective("op_id2", kTtl * 3);
32 directive_list_->AddDirective("op_id3", kTtl * 2); 34 directive_list_->AddDirective("op_id3", kTtl * 2);
33 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id); 35 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id);
34 36
35 directive_list_->RemoveDirective("op_id2"); 37 directive_list_->RemoveDirective("op_id2");
36 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id); 38 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id);
37 } 39 }
38 40
39 TEST_F(AudioDirectiveListTest, AddDirectiveMultiple) { 41 TEST_F(AudioDirectiveListTest, AddDirectiveMultiple) {
40 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999); 42 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
41 43
42 directive_list_->AddDirective("op_id1", kTtl); 44 directive_list_->AddDirective("op_id1", kTtl);
43 directive_list_->AddDirective("op_id2", kTtl * 2); 45 directive_list_->AddDirective("op_id2", kTtl * 2);
44 directive_list_->AddDirective("op_id3", kTtl * 3 * 2); 46 directive_list_->AddDirective("op_id3", kTtl * 3 * 2);
45 directive_list_->AddDirective("op_id3", kTtl * 3 * 3); 47 directive_list_->AddDirective("op_id3", kTtl * 3 * 3);
46 directive_list_->AddDirective("op_id4", kTtl * 4); 48 directive_list_->AddDirective("op_id4", kTtl * 4);
47 49
48 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id); 50 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id);
49 directive_list_->RemoveDirective("op_id3"); 51 directive_list_->RemoveDirective("op_id3");
50 EXPECT_EQ("op_id4", directive_list_->GetActiveDirective()->op_id); 52 EXPECT_EQ("op_id4", directive_list_->GetActiveDirective()->op_id);
51 directive_list_->RemoveDirective("op_id4"); 53 directive_list_->RemoveDirective("op_id4");
52 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id); 54 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id);
53 directive_list_->RemoveDirective("op_id2"); 55 directive_list_->RemoveDirective("op_id2");
54 EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id); 56 EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);
55 directive_list_->RemoveDirective("op_id1"); 57 directive_list_->RemoveDirective("op_id1");
56 EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get()); 58 EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
57 } 59 }
58 60
59 TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) { 61 TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {
60 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999); 62 const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);
61 63
62 directive_list_->AddDirective("op_id1", kTtl); 64 directive_list_->AddDirective("op_id1", kTtl);
63 directive_list_->AddDirective("op_id2", kTtl * 2); 65 directive_list_->AddDirective("op_id2", kTtl * 2);
64 directive_list_->AddDirective("op_id3", kTtl * 3); 66 directive_list_->AddDirective("op_id3", kTtl * 3);
65 directive_list_->AddDirective("op_id4", kTtl * 4); 67 directive_list_->AddDirective("op_id4", kTtl * 4);
66 68
67 EXPECT_EQ("op_id4", directive_list_->GetActiveDirective()->op_id); 69 EXPECT_EQ("op_id4", directive_list_->GetActiveDirective()->op_id);
68 directive_list_->RemoveDirective("op_id4"); 70 directive_list_->RemoveDirective("op_id4");
69 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id); 71 EXPECT_EQ("op_id3", directive_list_->GetActiveDirective()->op_id);
70 directive_list_->RemoveDirective("op_id3"); 72 directive_list_->RemoveDirective("op_id3");
71 directive_list_->RemoveDirective("op_id3"); 73 directive_list_->RemoveDirective("op_id3");
72 directive_list_->RemoveDirective("op_id3"); 74 directive_list_->RemoveDirective("op_id3");
73 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id); 75 EXPECT_EQ("op_id2", directive_list_->GetActiveDirective()->op_id);
74 directive_list_->RemoveDirective("op_id2"); 76 directive_list_->RemoveDirective("op_id2");
75 EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id); 77 EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);
76 directive_list_->RemoveDirective("op_id1"); 78 directive_list_->RemoveDirective("op_id1");
77 EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get()); 79 EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());
78 } 80 }
79 81
80 } // namespace copresence 82 } // namespace copresence
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698