commit 710d49be2fc33f22e8f4a7ed43774fd9293d083f
author Lei YU <mine260309@gmail.com> Tue Aug 01 17:10:17 2017 +0800
committer Lei YU <mine260309@gmail.com> Mon Oct 16 20:41:01 2017 +0800
tree 7f12eab17509e59546fb5825adb4d36cc6cfd866
parent ad14354fc17811ae585f13b1d52a275cf3daff35

Use new settings API

The new time manager code was using the old settings daemon.
Now it uses the new settings API.

Change-Id: Id551d97c28a6cfbb81c87118b26292b1b5574e93
Signed-off-by: Lei YU <mine260309@gmail.com>

test/TestManager.cpp

diff --git a/test/TestManager.cpp b/test/TestManager.cpp
index d87ca39..d8c51ca 100644
--- a/test/TestManager.cpp
+++ b/test/TestManager.cpp
@@ -31,7 +31,7 @@
         }
 
         // Proxies for Manager's private members and functions
-         Mode getTimeMode()
+        Mode getTimeMode()
         {
             return manager.timeMode;
         }
@@ -94,10 +94,10 @@
     EXPECT_CALL(listener2, onOwnerChanged(Owner::Host)).Times(1);
 
     notifyPropertyChanged(
-        "time_mode",
+        "TimeSyncMethod",
         "xyz.openbmc_project.Time.Synchronization.Method.Manual");
     notifyPropertyChanged(
-        "time_owner",
+        "TimeOwner",
         "xyz.openbmc_project.Time.Owner.Owners.Host");
 
     EXPECT_EQ("", getRequestedMode());
@@ -113,10 +113,10 @@
     EXPECT_CALL(listener2, onOwnerChanged(Owner::Host)).Times(0);
 
     notifyPropertyChanged(
-        "time_mode",
+        "TimeSyncMethod",
         "xyz.openbmc_project.Time.Synchronization.Method.NTP");
     notifyPropertyChanged(
-        "time_owner",
+        "TimeOwner",
         "xyz.openbmc_project.Time.Owner.Owners.Split");
 
     EXPECT_EQ("xyz.openbmc_project.Time.Synchronization.Method.NTP",
@@ -147,10 +147,10 @@
 {
     // Property is now MANUAL/HOST
     notifyPropertyChanged(
-        "time_mode",
+        "TimeSyncMethod",
         "xyz.openbmc_project.Time.Synchronization.Method.Manual");
     notifyPropertyChanged(
-        "time_owner",
+        "TimeOwner",
         "xyz.openbmc_project.Time.Owner.Owners.Host");
 
     // Set host on
@@ -163,10 +163,10 @@
     EXPECT_CALL(listener2, onOwnerChanged(_)).Times(0);
 
     notifyPropertyChanged(
-        "time_mode",
+        "TimeSyncMethod",
         "xyz.openbmc_project.Time.Synchronization.Method.NTP");
     notifyPropertyChanged(
-        "time_owner",
+        "TimeOwner",
         "xyz.openbmc_project.Time.Owner.Owners.Split");
 
     // Saved as requested mode/owner
@@ -177,10 +177,10 @@
 
     // Property changed back to MANUAL/HOST
     notifyPropertyChanged(
-        "time_mode",
+        "TimeSyncMethod",
         "xyz.openbmc_project.Time.Synchronization.Method.Manual");
     notifyPropertyChanged(
-        "time_owner",
+        "TimeOwner",
         "xyz.openbmc_project.Time.Owner.Owners.Host");
 
     // Requested mode/owner shall be updated