Merge "Fix unittests" into tizen

diff --git a/test/unit_tests/test_theme_loader.cc b/test/unit_tests/test_theme_loader.cc
index 015642e..3eb2907 100644 (file)
--- a/test/unit_tests/test_theme_loader.cc
+++ b/test/unit_tests/test_theme_loader.cc
@@ -59,12 +59,16 @@ class ThemeLoaderTest : public TestFixture {
   virtual ~ThemeLoaderTest() {}
 
   virtual void SetUp() {
+    int ret = theme_loader_create(&loader_handle_);
+    ASSERT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   }
 
   virtual void TearDown() {
+    int ret = theme_loader_destroy(loader_handle_);
+    ASSERT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   }
 
-  theme_loader_h loader_handle_;
+  theme_loader_h loader_handle_ = nullptr;
 };
 
 TEST_F(ThemeLoaderTest, Create) {
@@ -73,8 +77,6 @@ TEST_F(ThemeLoaderTest, Create) {
 
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
   EXPECT_NE(handle, nullptr);
-
-  loader_handle_ = handle;
 }
 
 TEST_F(ThemeLoaderTest, Create_N) {
@@ -274,7 +276,12 @@ TEST_F(ThemeLoaderTest, RemoveEvent_N) {
 }
 
 TEST_F(ThemeLoaderTest, Destroy) {
-  int ret = theme_loader_destroy(loader_handle_);
+  theme_loader_h handle;
+  int ret = theme_loader_create(&handle);
+  ASSERT_EQ(ret, THEME_MANAGER_ERROR_NONE);
+  ASSERT_NE(handle, nullptr);
+
+  ret = theme_loader_destroy(handle);
   EXPECT_EQ(ret, THEME_MANAGER_ERROR_NONE);
 }