config (dynamic): unit tests, test config extracted

[Bug/Feature]   test loading config defaults from json
[Cause]         N/A
[Solution]      N/A
[Verification]  Build, install, run tests

Change-Id: Ia9ad29af5e343642d9ca7ae26b126c3efe45beab

diff --git a/tests/unit_tests/config/testconfig-example.hpp b/tests/unit_tests/config/testconfig-example.hpp
new file mode 100644 (file)
index 0000000..35e846e
--- /dev/null
+++ b/tests/unit_tests/config/testconfig-example.hpp
@@ -0,0 +1,151 @@
+/*
+ *  Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Contact: Krzysztof Dynowski (k.dynowski@samsumg.com)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License
+ */
+
+
+/**
+ * @file
+ * @author  Krzysztof Dynowski (k.dynowski@samsumg.com)
+ * @brief   Test configuration struct to be used in unit tests
+ */
+
+#ifndef TESTCONFIG_EXAMPLE_HPP
+#define TESTCONFIG_EXAMPLE_HPP
+
+#include "config/fields.hpp"
+#include "config/fields-union.hpp"
+
+struct TestConfig {
+    // subtree class
+    struct SubConfig {
+
+        struct SubSubConfig {
+            int intVal;
+            bool moved;
+
+            CONFIG_REGISTER
+            (
+                intVal
+            )
+            SubSubConfig() : intVal(), moved(false) {}
+            SubSubConfig(const SubSubConfig& config) : intVal(config.intVal), moved(false) {}
+            SubSubConfig(SubSubConfig&& config) : intVal(std::move(config.intVal)), moved(false) {
+                config.moved = true;
+            }
+            SubSubConfig& operator=(const SubSubConfig& config) {
+                intVal = config.intVal;
+                moved = false;
+                return *this;
+            }
+            SubSubConfig& operator=(SubSubConfig&& config) {
+                intVal = std::move(config.intVal);
+                moved = false;
+                config.moved = true;
+                return *this;
+            }
+            bool isMoved() const {
+                return moved;
+            }
+        };
+
+        int intVal;
+        std::vector<int> intVector;
+        SubSubConfig subSubObj;
+
+        CONFIG_REGISTER
+        (
+            intVal,
+            intVector,
+            subSubObj
+        )
+    };
+
+    struct SubConfigOption {
+        CONFIG_DECLARE_UNION
+        (
+            SubConfig,
+            int
+        )
+    };
+
+    int intVal;
+    std::int64_t int64Val;
+    std::string stringVal;
+    double doubleVal;
+    bool boolVal;
+
+    std::vector<int> emptyIntVector;
+    std::vector<int> intVector;
+    std::vector<std::string> stringVector;
+    std::vector<double> doubleVector;
+
+    SubConfig subObj;
+    std::vector<SubConfig> subVector;
+
+    SubConfigOption union1;
+    SubConfigOption union2;
+    std::vector<SubConfigOption> unions;
+
+    CONFIG_REGISTER
+    (
+        intVal,
+        int64Val,
+        stringVal,
+        doubleVal,
+        boolVal,
+
+        emptyIntVector,
+        intVector,
+        stringVector,
+        doubleVector,
+
+        subObj,
+        subVector,
+
+        union1,
+        union2,
+        unions
+    )
+};
+
+/**
+ * JSON string used in ConfigSuite test cases
+ * For the purpose of these tests the order of this string
+ * has to be equal to the above REGISTER order
+ */
+const std::string jsonTestString =
+    "{ \"intVal\": 12345, "
+    "\"int64Val\": -1234567890123456789, "
+    "\"stringVal\": \"blah\", "
+    "\"doubleVal\": -1.234000, "
+    "\"boolVal\": true, "
+    "\"emptyIntVector\": [ ], "
+    "\"intVector\": [ 1, 2, 3 ], "
+    "\"stringVector\": [ \"a\", \"b\" ], "
+    "\"doubleVector\": [ 0.000000, 1.000000, 2.000000 ], "
+    "\"subObj\": { \"intVal\": 54321, \"intVector\": [ 1, 2 ], \"subSubObj\": { \"intVal\": 234 } }, "
+    "\"subVector\": [ { \"intVal\": 123, \"intVector\": [ 3, 4 ], \"subSubObj\": { \"intVal\": 345 } }, "
+        "{ \"intVal\": 456, \"intVector\": [ 5, 6 ], \"subSubObj\": { \"intVal\": 567 } } ], "
+    "\"union1\": { \"type\": \"int\", \"value\": 2 }, "
+    "\"union2\": { \"type\": \"SubConfig\", \"value\": { \"intVal\": 54321, \"intVector\": [ 1 ], "
+        "\"subSubObj\": { \"intVal\": 234 } } }, "
+    "\"unions\": [ "
+        "{ \"type\": \"int\", \"value\": 2 }, "
+        "{ \"type\": \"SubConfig\", \"value\": { \"intVal\": 54321, \"intVector\": [ 1 ], "
+            "\"subSubObj\": { \"intVal\": 234 } } } ] }";
+
+#endif

