Merge lp:~marcustomlinson/unity-scopes-api/lp-1410125-rtm into lp:unity-scopes-api/rtm-14.09

[Marcus Tomlinson]

Fixed smartscopesproxy crash due to json-cpp update

[Michi Henning (michihenning)]

Yes, please!

review: Approve

=== modified file 'src/scopes/internal/JsonCppNode.cpp'
--- src/scopes/internal/JsonCppNode.cpp	2014-08-18 08:12:22 +0000
+++ src/scopes/internal/JsonCppNode.cpp	2015-01-23 12:23:57 +0000
@@ -252,6 +252,11 @@
 
 bool JsonCppNode::has_node(std::string const& node_name) const
 {
+    if (!root_)
+    {
+        throw unity::LogicException("Current node is empty");
+    }
+
     return root_.isMember(node_name);
 }
 
 
=== modified file 'src/scopes/internal/JsonSettingsSchema.cpp'
--- src/scopes/internal/JsonSettingsSchema.cpp	2014-08-28 00:20:56 +0000
+++ src/scopes/internal/JsonSettingsSchema.cpp	2015-01-23 12:23:57 +0000
@@ -181,7 +181,11 @@
 void Setting::set_default_value(Json::Value const& v, Type expected_type)
 {
     auto v_param = v[parameters_key];
-    if (!v_param.isObject())
+    if (v_param.isNull())
+    {
+        return;
+    }
+    else if (!v_param.isObject())
     {
         throw ResourceException("JsonSettingsSchema(): expected value of type object for \"parameters\", id = \"" + id_ + "\"");
     }
 
=== modified file 'test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp'
--- test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp	2014-08-14 14:39:01 +0000
+++ test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp	2015-01-23 12:23:57 +0000
@@ -397,7 +397,7 @@
                     {
                         "id": "x",
                         "type": "number",
-                         "displayName": "X",
+                        "displayName": "X",
                         "parameters": {
                             "defaultValue": "banana"
                         }
@@ -457,7 +457,7 @@
     }
     catch (ResourceException const& e)
     {
-        EXPECT_STREQ("unity::ResourceException: JsonSettingsSchema(): missing \"parameters\" definition, id = \"x\"",
+        EXPECT_STREQ("unity::ResourceException: JsonSettingsSchema(): missing \"displayName\" definition, id = \"x\"",
                      e.what());
     }