added second test insertion

Author: danielepanozzo

.vscode/launch.json

@@ -6,7 +6,7 @@
         "type": "cppdbg",
         "request": "launch",
         "program": "/home/daniele/git/simple-json-validator/build/tests/unit_tests",
-        "args": ["simple"],
+        "args": [""],
         "stopAtEntry": false,
         "cwd": "/home/daniele/git/simple-json-validator/build/",
         "environment": [],

src/sjv/sjv.cpp

@@ -37,12 +37,23 @@ namespace sjv
                 // If the pointer matches a strict subset of it, add it to the flattened
                 std::tuple<bool, string> subset = is_subset_pointer(e.key(), string(rule["pointer"]));
                 if (std::get<0>(subset))
-                    out_flat[std::get<1>(subset)] = rule["default"];
+                    if (!out_flat.contains(std::get<1>(subset)))
+                        out_flat[std::get<1>(subset)] = rule["default"];
+
+                // Try it also without the last entry to capture object types which are empty
+                string key_parent = e.key().substr(0,e.key().find_last_of("/\\")); 
+  
+                subset = is_subset_pointer(key_parent, string(rule["pointer"]));
+                if (std::get<0>(subset))
+                    if (!out_flat.contains(std::get<1>(subset)))
+                        out_flat[std::get<1>(subset)] = rule["default"];
+                
             }
             // Special case as "/" is not inserted in the flat representation
             std::tuple<bool, string> subset = is_subset_pointer("/", string(rule["pointer"]));
             if (std::get<0>(subset))
-                out_flat[std::get<1>(subset)] = rule["default"];
+                if (!out_flat.contains(std::get<1>(subset)))
+                        out_flat[std::get<1>(subset)] = rule["default"];
         }
 
         // Unflatten the input
@@ -389,7 +400,6 @@ namespace sjv
 
     std::tuple<bool, string> SJV::is_subset_pointer(const string &json, const string &pointer)
     {
-        std::cout << "is_subset_pointer(" << json << "," << pointer << ")" << std::endl;
         // Splits a string into tokens using the deliminator delim
         auto tokenize = [](std::string const &str, const char delim) {
             size_t start;

tests/test_validator.cpp

@@ -306,26 +306,83 @@ TEST_CASE("simple", "[inject]")
 
     json return_json = sjv.inject_defaults(input,rules); 
 
-    std::cout << return_json << std::endl; 
-
     INFO(return_json);
     REQUIRE(return_json == output);
 }
 
-// TEST_CASE("file_inject", "[inject]")
-// {
-//     std::ifstream ifs1("../data/input_01.json");
-//     json input = json::parse(ifs1);
+TEST_CASE("list", "[inject]")
+{
+    json input = R"( 
+        {
+            "list1": 
+            [
+                {
+                    "count": 0,
+                    "other": 1
+                },
+                {
+                    "count": 0
+                }
+            ]
+        }
+        )"_json;
 
-//     std::ifstream ifs2("../data/rules_01.json");
-//     json rules = json::parse(ifs2);
+    json rules = R"( 
+        [
+        {
+            "pointer": "/",
+            "type": "object",
+            "required": ["list1"]
+        },
+        {
+            "pointer": "/list1",
+            "type": "list"
+        },
+        {
+            "pointer": "/list1/*",
+            "type": "object",
+            "required": ["count"],
+            "optional": ["other"]
+        },
+        {
+            "pointer": "/list1/*/count",
+            "type": "int"
+        },
+        {
+            "pointer": "/list1/*/other",
+            "type": "int",
+            "default": 2
+        }
+        ]
+        )"_json;
+
+    json output = R"( 
+        {
+            "list1": 
+            [
+                {
+                    "count": 0,
+                    "other": 1
+                },
+                {
+                    "count": 0,
+                    "other": 2
+                }
+            ]
+        }
+        )"_json;
+
+    sjv::SJV sjv;
 
-//     sjv::SJV sjv;
+    sjv.strict = false;
+
+    bool r = sjv.verify_json(input,rules); 
+    std:: string s = sjv.log2str();
+    INFO(s);
+    REQUIRE(r);
 
-//     sjv.strict = true;
+    json return_json = sjv.inject_defaults(input,rules); 
 
-//     bool r = sjv.verify_json(input,rules); 
-//     std:: string s = sjv.log2str();
-//     INFO(s);
-//     REQUIRE(r);
-// }
+    INFO(return_json);
+    REQUIRE(return_json == output);
+}