commit 0244f467604f34b58a4e580c7493c4a652f1f16d
author Gilad Arnold <garnold@chromium.org> Fri Mar 14 17:53:59 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Mar 21 21:26:17 2014 +0000
tree 91069b71ad8aff91f727b656565f60467fdfb595
parent 78a78111da2df6601c678ed76f9ead0308779fd8

PM: Cosmetic changes to RealRandomProvider test code.

Just making sure that all boilerplate code is analogous to test code of
other providers (RealShillProvider, RealTimeProvider).

BUG=None
TEST=Unit tests.

Change-Id: Idc4aafcd151580b45e109ee56ef3cd59e4768275
Reviewed-on: https://chromium-review.googlesource.com/190248
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Tested-by: Gilad Arnold <garnold@chromium.org>
Commit-Queue: Gilad Arnold <garnold@chromium.org>

policy_manager/real_random_provider_unittest.cc

diff --git a/policy_manager/real_random_provider_unittest.cc b/policy_manager/real_random_provider_unittest.cc
index ba74791..39a2a0e 100644
--- a/policy_manager/real_random_provider_unittest.cc
+++ b/policy_manager/real_random_provider_unittest.cc
@@ -16,29 +16,27 @@
 class PmRealRandomProviderTest : public ::testing::Test {
  protected:
   virtual void SetUp() {
-    default_timeout_ = TimeDelta::FromSeconds(1);
-
     // The provider initializes correctly.
-    random_.reset(new RealRandomProvider());
-    PMTEST_ASSERT_NOT_NULL(random_.get());
-    ASSERT_TRUE(random_->Init());
+    provider_.reset(new RealRandomProvider());
+    PMTEST_ASSERT_NOT_NULL(provider_.get());
+    ASSERT_TRUE(provider_->Init());
 
-    random_->var_seed();
+    provider_->var_seed();
   }
 
-  TimeDelta default_timeout_;
-  scoped_ptr<RealRandomProvider> random_;
+  const TimeDelta default_timeout_ = TimeDelta::FromSeconds(1);
+  scoped_ptr<RealRandomProvider> provider_;
 };
 
 TEST_F(PmRealRandomProviderTest, InitFinalize) {
   // The provider initializes all variables with valid objects.
-  PMTEST_EXPECT_NOT_NULL(random_->var_seed());
+  PMTEST_EXPECT_NOT_NULL(provider_->var_seed());
 }
 
 TEST_F(PmRealRandomProviderTest, GetRandomValues) {
   // Should not return the same random seed repeatedly.
   scoped_ptr<const uint64_t> value(
-      random_->var_seed()->GetValue(default_timeout_, NULL));
+      provider_->var_seed()->GetValue(default_timeout_, NULL));
   PMTEST_ASSERT_NOT_NULL(value.get());
 
   // Test that at least the returned values are different. This test fails,
@@ -46,7 +44,7 @@
   bool is_same_value = true;
   for (int i = 0; i < 5; i++) {
     scoped_ptr<const uint64_t> other_value(
-        random_->var_seed()->GetValue(default_timeout_, NULL));
+        provider_->var_seed()->GetValue(default_timeout_, NULL));
     PMTEST_ASSERT_NOT_NULL(other_value.get());
     is_same_value = is_same_value && *other_value == *value;
   }