commit 88b591f24cb3f94f982d7024c2e8ed25c2cc26a2
author Alex Vakulenko <avakulenko@chromium.org> Thu Aug 28 16:48:57 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Sep 01 11:05:16 2014 +0000
tree d49741d0b0926c4c387e9d618b990ae89e6d2f8e
parent f3e2801f18bae14e41099e007de7c9a019735556

update_engine: Replace NULL with nullptr

Replaced the usage of NULL with nullptr. This also makes it possible to
use standard gtest macros to compare pointers in Update Manager's unit tests.
So, there is no need in custom UMTEST_... macros which are replaced with the
gtest macros (see change in update_engine/update_manager/umtest_utils.h):

UMTEST_ASSERT_NULL(p)      => ASSERT_EQ(nullptr, p)
UMTEST_ASSERT_NOT_NULL(p)  => ASSERT_NE(nullptr, p)
UMTEST_EXPECT_NULL(p)      => EXPECT_EQ(nullptr, p)
UMTEST_EXPECT_NOT_NULL(p)  => EXPECT_NE(nullptr, p)

BUG=None
TEST=FEATURES=test emerge-link update_engine
     USE="clang asan" FEATURES=test emerge-link update_engine

Change-Id: I77a42a1e9ce992bb2f9f263db5cf75fe6110a4ec
Reviewed-on: https://chromium-review.googlesource.com/215136
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

update_manager/evaluation_context_unittest.cc

diff --git a/update_manager/evaluation_context_unittest.cc b/update_manager/evaluation_context_unittest.cc
index e193718..e59b160 100644
--- a/update_manager/evaluation_context_unittest.cc
+++ b/update_manager/evaluation_context_unittest.cc
@@ -84,9 +84,9 @@
     if (eval_ctx_) {
       base::WeakPtr<EvaluationContext> eval_ctx_weak_alias =
           eval_ctx_->weak_ptr_factory_.GetWeakPtr();
-      UMTEST_ASSERT_NOT_NULL(eval_ctx_weak_alias.get());
+      ASSERT_NE(nullptr, eval_ctx_weak_alias.get());
       eval_ctx_ = nullptr;
-      UMTEST_EXPECT_NULL(eval_ctx_weak_alias.get())
+      EXPECT_EQ(nullptr, eval_ctx_weak_alias.get())
           << "The evaluation context was not destroyed! This is likely a bug "
              "in how the test was written, look for leaking handles to the EC, "
              "possibly through closure objects.";
@@ -120,13 +120,12 @@
 };
 
 TEST_F(UmEvaluationContextTest, GetValueFails) {
-  // FakeVariable is initialized as returning NULL.
-  UMTEST_EXPECT_NULL(eval_ctx_->GetValue(&fake_int_var_));
+  // FakeVariable is initialized as returning null.
+  EXPECT_EQ(nullptr, eval_ctx_->GetValue(&fake_int_var_));
 }
 
 TEST_F(UmEvaluationContextTest, GetValueFailsWithInvalidVar) {
-  UMTEST_EXPECT_NULL(eval_ctx_->GetValue(
-      reinterpret_cast<Variable<int>*>(NULL)));
+  EXPECT_EQ(nullptr, eval_ctx_->GetValue(static_cast<Variable<int>*>(nullptr)));
 }
 
 TEST_F(UmEvaluationContextTest, GetValueReturns) {
@@ -134,7 +133,7 @@
 
   fake_int_var_.reset(new int(42));
   p_fake_int = eval_ctx_->GetValue(&fake_int_var_);
-  UMTEST_ASSERT_NOT_NULL(p_fake_int);
+  ASSERT_NE(nullptr, p_fake_int);
   EXPECT_EQ(42, *p_fake_int);
 }
 
@@ -149,19 +148,19 @@
   fake_int_var_.reset(new int(5));
 
   p_fake_int = eval_ctx_->GetValue(&fake_int_var_);
-  UMTEST_ASSERT_NOT_NULL(p_fake_int);
+  ASSERT_NE(nullptr, p_fake_int);
   EXPECT_EQ(42, *p_fake_int);
 }
 
 TEST_F(UmEvaluationContextTest, GetValueCachesNull) {
   const int* p_fake_int = eval_ctx_->GetValue(&fake_int_var_);
-  UMTEST_EXPECT_NULL(p_fake_int);
+  EXPECT_EQ(nullptr, p_fake_int);
 
   fake_int_var_.reset(new int(42));
   // A second attempt to read the variable should not work because this
-  // EvaluationContext already got a NULL value.
+  // EvaluationContext already got a null value.
   p_fake_int = eval_ctx_->GetValue(&fake_int_var_);
-  UMTEST_EXPECT_NULL(p_fake_int);
+  EXPECT_EQ(nullptr, p_fake_int);
 }
 
 TEST_F(UmEvaluationContextTest, GetValueMixedTypes) {
@@ -175,10 +174,10 @@
   p_fake_int = eval_ctx_->GetValue(&fake_int_var_);
   p_fake_string = eval_ctx_->GetValue(&fake_poll_var_);
 
-  UMTEST_ASSERT_NOT_NULL(p_fake_int);
+  ASSERT_NE(nullptr, p_fake_int);
   EXPECT_EQ(42, *p_fake_int);
 
-  UMTEST_ASSERT_NOT_NULL(p_fake_string);
+  ASSERT_NE(nullptr, p_fake_string);
   EXPECT_EQ("Hello world!", *p_fake_string);
 }
 
@@ -328,7 +327,7 @@
   // setup.
   EXPECT_CALL(mock_var_async_, GetValue(default_timeout_, _))
       .WillOnce(Return(nullptr));
-  UMTEST_EXPECT_NULL(eval_ctx_->GetValue(&mock_var_async_));
+  EXPECT_EQ(nullptr, eval_ctx_->GetValue(&mock_var_async_));
 }
 
 TEST_F(UmEvaluationContextTest, TimeoutUpdatesWithMonotonicTime) {
@@ -339,7 +338,7 @@
 
   EXPECT_CALL(mock_var_async_, GetValue(timeout, _))
       .WillOnce(Return(nullptr));
-  UMTEST_EXPECT_NULL(eval_ctx_->GetValue(&mock_var_async_));
+  EXPECT_EQ(nullptr, eval_ctx_->GetValue(&mock_var_async_));
 }
 
 TEST_F(UmEvaluationContextTest, ResetEvaluationResetsTimesWallclock) {