components/copresence/handlers/audio/audio_directive_list_unittest.cc - Issue 691223002: Replacing NULL with nullptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « components/copresence/handlers/audio/audio_directive_list.cc ('k') | components/copresence/mediums/audio/audio_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/copresence/handlers/audio/audio_directive_list_unittest.cc

diff --git a/components/copresence/handlers/audio/audio_directive_list_unittest.cc b/components/copresence/handlers/audio/audio_directive_list_unittest.cc

index 7dbcd6e55895a314f602c9db55d8f383422dbf18..d34d3120f37498f47070ef24a01547ec6f2cb819 100644

--- a/components/copresence/handlers/audio/audio_directive_list_unittest.cc

+++ b/components/copresence/handlers/audio/audio_directive_list_unittest.cc

@@ -7,7 +7,9 @@

#include "base/bind.h"

#include "base/bind_helpers.h"

#include "base/message_loop/message_loop.h"

-#include "testing/gtest/include/gtest/gtest.h"

+#include "testing/gmock/include/gmock/gmock.h"

+using testing::IsNull;

namespace copresence {

@@ -25,7 +27,7 @@ class AudioDirectiveListTest : public testing::Test {

TEST_F(AudioDirectiveListTest, Basic) {

const base::TimeDelta kTtl = base::TimeDelta::FromSeconds(9999);

- EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());

+ EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());

directive_list_->AddDirective("op_id1", kTtl);

directive_list_->AddDirective("op_id2", kTtl * 3);

@@ -53,7 +55,7 @@ TEST_F(AudioDirectiveListTest, AddDirectiveMultiple) {

directive_list_->RemoveDirective("op_id2");

EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);

directive_list_->RemoveDirective("op_id1");

- EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());

+ EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());

}

TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {

@@ -74,7 +76,7 @@ TEST_F(AudioDirectiveListTest, RemoveDirectiveMultiple) {

directive_list_->RemoveDirective("op_id2");

EXPECT_EQ("op_id1", directive_list_->GetActiveDirective()->op_id);

directive_list_->RemoveDirective("op_id1");

- EXPECT_EQ(NULL, directive_list_->GetActiveDirective().get());

+ EXPECT_THAT(directive_list_->GetActiveDirective(), IsNull());

}

} // namespace copresence