diff --git a/tests/unit_tests/config/ut-configuration.cpp b/tests/unit_tests/config/ut-configuration.cpp
index 4e6bedc..8e82905 100644 (file)
--- a/tests/unit_tests/config/ut-configuration.cpp
+++ b/tests/unit_tests/config/ut-configuration.cpp
@@ -25,8 +25,7 @@
 
 #include "config.hpp"
 #include "ut.hpp"
-#include "config/fields.hpp"
-#include "config/fields-union.hpp"
+#include "testconfig-example.hpp"
 #include "config/manager.hpp"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -38,125 +37,6 @@ using namespace config;
 
 BOOST_AUTO_TEST_SUITE(ConfigurationSuite)
 
-struct TestConfig {
-    // subtree class
-    struct SubConfig {
-
-        struct SubSubConfig {
-            int intVal;
-            bool moved;
-
-            CONFIG_REGISTER
-            (
-                intVal
-            )
-            SubSubConfig() : intVal(), moved(false) {}
-            SubSubConfig(const SubSubConfig& config) : intVal(config.intVal), moved(false) {}
-            SubSubConfig(SubSubConfig&& config) : intVal(std::move(config.intVal)), moved(false) {
-                config.moved = true;
-            }
-            SubSubConfig& operator=(const SubSubConfig& config) {
-                intVal = config.intVal;
-                moved = false;
-                return *this;
-            }
-            SubSubConfig& operator=(SubSubConfig&& config) {
-                intVal = std::move(config.intVal);
-                moved = false;
-                config.moved = true;
-                return *this;
-            }
-            bool isMoved() const {
-                return moved;
-            }
-        };
-
-        int intVal;
-        std::vector<int> intVector;
-        SubSubConfig subSubObj;
-
-        CONFIG_REGISTER
-        (
-            intVal,
-            intVector,
-            subSubObj
-        )
-    };
-
-    struct SubConfigOption {
-        CONFIG_DECLARE_UNION
-        (
-            SubConfig,
-            int
-        )
-    };
-
-    int intVal;
-    std::int64_t int64Val;
-    std::string stringVal;
-    double doubleVal;
-    bool boolVal;
-
-    std::vector<int> emptyIntVector;
-    std::vector<int> intVector;
-    std::vector<std::string> stringVector;
-    std::vector<double> doubleVector;
-
-    SubConfig subObj;
-    std::vector<SubConfig> subVector;
-
-    SubConfigOption union1;
-    SubConfigOption union2;
-    std::vector<SubConfigOption> unions;
-
-    CONFIG_REGISTER
-    (
-        intVal,
-        int64Val,
-        stringVal,
-        doubleVal,
-        boolVal,
-
-        emptyIntVector,
-        intVector,
-        stringVector,
-        doubleVector,
-
-        subObj,
-        subVector,
-
-        union1,
-        union2,
-        unions
-    )
-};
-
-/**
- * JSON string used in ConfigSuite test cases
- * For the purpose of these tests the order of this string
- * has to be equal to the above REGISTER order
- */
-const std::string jsonTestString =
-    "{ \"intVal\": 12345, "
-    "\"int64Val\": -1234567890123456789, "
-    "\"stringVal\": \"blah\", "
-    "\"doubleVal\": -1.234000, "
-    "\"boolVal\": true, "
-    "\"emptyIntVector\": [ ], "
-    "\"intVector\": [ 1, 2, 3 ], "
-    "\"stringVector\": [ \"a\", \"b\" ], "
-    "\"doubleVector\": [ 0.000000, 1.000000, 2.000000 ], "
-    "\"subObj\": { \"intVal\": 54321, \"intVector\": [ 1, 2 ], \"subSubObj\": { \"intVal\": 234 } }, "
-    "\"subVector\": [ { \"intVal\": 123, \"intVector\": [ 3, 4 ], \"subSubObj\": { \"intVal\": 345 } }, "
-        "{ \"intVal\": 456, \"intVector\": [ 5, 6 ], \"subSubObj\": { \"intVal\": 567 } } ], "
-    "\"union1\": { \"type\": \"int\", \"value\": 2 }, "
-    "\"union2\": { \"type\": \"SubConfig\", \"value\": { \"intVal\": 54321, \"intVector\": [ 1 ], "
-        "\"subSubObj\": { \"intVal\": 234 } } }, "
-    "\"unions\": [ "
-        "{ \"type\": \"int\", \"value\": 2 }, "
-        "{ \"type\": \"SubConfig\", \"value\": { \"intVal\": 54321, \"intVector\": [ 1 ], "
-            "\"subSubObj\": { \"intVal\": 234 } } } ] }";
-
 // Floating point tolerance as a number of rounding errors
 const int TOLERANCE = 1;
 

