commit 56bc880957454c7bb5d148eefc1b700628b97bc3
author Ben Chan <benchan@chromium.org> Thu Sep 19 23:54:51 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 20 18:40:42 2013 +0000
tree 006bf24783e0971d8108ce16472803c878499fce
parent 5c1f29c29e848394d84d6eaafbbe5e7419a8d5f6

shill: Rename kHostProperty to kVPNHostProperty in vpn_driver_unittest.cc

The kHostProperty constant in vpn_driver_unittest.cc clashes with the
kHostProperty DBus service constant defined in
chromeos/dbus/service_constants.h once the latter is moved from the
flimflam namespace to the shill namespace. This CL fixes that by
renaming kHostProperty in vpn_driver_unittest.cc to kVPNHostProperty.

BUG=chromium:295425
TEST=Build and run unit tests.

Change-Id: I16aa696650f803a768cc413004ee87398cca9807
Reviewed-on: https://chromium-review.googlesource.com/170097
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>

vpn_driver_unittest.cc

diff --git a/vpn_driver_unittest.cc b/vpn_driver_unittest.cc
index afb78c9..d5be5fe 100644
--- a/vpn_driver_unittest.cc
+++ b/vpn_driver_unittest.cc
@@ -36,7 +36,7 @@
 
 namespace {
 
-const char kHostProperty[] = "VPN.Host";
+const char kVPNHostProperty[] = "VPN.Host";
 const char kOTPProperty[] = "VPN.OTP";
 const char kPINProperty[] = "VPN.PIN";
 const char kPSKProperty[] = "VPN.PSK";
@@ -72,7 +72,7 @@
 // static
 const VPNDriverUnderTest::Property VPNDriverUnderTest::kProperties[] = {
   { kEapCaCertPemProperty, Property::kArray },
-  { kHostProperty, 0 },
+  { kVPNHostProperty, 0 },
   { kL2tpIpsecCaCertPemProperty, Property::kArray },
   { kOTPProperty, Property::kEphemeral },
   { kPINProperty, Property::kWriteOnly },
@@ -176,7 +176,7 @@
 
 TEST_F(VPNDriverTest, Load) {
   MockStore storage;
-  GetArgs()->SetString(kHostProperty, "1.2.3.4");
+  GetArgs()->SetString(kVPNHostProperty, "1.2.3.4");
   GetArgs()->SetString(kPSKProperty, "1234");
   GetArgs()->SetStrings(kL2tpIpsecCaCertPemProperty,
                         vector<string>{ "cleared-cert0", "cleared-cert1" });
@@ -209,7 +209,7 @@
   EXPECT_EQ(kPassword, GetArgs()->LookupString(kPasswordProperty, ""));
 
   // Properties missing from the persistent store should be deleted.
-  EXPECT_FALSE(GetArgs()->ContainsString(kHostProperty));
+  EXPECT_FALSE(GetArgs()->ContainsString(kVPNHostProperty));
   EXPECT_FALSE(GetArgs()->ContainsStrings(kL2tpIpsecCaCertPemProperty));
   EXPECT_FALSE(GetArgs()->ContainsString(kPSKProperty));
 }
@@ -244,7 +244,7 @@
       .Times(0);
   EXPECT_CALL(storage, DeleteKey(kStorageID, kL2tpIpsecCaCertPemProperty));
   EXPECT_CALL(storage, DeleteKey(kStorageID, kPSKProperty));
-  EXPECT_CALL(storage, DeleteKey(kStorageID, kHostProperty));
+  EXPECT_CALL(storage, DeleteKey(kStorageID, kVPNHostProperty));
   EXPECT_TRUE(driver_.Save(&storage, kStorageID, true));
 }
 
@@ -296,7 +296,7 @@
   SetArg(kPortProperty, kPort);
   SetArg(kPasswordProperty, kPassword);
   SetArg(flimflam::kProviderTypeProperty, kProviderType);
-  SetArg(kHostProperty, "");
+  SetArg(kVPNHostProperty, "");
   const vector<string> kCaCerts{ "cert1" };
   SetArgArray(kEapCaCertPemProperty, kCaCerts);
   SetArgArray(kL2tpIpsecCaCertPemProperty, vector<string>());
@@ -330,7 +330,7 @@
   // We should be able to read empty properties from the "Provider" stringmap.
   {
     string value;
-    EXPECT_TRUE(GetProviderPropertyString(store, kHostProperty, &value));
+    EXPECT_TRUE(GetProviderPropertyString(store, kVPNHostProperty, &value));
     EXPECT_TRUE(value.empty());
   }
   {