commit d432539fc85363734b2c60290822054087b6c82b
author Darin Petkov <petkov@chromium.org> Mon Apr 23 15:48:22 2012 +0200
committer Gerrit <chrome-bot@google.com> Tue Apr 24 00:40:57 2012 -0700
tree 88f3d7f1d781ea575762ed4e56e8e13140f725c7
parent d20cf7562b87ea2dbe33892de407cc4fa42a1e00

shill: vpn: Register L2TP/IPSec properties.

Also, add some sanity tests for property store setup in VPNDriver subclasses.

BUG=chromium-os:29362,chromium-os:29363
TEST=unit tests

Change-Id: I144b9b810d201655e872558d29df2394ce5b345a
Reviewed-on: https://gerrit.chromium.org/gerrit/20839
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

l2tp_ipsec_driver_unittest.cc

diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index d3daa75..e231d92 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -59,6 +59,10 @@
     driver_->args_.SetString(arg, value);
   }
 
+  KeyValueStore *GetArgs() {
+    return driver_->args();
+  }
+
   // Used to assert that a flag appears in the options.
   void ExpectInFlags(const vector<string> &options, const string &flag,
                      const string &value);
@@ -363,4 +367,16 @@
   EXPECT_TRUE(error.IsSuccess());
 }
 
+TEST_F(L2TPIPSecDriverTest, InitPropertyStore) {
+  // Sanity test property store initialization.
+  PropertyStore store;
+  driver_->InitPropertyStore(&store);
+  const string kUser = "joe";
+  Error error;
+  EXPECT_TRUE(
+      store.SetStringProperty(flimflam::kL2tpIpsecUserProperty, kUser, &error));
+  EXPECT_TRUE(error.IsSuccess());
+  EXPECT_EQ(kUser, GetArgs()->GetString(flimflam::kL2tpIpsecUserProperty));
+}
+
 }  // namespace shill