diff --git a/tests/unit_tests/config/ut-dynvisit.cpp b/tests/unit_tests/config/ut-dynvisit.cpp
new file mode 100644 (file)
index 0000000..0a24d5c
--- /dev/null
+++ b/tests/unit_tests/config/ut-dynvisit.cpp
@@ -0,0 +1,100 @@
+/*
+ *  Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Contact: Krzysztof Dynowski (k.dynowski@samsumg.com)
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License
+ */
+
+
+/**
+ * @file
+ * @author  Krzysztof Dynowski (k.dynowski@samsumg.com)
+ * @brief   Unit test of combine kvstore with defaults from json
+ */
+
+#include "config.hpp"
+#include "ut.hpp"
+#include "testconfig-example.hpp"
+#include "config/manager.hpp"
+#include <boost/filesystem.hpp>
+
+#include "config/from-kvjson-visitor.hpp"
+
+
+using namespace config;
+namespace fs = boost::filesystem;
+
+struct Fixture {
+    std::string dbPath;
+
+    Fixture()
+        : dbPath(fs::unique_path("/tmp/kvstore-%%%%.db3").string())
+    {
+        fs::remove(dbPath);
+    }
+    ~Fixture()
+    {
+        fs::remove(dbPath);
+    }
+};
+
+BOOST_FIXTURE_TEST_SUITE(DynVisitSuite, Fixture)
+
+void checkJsonConfig(const TestConfig& cfg, const std::string& json)
+{
+    TestConfig cfg2;
+    loadFromString(json, cfg2);
+    BOOST_CHECK_EQUAL(cfg2.intVal, cfg.intVal);
+    BOOST_CHECK_EQUAL(cfg.int64Val, cfg.int64Val);
+    BOOST_CHECK_EQUAL(cfg2.boolVal, cfg.boolVal);
+    BOOST_CHECK_EQUAL(cfg2.stringVal, cfg.stringVal);
+    BOOST_CHECK_EQUAL(cfg2.intVector.size(), cfg.intVector.size());
+    BOOST_CHECK_EQUAL(cfg2.subObj.intVal, cfg.subObj.intVal);
+}
+
+void checkKVConfig(const TestConfig& cfg, const std::string& db)
+{
+    KVStore store(db);
+    BOOST_CHECK_EQUAL(store.get<int>(".intVal"), cfg.intVal);
+    BOOST_CHECK_EQUAL(store.get<int64_t>(".int64Val"), cfg.int64Val);
+    BOOST_CHECK_EQUAL(store.get<bool>(".boolVal"), cfg.boolVal);
+    BOOST_CHECK_EQUAL(store.get<std::string>(".stringVal"), cfg.stringVal);
+    BOOST_CHECK_EQUAL(store.get<int>(".intVector"), cfg.intVector.size());
+    BOOST_CHECK_EQUAL(store.get<int>(".subObj.intVal"), cfg.subObj.intVal);
+}
+
+BOOST_AUTO_TEST_CASE(ReadConfigDefaults)
+{
+    TestConfig cfg;
+    loadFromKVStoreWithJson(dbPath, jsonTestString, cfg);
+    checkJsonConfig(cfg, jsonTestString);
+}
+
+BOOST_AUTO_TEST_CASE(ReadConfigNoDefaults)
+{
+    TestConfig cfg;
+    loadFromKVStoreWithJson(dbPath, jsonTestString, cfg);
+    // modify and save config
+    cfg.intVal += 5;
+    cfg.int64Val += 7777;
+    cfg.boolVal = !cfg.boolVal;
+    cfg.stringVal += "-changed";
+    config::saveToKVStore(dbPath, cfg);
+
+    TestConfig cfg2;
+    loadFromKVStoreWithJson(dbPath, jsonTestString, cfg2);
+    checkKVConfig(cfg2, dbPath);
+}
+
+BOOST_AUTO_TEST_SUITE_END()