Change the key that ThemeParser parses to start with '/'

Change-Id: Iad13a2f0ca0f2c4075b10baca3485acb7a4a2ea4
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/theme/loader/theme_info.cc b/src/theme/loader/theme_info.cc
index 6c56a5e..7173fa0 100644 (file)
--- a/src/theme/loader/theme_info.cc
+++ b/src/theme/loader/theme_info.cc
@@ -71,27 +71,27 @@ uid_t ThemeInfo::GetUid() const {
 }
 
 std::string ThemeInfo::GetVersion() const {
-  return bundle_.GetString("version");
+  return bundle_.GetString("/version");
 }
 
 std::string ThemeInfo::GetToolVersion() const {
-  return bundle_.GetString("tool_version");
+  return bundle_.GetString("/tool_version");
 }
 
 std::string ThemeInfo::GetTitle() const {
-  return bundle_.GetString("title");
+  return bundle_.GetString("/title");
 }
 
 std::string ThemeInfo::GetResolution() const {
-  return bundle_.GetString("resolution");
+  return bundle_.GetString("/resolution");
 }
 
 std::string ThemeInfo::GetPreview() const {
-  return bundle_.GetString("preview");
+  return bundle_.GetString("/preview");
 }
 
 std::string ThemeInfo::GetDescription() const {
-  return bundle_.GetString("description");
+  return bundle_.GetString("/description");
 }
 
 std::string ThemeInfo::GetString(const std::string& key) const {

diff --git a/src/theme_plugin/theme_info_builder.cc b/src/theme_plugin/theme_info_builder.cc
index f459921..d1331bd 100644 (file)
--- a/src/theme_plugin/theme_info_builder.cc
+++ b/src/theme_plugin/theme_info_builder.cc
@@ -11,7 +11,7 @@
 
 namespace {
 
-const char kThemeFilesPrefix[] = "theme/files";
+const char kThemeFilesPrefix[] = "/theme/files";
 
 bool StartsWith(const std::string& str, const std::string& substr) {
   return str.length() >= substr.length() &&

diff --git a/src/theme_plugin/theme_parser.cc b/src/theme_plugin/theme_parser.cc
index 3431bcc..aaac347 100644 (file)
--- a/src/theme_plugin/theme_parser.cc
+++ b/src/theme_plugin/theme_parser.cc
@@ -65,8 +65,7 @@ bool ThemeParser::ExtractJson(const Json::Value& node,
     std::string parent_key, ThemeInfoBuilder* builder) {
   bool ret = true;
   for (auto it = node.begin(); it != node.end(); ++it) {
-    std::string key = parent_key.empty() ?
-          it.name() : parent_key + "/" + it.name();
+    std::string key = parent_key + "/" + it.name();
     if (it->isObject())
       ret &= ExtractJson(*it, key, builder);
     else if (it->isArray())

diff --git a/src/theme_provider/db_manager.cc b/src/theme_provider/db_manager.cc
index c111a6e..73c0f8f 100644 (file)
--- a/src/theme_provider/db_manager.cc
+++ b/src/theme_provider/db_manager.cc
@@ -87,17 +87,17 @@ bool DbManager::Insert(const tizen_base::Bundle& info) {
     return false;
   if (!stmt->BindString(idx++, info.GetString("pkgid")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("version")))
+  if (!stmt->BindString(idx++, info.GetString("/version")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("tool_version")))
+  if (!stmt->BindString(idx++, info.GetString("/tool_version")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("title")))
+  if (!stmt->BindString(idx++, info.GetString("/title")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("description")))
+  if (!stmt->BindString(idx++, info.GetString("/description")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("preview")))
+  if (!stmt->BindString(idx++, info.GetString("/preview")))
     return false;
-  if (!stmt->BindString(idx++, info.GetString("resolution")))
+  if (!stmt->BindString(idx++, info.GetString("/resolution")))
     return false;
   if (!stmt->BindString(idx++, info.GetString("is_default")))
     return false;

diff --git a/test/unit_tests/test_request_handlers.cc b/test/unit_tests/test_request_handlers.cc
index 78a4c8b..78871cb 100644 (file)
--- a/test/unit_tests/test_request_handlers.cc
+++ b/test/unit_tests/test_request_handlers.cc
@@ -82,14 +82,14 @@ class RequestHandlersTest : public TestFixture {
     b.Add("id", "default_id");
     b.Add("pkgid", "default_pkgid");
     b.Add("uid", "5001");
-    b.Add("version", "1.0");
-    b.Add("tool_version", "1.1");
-    b.Add("title", "Default Theme");
-    b.Add("resolution", "360X360");
-    b.Add("preview", "shared/res/default_preview.png");
-    b.Add("description", "default test");
     b.Add("is_default", "true");
-    b.Add("some_default_key", "some_default_value");
+    b.Add("/version", "1.0");
+    b.Add("/tool_version", "1.1");
+    b.Add("/title", "Default Theme");
+    b.Add("/resolution", "360X360");
+    b.Add("/preview", "shared/res/default_preview.png");
+    b.Add("/description", "default test");
+    b.Add("/some_default_key", "some_default_value");
     db_manager.Insert(b);
 
     proxy_ = std::make_shared<ThemeInfoProxy>(kTestDb);
@@ -97,12 +97,12 @@ class RequestHandlersTest : public TestFixture {
     b_.Add("id", "testid");
     b_.Add("pkgid", "testpkgid");
     b_.Add("uid", "5001");
-    b_.Add("version", "1.0");
-    b_.Add("tool_version", "1.1");
-    b_.Add("title", "Test");
-    b_.Add("resolution", "360X360");
-    b_.Add("preview", "shared/res/preview.png");
-    b_.Add("description", "test");
+    b_.Add("/version", "1.0");
+    b_.Add("/tool_version", "1.1");
+    b_.Add("/title", "Test");
+    b_.Add("/resolution", "360X360");
+    b_.Add("/preview", "shared/res/preview.png");
+    b_.Add("/description", "test");
   }
 
   virtual void TearDown() {
@@ -141,12 +141,12 @@ TEST_F(RequestHandlersTest, ControlRequestHandler_OnRequest) {
                           reinterpret_cast<GDBusSignalCallback>(user_data);
                       tizen_base::Bundle b;
                       b.Add("id", "testid");
-                      b.Add("version", "1.0");
-                      b.Add("tool_version", "1.1");
-                      b.Add("title", "Test");
-                      b.Add("resolution", "360X360");
-                      b.Add("preview", "shared/res/preview.png");
-                      b.Add("description", "test");
+                      b.Add("/version", "1.0");
+                      b.Add("/tool_version", "1.1");
+                      b.Add("/title", "Test");
+                      b.Add("/resolution", "360X360");
+                      b.Add("/preview", "shared/res/preview.png");
+                      b.Add("/description", "test");
                       GVariant* gv = g_variant_new("(is)",
                           static_cast<int>(ttm::dbus::Command::CHANGED),
                           reinterpret_cast<char*>(b.ToRaw().first.get()));
@@ -194,12 +194,12 @@ TEST_F(RequestHandlersTest, PackageRequestHandler_OnRequest) {
 
   tizen_base::Bundle v2;
   v2.Add("id", "testid");
-  v2.Add("version", "2.0");
-  v2.Add("tool_version", "2.2");
-  v2.Add("title", "Test2");
-  v2.Add("resolution", "360X360");
-  v2.Add("preview", "shared/res/preview_v2.png");
-  v2.Add("description", "test_v2");
+  v2.Add("/version", "2.0");
+  v2.Add("/tool_version", "2.2");
+  v2.Add("/title", "Test2");
+  v2.Add("/resolution", "360X360");
+  v2.Add("/preview", "shared/res/preview_v2.png");
+  v2.Add("/description", "test_v2");
 
   ThemeInfo info2(v2);
   handler.OnRequest(ttm::dbus::Command::UPDATE, info2.Serialize());
@@ -223,12 +223,12 @@ TEST_F(RequestHandlersTest, SelectionRequestHandler_OnRequest) {
 
   tizen_base::Bundle v2;
   v2.Add("id", "testid4");
-  v2.Add("version", "1.0");
-  v2.Add("tool_version", "1.1");
-  v2.Add("title", "Test5");
-  v2.Add("resolution", "360X360");
-  v2.Add("preview", "shared/res/preview.png");
-  v2.Add("description", "test");
+  v2.Add("/version", "1.0");
+  v2.Add("/tool_version", "1.1");
+  v2.Add("/title", "Test5");
+  v2.Add("/resolution", "360X360");
+  v2.Add("/preview", "shared/res/preview.png");
+  v2.Add("/description", "test");
 
   ThemeInfo info2(v2);
   proxy_->SaveTheme(info2);
@@ -240,7 +240,7 @@ TEST_F(RequestHandlersTest, SelectionRequestHandler_OnRequest) {
   tizen_base::Bundle result(rb.GetString(ttm::dbus::kCmdDataKey));
   ThemeInfo theme(result);
   EXPECT_EQ(theme.GetId(), "testid");
-  EXPECT_EQ(theme.GetString("some_default_key"), "some_default_value");
+  EXPECT_EQ(theme.GetString("/some_default_key"), "some_default_value");
 
   rb = handler.OnRequest(ttm::dbus::Command::GET_IDS, {});
   std::vector<std::string> ids = rb.GetStringArray(ttm::dbus::kCmdDataKey);

diff --git a/test/unit_tests/test_theme.cc b/test/unit_tests/test_theme.cc
index 95d9132..cebaa2a 100644 (file)
--- a/test/unit_tests/test_theme.cc
+++ b/test/unit_tests/test_theme.cc
@@ -49,17 +49,17 @@ class ThemeTest : public TestFixture {
     b_.Add("id", "testid");
     b_.Add("pkgid", "testpkgid");
     b_.Add("uid", "5001");
-    b_.Add("version", "1.0");
-    b_.Add("tool_version", "1.1");
-    b_.Add("title", "Test");
-    b_.Add("resolution", "360X360");
-    b_.Add("preview", "shared/res/preview.png");
-    b_.Add("description", "test");
-    b_.Add("stringkey", "value");
-    b_.Add("intkey", "1");
-    b_.Add("floatkey", "2.0");
-    b_.Add("boolkey", "true");
-    b_.Add("arraykey", ar);
+    b_.Add("/version", "1.0");
+    b_.Add("/tool_version", "1.1");
+    b_.Add("/title", "Test");
+    b_.Add("/resolution", "360X360");
+    b_.Add("/preview", "shared/res/preview.png");
+    b_.Add("/description", "test");
+    b_.Add("/stringkey", "value");
+    b_.Add("/intkey", "1");
+    b_.Add("/floatkey", "2.0");
+    b_.Add("/boolkey", "true");
+    b_.Add("/arraykey", ar);
   }
 
   virtual void TearDown() {
@@ -220,7 +220,7 @@ TEST_F(ThemeTest, Theme_GetString) {
 
   theme_h handle = static_cast<void*>(&info);
   char *str;
-  int ret = theme_get_string(handle, "stringkey", &str);
+  int ret = theme_get_string(handle, "/stringkey", &str);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(std::string(str), "value");
@@ -230,7 +230,7 @@ TEST_F(ThemeTest, Theme_GetString) {
 
 TEST_F(ThemeTest, Theme_GetString_N) {
   char *str;
-  int ret = theme_get_string(nullptr, "stringkey", &str);
+  int ret = theme_get_string(nullptr, "/stringkey", &str);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_INVALID_PARAMETER);
 }
@@ -241,7 +241,7 @@ TEST_F(ThemeTest, Theme_GetString_N2) {
 
   theme_h handle = static_cast<void*>(&info);
   char *str;
-  int ret = theme_get_string(handle, "stringkey", &str);
+  int ret = theme_get_string(handle, "/stringkey", &str);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_IO_ERROR);
 }
@@ -253,7 +253,7 @@ TEST_F(ThemeTest, Theme_GetStringArray_P) {
   theme_h handle = static_cast<void*>(&info);
   char **strarr;
   int count;
-  int ret = theme_get_string_array(handle, "arraykey", &strarr, &count);
+  int ret = theme_get_string_array(handle, "/arraykey", &strarr, &count);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(std::string(strarr[0]), "str1");
@@ -270,7 +270,7 @@ TEST_F(ThemeTest, Theme_GetStringArray_P2) {
   theme_h handle = static_cast<void*>(&info);
   char **strarr;
   int count;
-  int ret = theme_get_string_array(handle, "arraykey", &strarr, &count);
+  int ret = theme_get_string_array(handle, "/arraykey", &strarr, &count);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(count, 0);
@@ -279,7 +279,7 @@ TEST_F(ThemeTest, Theme_GetStringArray_P2) {
 TEST_F(ThemeTest, Theme_GetStringArray_N) {
   char **strarr;
   int count;
-  int ret = theme_get_string_array(nullptr, "arraykey", &strarr, &count);
+  int ret = theme_get_string_array(nullptr, "/arraykey", &strarr, &count);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_INVALID_PARAMETER);
 }
@@ -290,7 +290,7 @@ TEST_F(ThemeTest, Theme_GetInt) {
 
   theme_h handle = static_cast<void*>(&info);
   int val;
-  int ret = theme_get_int(handle, "intkey", &val);
+  int ret = theme_get_int(handle, "/intkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(val, 1);
@@ -298,7 +298,7 @@ TEST_F(ThemeTest, Theme_GetInt) {
 
 TEST_F(ThemeTest, Theme_GetInt_N) {
   int val;
-  int ret = theme_get_int(nullptr, "intkey", &val);
+  int ret = theme_get_int(nullptr, "/intkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_INVALID_PARAMETER);
 }
@@ -309,7 +309,7 @@ TEST_F(ThemeTest, Theme_GetFloat) {
 
   theme_h handle = static_cast<void*>(&info);
   float val;
-  int ret = theme_get_float(handle, "floatkey", &val);
+  int ret = theme_get_float(handle, "/floatkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(val, 2.0);
@@ -317,7 +317,7 @@ TEST_F(ThemeTest, Theme_GetFloat) {
 
 TEST_F(ThemeTest, Theme_GetFloat_N) {
   float val;
-  int ret = theme_get_float(nullptr, "floatkey", &val);
+  int ret = theme_get_float(nullptr, "/floatkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_INVALID_PARAMETER);
 }
@@ -356,7 +356,7 @@ TEST_F(ThemeTest, Theme_GetBool) {
 
   theme_h handle = static_cast<void*>(&info);
   bool val;
-  int ret = theme_get_bool(handle, "boolkey", &val);
+  int ret = theme_get_bool(handle, "/boolkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(val, true);
@@ -364,7 +364,7 @@ TEST_F(ThemeTest, Theme_GetBool) {
 
 TEST_F(ThemeTest, Theme_GetBool_N1) {
   bool val;
-  int ret = theme_get_bool(nullptr, "boolkey", &val);
+  int ret = theme_get_bool(nullptr, "/boolkey", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_INVALID_PARAMETER);
 }
@@ -375,7 +375,7 @@ TEST_F(ThemeTest, Theme_GetBool_N2) {
 
   theme_h handle = static_cast<void*>(&info);
   bool val;
-  int ret = theme_get_bool(handle, "boolkey_n", &val);
+  int ret = theme_get_bool(handle, "/boolkey_n", &val);
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_EQ(val, false);
@@ -391,14 +391,14 @@ TEST_F(ThemeTest, Theme_GetPath) {
   b.Add("id", "defaultid");
   b.Add("pkgid", "defaultpkgid");
   b.Add("uid", "5001");
-  b.Add("version", "1.0");
-  b.Add("tool_version", "1.1");
-  b.Add("title", "Default");
-  b.Add("resolution", "360X360");
-  b.Add("preview", "shared/res/default_preview.png");
-  b.Add("test_resource", "shared/res/default_resource.png");
-  b.Add("description", "default test");
-  b.Add("stringkey", "value");
+  b.Add("/version", "1.0");
+  b.Add("/tool_version", "1.1");
+  b.Add("/title", "Default");
+  b.Add("/resolution", "360X360");
+  b.Add("/preview", "shared/res/default_preview.png");
+  b.Add("/test_resource", "shared/res/default_resource.png");
+  b.Add("/description", "default test");
+  b.Add("/stringkey", "value");
 
   ThemeInfo default_theme(b);
   ThemeInfo test_theme(b_);
@@ -435,7 +435,7 @@ TEST_F(ThemeTest, Theme_GetPath) {
                   Return(PMINFO_R_OK)));
 
   EXPECT_EQ("/opt/usr/globalapps/test_pkgid/shared/res/preview.png",
-      test_theme.GetPath("preview"));
+      test_theme.GetPath("/preview"));
   EXPECT_EQ("/opt/usr/globalapps/default_pkgid/shared/res/default_resource.png",
-      test_theme.GetPath("test_resource"));
+      test_theme.GetPath("/test_resource"));
 }

diff --git a/test/unit_tests/test_theme_info_proxy.cc b/test/unit_tests/test_theme_info_proxy.cc
index 6c25585..671a85d 100644 (file)
--- a/test/unit_tests/test_theme_info_proxy.cc
+++ b/test/unit_tests/test_theme_info_proxy.cc
@@ -39,25 +39,25 @@ class ThemeInfoProxyTest : public testing::Test {
     ttm::provider::DbManager db_manager(kTestDb);
     tizen_base::Bundle b;
     b.Add("id", "default_id");
-    b.Add("version", "1.0");
-    b.Add("tool_version", "1.1");
-    b.Add("title", "Default Theme");
-    b.Add("resolution", "360X360");
-    b.Add("preview", "shared/res/default_preview.png");
-    b.Add("description", "default test");
     b.Add("is_default", "true");
-    b.Add("some_default_key", "some_default_value");
+    b.Add("/version", "1.0");
+    b.Add("/tool_version", "1.1");
+    b.Add("/title", "Default Theme");
+    b.Add("/resolution", "360X360");
+    b.Add("/preview", "shared/res/default_preview.png");
+    b.Add("/description", "default test");
+    b.Add("/some_default_key", "some_default_value");
     db_manager.Insert(b);
     db_manager.UpdateCurrentId("default_id");
 
     proxy_ = std::make_unique<ThemeInfoProxy>(kTestDb);
     b_.Add("id", "testid");
-    b_.Add("version", "1.0");
-    b_.Add("tool_version", "1.1");
-    b_.Add("title", "Test");
-    b_.Add("resolution", "360X360");
-    b_.Add("preview", "shared/res/preview.png");
-    b_.Add("description", "test");
+    b_.Add("/version", "1.0");
+    b_.Add("/tool_version", "1.1");
+    b_.Add("/title", "Test");
+    b_.Add("/resolution", "360X360");
+    b_.Add("/preview", "shared/res/preview.png");
+    b_.Add("/description", "test");
   }
 
   virtual void TearDown() {
@@ -88,12 +88,12 @@ TEST_F(ThemeInfoProxyTest, UpdateTheme) {
 
   tizen_base::Bundle v2;
   v2.Add("id", "testid");
-  v2.Add("version", "2.0");
-  v2.Add("tool_version", "2.2");
-  v2.Add("title", "Test2");
-  v2.Add("resolution", "360X360");
-  v2.Add("preview", "shared/res/preview_v2.png");
-  v2.Add("description", "test_v2");
+  v2.Add("/version", "2.0");
+  v2.Add("/tool_version", "2.2");
+  v2.Add("/title", "Test2");
+  v2.Add("/resolution", "360X360");
+  v2.Add("/preview", "shared/res/preview_v2.png");
+  v2.Add("/description", "test_v2");
 
   ThemeInfo info_v2(v2);
   EXPECT_TRUE(proxy_->UpdateTheme(info_v2));
@@ -133,12 +133,12 @@ TEST_F(ThemeInfoProxyTest, GetThemeIds) {
 
   tizen_base::Bundle v2;
   v2.Add("id", "testid2");
-  v2.Add("version", "2.0");
-  v2.Add("tool_version", "2.2");
-  v2.Add("title", "Test2");
-  v2.Add("resolution", "360X360");
-  v2.Add("preview", "shared/res/preview_v2.png");
-  v2.Add("description", "test_v2");
+  v2.Add("/version", "2.0");
+  v2.Add("/tool_version", "2.2");
+  v2.Add("/title", "Test2");
+  v2.Add("/resolution", "360X360");
+  v2.Add("/preview", "shared/res/preview_v2.png");
+  v2.Add("/description", "test_v2");
 
   ThemeInfo info2(v2);
   EXPECT_TRUE(proxy_->SaveTheme(info2));

diff --git a/test/unit_tests/test_theme_parser.cc b/test/unit_tests/test_theme_parser.cc
index 629bbf0..40fc2da 100644 (file)
--- a/test/unit_tests/test_theme_parser.cc
+++ b/test/unit_tests/test_theme_parser.cc
@@ -43,33 +43,33 @@ TEST_F(ThemeParserTest, Inflate) {
   EXPECT_EQ(info.GetToolVersion(), "1.00.38.820793");
   EXPECT_EQ(info.GetTitle(), "GOGO Theme");
   EXPECT_EQ(info.GetDescription(), "Example for theme spec");
-  EXPECT_EQ(info.GetString("header/profile"), "wearable");
-  EXPECT_EQ(info.GetString("theme/home/app_tray"), "tray.png");
-  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.browser"),
+  EXPECT_EQ(info.GetString("/header/profile"), "wearable");
+  EXPECT_EQ(info.GetString("/theme/home/app_tray"), "tray.png");
+  EXPECT_EQ(info.GetString("/theme/home/appicon/org.tizen.browser"),
       "browser.png");
-  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.calculator"),
+  EXPECT_EQ(info.GetString("/theme/home/appicon/org.tizen.calculator"),
       "calculator.png");
-  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.calendar"),
+  EXPECT_EQ(info.GetString("/theme/home/appicon/org.tizen.calendar"),
       "calendar.png");
-  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.clock"),
+  EXPECT_EQ(info.GetString("/theme/home/appicon/org.tizen.clock"),
       "clock.png");
-  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.contact"),
+  EXPECT_EQ(info.GetString("/theme/home/appicon/org.tizen.contact"),
       "contact.png");
-  EXPECT_EQ(info.GetString("theme/home/size"), "30");
-  EXPECT_EQ(info.GetString("theme/home/wallpaper"), "home_wallpaper.png");
-  EXPECT_EQ(info.GetString("theme/keyboard/keypad_bg_color"), "#050a28");
-  EXPECT_EQ(info.GetString("theme/watchface/id"), "org.tizen.gogowatch");
-  EXPECT_EQ(info.GetString("theme/watchface/url"),
+  EXPECT_EQ(info.GetString("/theme/home/size"), "30");
+  EXPECT_EQ(info.GetString("/theme/home/wallpaper"), "home_wallpaper.png");
+  EXPECT_EQ(info.GetString("/theme/keyboard/keypad_bg_color"), "#050a28");
+  EXPECT_EQ(info.GetString("/theme/watchface/id"), "org.tizen.gogowatch");
+  EXPECT_EQ(info.GetString("/theme/watchface/url"),
       "https://www.download.gogowatch/get");
-  EXPECT_EQ(info.GetStringArray("theme/preview"),
+  EXPECT_EQ(info.GetStringArray("/theme/preview"),
       std::vector<std::string>({"GOGO_Preview.png"}));
-  EXPECT_EQ(info.GetString("theme/files/shared/res/image1.png"),
+  EXPECT_EQ(info.GetString("/theme/files/shared/res/image1.png"),
       "shared/res/image1.png");
-  EXPECT_EQ(info.GetString("theme/files/shared/res/image1"),
+  EXPECT_EQ(info.GetString("/theme/files/shared/res/image1"),
       "shared/res/image1.png");
-  EXPECT_EQ(info.GetString("theme/files/shared/res/image2.svg"),
+  EXPECT_EQ(info.GetString("/theme/files/shared/res/image2.svg"),
       "shared/res/image2.svg");
-  EXPECT_EQ(info.GetString("theme/files/shared/res/image2"),
+  EXPECT_EQ(info.GetString("/theme/files/shared/res/image2"),
       "shared/res/image2.svg");
 }
 
@@ -78,13 +78,13 @@ TEST_F(ThemeParserTest, MultidimensionalArray) {
       "test_samples/test_multidimensional_array.json", false);
   auto info = parser.Inflate("testid", "testpkgid", 5001, false);
   std::vector<std::string> array_value({"1", "2", "3"});
-  EXPECT_EQ(info.GetStringArray("1D_array"), array_value);
-  EXPECT_EQ(info.GetStringArray("2D_array/0"), array_value);
-  EXPECT_EQ(info.GetStringArray("2D_array/1"), array_value);
-  EXPECT_EQ(info.GetStringArray("3D_array/0/0"), array_value);
-  EXPECT_EQ(info.GetStringArray("3D_array/0/1"), array_value);
-  EXPECT_EQ(info.GetStringArray("3D_array/1/0"), array_value);
-  EXPECT_EQ(info.GetStringArray("3D_array/1/1"), array_value);
+  EXPECT_EQ(info.GetStringArray("/1D_array"), array_value);
+  EXPECT_EQ(info.GetStringArray("/2D_array/0"), array_value);
+  EXPECT_EQ(info.GetStringArray("/2D_array/1"), array_value);
+  EXPECT_EQ(info.GetStringArray("/3D_array/0/0"), array_value);
+  EXPECT_EQ(info.GetStringArray("/3D_array/0/1"), array_value);
+  EXPECT_EQ(info.GetStringArray("/3D_array/1/0"), array_value);
+  EXPECT_EQ(info.GetStringArray("/3D_array/1/1"), array_value);
 }
 
 TEST_F(ThemeParserTest, InvalidJson) {