commit 2643cb7494baa29bbd6b956b93967c6e33ae0350
author Han Shen <shenhan@google.com> Tue Jun 26 14:45:33 2012 -0700
committer Gerrit <chrome-bot@google.com> Mon Jul 02 15:02:06 2012 -0700
tree 689067520f8457185aff49afae63fd58576f7c17
parent 6eccc536a5ec28ddb6443b4a7ee002347132fbcb

Fixed gcc-4.7 building problem for update_engine (again).

TEST=Built using gcc-4.7 for lumpy.
BUG=None

Change-Id: Ic5dc527044d75549d7a125c64990bbee4d2dfa21
Reviewed-on: https://gerrit.chromium.org/gerrit/26138
Reviewed-by: Yunlian Jiang <yunlian@chromium.org>
Commit-Ready: Han Shen <shenhan@chromium.org>
Tested-by: Han Shen <shenhan@chromium.org>

omaha_hash_calculator_unittest.cc

diff --git a/omaha_hash_calculator_unittest.cc b/omaha_hash_calculator_unittest.cc
index b6e03a4..5147806 100644
--- a/omaha_hash_calculator_unittest.cc
+++ b/omaha_hash_calculator_unittest.cc
@@ -20,41 +20,48 @@
 
 namespace chromeos_update_engine {
 
-class OmahaHashCalculatorTest : public ::testing::Test { };
-
 // Generated by running this on a linux shell:
 // $ echo -n hi | openssl dgst -sha256 -binary | openssl base64
 static const char kExpectedHash[] =
     "j0NDRmSPa5bfid2pAcUXaxCm2Dlh3TwayItZstwyeqQ=";
-static const char kExpectedRawHash[] = {
+static const unsigned char kRawExpectedRawHash[] = {
   0x8f, 0x43, 0x43, 0x46, 0x64, 0x8f, 0x6b, 0x96,
   0xdf, 0x89, 0xdd, 0xa9, 0x01, 0xc5, 0x17, 0x6b,
   0x10, 0xa6, 0xd8, 0x39, 0x61, 0xdd, 0x3c, 0x1a,
   0xc8, 0x8b, 0x59, 0xb2, 0xdc, 0x32, 0x7a, 0xa4
 };
 
-TEST(OmahaHashCalculatorTest, SimpleTest) {
+class OmahaHashCalculatorTest : public ::testing::Test {
+public:
+  const char *kExpectedRawHash;
+  const char *kExpectedRawHashEnd;
+
+  OmahaHashCalculatorTest() :
+    kExpectedRawHash(reinterpret_cast<const char*>(kRawExpectedRawHash)),
+    kExpectedRawHashEnd(kExpectedRawHash + arraysize(kRawExpectedRawHash))
+  {}
+};
+
+TEST_F(OmahaHashCalculatorTest, SimpleTest) {
   OmahaHashCalculator calc;
   calc.Update("hi", 2);
   calc.Finalize();
   EXPECT_EQ(kExpectedHash, calc.hash());
-  vector<char> raw_hash(kExpectedRawHash,
-                        kExpectedRawHash + arraysize(kExpectedRawHash));
+  vector<char> raw_hash(kExpectedRawHash, kExpectedRawHashEnd);
   EXPECT_TRUE(raw_hash == calc.raw_hash());
 }
 
-TEST(OmahaHashCalculatorTest, MultiUpdateTest) {
+TEST_F(OmahaHashCalculatorTest, MultiUpdateTest) {
   OmahaHashCalculator calc;
   calc.Update("h", 1);
   calc.Update("i", 1);
   calc.Finalize();
   EXPECT_EQ(kExpectedHash, calc.hash());
-  vector<char> raw_hash(kExpectedRawHash,
-                        kExpectedRawHash + arraysize(kExpectedRawHash));
+  vector<char> raw_hash(kExpectedRawHash, kExpectedRawHashEnd);
   EXPECT_TRUE(raw_hash == calc.raw_hash());
 }
 
-TEST(OmahaHashCalculatorTest, ContextTest) {
+TEST_F(OmahaHashCalculatorTest, ContextTest) {
   OmahaHashCalculator calc;
   calc.Update("h", 1);
   string calc_context = calc.GetContext();
@@ -64,12 +71,11 @@
   calc_next.Update("i", 1);
   calc_next.Finalize();
   EXPECT_EQ(kExpectedHash, calc_next.hash());
-  vector<char> raw_hash(kExpectedRawHash,
-                        kExpectedRawHash + arraysize(kExpectedRawHash));
+  vector<char> raw_hash(kExpectedRawHash, kExpectedRawHashEnd);
   EXPECT_TRUE(raw_hash == calc_next.raw_hash());
 }
 
-TEST(OmahaHashCalculatorTest, BigTest) {
+TEST_F(OmahaHashCalculatorTest, BigTest) {
   OmahaHashCalculator calc;
 
   int digit_count = 1;
@@ -94,7 +100,7 @@
   EXPECT_EQ("NZf8k6SPBkYMvhaX8YgzuMgbkLP1XZ+neM8K5wcSsf8=", calc.hash());
 }
 
-TEST(OmahaHashCalculatorTest, UpdateFileSimpleTest) {
+TEST_F(OmahaHashCalculatorTest, UpdateFileSimpleTest) {
   string data_path;
   ASSERT_TRUE(
       utils::MakeTempFile("/tmp/data.XXXXXX", &data_path, NULL));
@@ -107,8 +113,7 @@
     EXPECT_EQ(2, calc.UpdateFile(data_path, kLengths[i]));
     EXPECT_TRUE(calc.Finalize());
     EXPECT_EQ(kExpectedHash, calc.hash());
-    vector<char> raw_hash(kExpectedRawHash,
-                          kExpectedRawHash + arraysize(kExpectedRawHash));
+    vector<char> raw_hash(kExpectedRawHash, kExpectedRawHashEnd);
     EXPECT_TRUE(raw_hash == calc.raw_hash());
   }
 
@@ -120,7 +125,7 @@
   EXPECT_EQ("qqlAJmTxpB9A67xSyZk+tmrrNmYClY/fqig7ceZNsSM=", calc.hash());
 }
 
-TEST(OmahaHashCalculatorTest, RawHashOfFileSimpleTest) {
+TEST_F(OmahaHashCalculatorTest, RawHashOfFileSimpleTest) {
   string data_path;
   ASSERT_TRUE(
       utils::MakeTempFile("/tmp/data.XXXXXX", &data_path, NULL));
@@ -129,8 +134,7 @@
 
   static const int kLengths[] = { -1, 2, 10 };
   for (size_t i = 0; i < arraysize(kLengths); i++) {
-    vector<char> exp_raw_hash(kExpectedRawHash,
-                              kExpectedRawHash + arraysize(kExpectedRawHash));
+    vector<char> exp_raw_hash(kExpectedRawHash, kExpectedRawHashEnd);
     vector<char> raw_hash;
     EXPECT_EQ(2, OmahaHashCalculator::RawHashOfFile(data_path,
                                                     kLengths[i],
@@ -139,12 +143,12 @@
   }
 }
 
-TEST(OmahaHashCalculatorTest, UpdateFileNonexistentTest) {
+TEST_F(OmahaHashCalculatorTest, UpdateFileNonexistentTest) {
   OmahaHashCalculator calc;
   EXPECT_EQ(-1, calc.UpdateFile("/some/non-existent/file", -1));
 }
 
-TEST(OmahaHashCalculatorTest, AbortTest) {
+TEST_F(OmahaHashCalculatorTest, AbortTest) {
   // Just make sure we don't crash and valgrind doesn't detect memory leaks
   {
     OmahaHashCalculator calc;