Fix theme parser test

A package can have one theme.

Change-Id: I230585495f396d40e82d1fe2aec2b25d14626415
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/test/unit_tests/test_samples/test_theme.json b/test/unit_tests/test_samples/test_theme.json
index 6938598..ee49513 100644 (file)
--- a/test/unit_tests/test_samples/test_theme.json
+++ b/test/unit_tests/test_samples/test_theme.json
@@ -9,30 +9,28 @@
                         "720x1280"
                 ]
         },
-        "themes": [
-                {
-                        "preview": [
-                                "GOGO_Preview.png"
-                        ],
-                        "watchface": {
-                                "id": "org.tizen.gogowatch",
-                                "url": "https://www.download.gogowatch/get"
+        "theme": {
+                "preview": [
+                        "GOGO_Preview.png"
+                ],
+                "watchface": {
+                        "id": "org.tizen.gogowatch",
+                        "url": "https://www.download.gogowatch/get"
+                },
+                "home": {
+                        "wallpaper": "home_wallpaper.png",
+                        "appicon": {
+                                "org.tizen.browser": "browser.png",
+                                "org.tizen.calculator": "calculator.png",
+                                "org.tizen.calendar": "calendar.png",
+                                "org.tizen.clock": "clock.png",
+                                "org.tizen.contact": "contact.png"
                         },
-                        "home": {
-                                "wallpaper": "home_wallpaper.png",
-                                "appicon": {
-                                        "org.tizen.browser": "browser.png",
-                                        "org.tizen.calculator": "calculator.png",
-                                        "org.tizen.calendar": "calendar.png",
-                                        "org.tizen.clock": "clock.png",
-                                        "org.tizen.contact": "contact.png"
-                                },
-                                "app_tray": "tray.png",
-                                "size": "30"
-                        },
-                        "keyboard": {
-                                "keypad_bg_color": "#050a28"
-                        }
+                        "app_tray": "tray.png",
+                        "size": "30"
+                },
+                "keyboard": {
+                        "keypad_bg_color": "#050a28"
                 }
-        ]
+        }
 }

diff --git a/test/unit_tests/test_theme_parser.cc b/test/unit_tests/test_theme_parser.cc
index 5185d30..f6ca49d 100644 (file)
--- a/test/unit_tests/test_theme_parser.cc
+++ b/test/unit_tests/test_theme_parser.cc
@@ -44,24 +44,24 @@ TEST_F(ThemeParserTest, Inflate) {
   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("themes/0/home/app_tray"), "tray.png");
-  EXPECT_EQ(info.GetString("themes/0/home/appicon/org.tizen.browser"),
+  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("themes/0/home/appicon/org.tizen.calculator"),
+  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.calculator"),
       "calculator.png");
-  EXPECT_EQ(info.GetString("themes/0/home/appicon/org.tizen.calendar"),
+  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.calendar"),
       "calendar.png");
-  EXPECT_EQ(info.GetString("themes/0/home/appicon/org.tizen.clock"),
+  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.clock"),
       "clock.png");
-  EXPECT_EQ(info.GetString("themes/0/home/appicon/org.tizen.contact"),
+  EXPECT_EQ(info.GetString("theme/home/appicon/org.tizen.contact"),
       "contact.png");
-  EXPECT_EQ(info.GetString("themes/0/home/size"), "30");
-  EXPECT_EQ(info.GetString("themes/0/home/wallpaper"), "home_wallpaper.png");
-  EXPECT_EQ(info.GetString("themes/0/keyboard/keypad_bg_color"), "#050a28");
-  EXPECT_EQ(info.GetString("themes/0/watchface/id"), "org.tizen.gogowatch");
-  EXPECT_EQ(info.GetString("themes/0/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("themes/0/preview"),
+  EXPECT_EQ(info.GetStringArray("theme/preview"),
       std::vector<std::string>({"GOGO_Preview.png"}));
 }