Fix spec and unittest for coverage

Change-Id: I30c3e5b9b9200285e34bf5333c6379083c9fb7ad
Signed-off-by: SukhyungKang <shine.kang@samsung.com>

diff --git a/mock/mock.cc b/mock/mock.cc
index 7c19be699e9773f3ec3d7e9f434956f3a05067cf..331f5c67b45f0be456f0a83fb03d1fdbaf19d215 100644 (file)
--- a/mock/mock.cc
+++ b/mock/mock.cc
@@ -98,3 +98,5 @@ DEFINE_FAKE_VALUE_FUNC(int, vconf_notify_key_changed, const char *,
     vconf_callback_fn, void *);
 DEFINE_FAKE_VALUE_FUNC(int, vconf_ignore_key_changed,
     const char *, vconf_callback_fn);
+DEFINE_FAKE_VALUE_FUNC(int, vconf_set_str,
+    const char *, const char *);

diff --git a/mock/vconf_mock.h b/mock/vconf_mock.h
index 3522571e945b6bb33bba63cf8dc0a53ed5a3e78c..5acbbd9c30ac14c650c191eaac68a4dcaef6899a 100644 (file)
--- a/mock/vconf_mock.h
+++ b/mock/vconf_mock.h
@@ -30,6 +30,8 @@ DECLARE_FAKE_VALUE_FUNC(int, vconf_notify_key_changed, const char *,
     vconf_callback_fn, void *);
 DECLARE_FAKE_VALUE_FUNC(int, vconf_ignore_key_changed,
     const char *, vconf_callback_fn);
+DECLARE_FAKE_VALUE_FUNC(int, vconf_set_str,
+    const char *, const char *);
 
 #ifdef __cplusplus
 }

diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec
index 715dca008f9789db0380209a3be403a8ed6d23d6..563750a5eb633aabd3b838555e94c1b7e52c7e4b 100644 (file)
--- a/packaging/libwidget_viewer.spec
+++ b/packaging/libwidget_viewer.spec
@@ -83,18 +83,13 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
        .
 make %{?jobs:-j%jobs}
 
-%if 0%{?gcov:1}
-mkdir -p gcov-obj
-find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
-%endif
-
 %check
 ctest -V
 %if 0%{?gcov:1}
 lcov -c --ignore-errors graph --no-external -q -d . -o widget-viewer.info
 genhtml widget-viewer.info -o widget-viewer.out
 zip -r widget-viewer.zip widget-viewer.out
-install -m 0644 widget-viewer.zip %{buildroot}%{_datadir}/gcov/
+install -m 0644 widget-viewer.zip %{buildroot}%{_datadir}/gcov/obj/
 %endif
 
 %install
@@ -102,10 +97,39 @@ rm -rf %{buildroot}
 %make_install
 
 %if 0%{?gcov:1}
-mkdir -p %{buildroot}%{_datadir}/gcov/obj/%{name}
-install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj/%{name}
+builddir=$(basename $PWD)
+gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir"
+mkdir -p "$gcno_obj_dir"
+find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';'
 %endif
 
+cat << EOF > run-unittest.sh
+#!/bin/sh
+setup() {
+    echo "setup start"
+}
+
+test_main() {
+    echo "test_main start"
+    /usr/bin/widget-viewer_unittests
+}
+
+teardown() {
+    echo "teardown start"
+}
+
+main() {
+    setup
+    test_main
+    teardown
+}
+
+main "\$*"
+EOF
+
+mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name}
+install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name}/
+
 %post -n %{name} -p /sbin/ldconfig
 %postun -n %{name} -p /sbin/ldconfig
 
@@ -157,6 +181,7 @@ GTest for widget-viewer
 
 %files -n widget-viewer_unittests
 %{_bindir}/widget-viewer_unittests
+%{_bindir}/tizen-unittests/%{name}/run-unittest.sh
 
 #################################################
 # widget-viewer-gcov
@@ -172,7 +197,7 @@ Simple string key-val dictionary ADT gcov objects
 
 %if 0%{?gcov:1}
 %files gcov
-%{_datadir}/gcov/*
+%{_datadir}/gcov/obj/*
 %endif
 
 ################################################

diff --git a/unittest/src/test_watch.cc b/unittest/src/test_watch.cc
index ababe60c36b24da2452bedb613dc582a980f552a..9bca20d40f783cf33bbe3451cf2baeac160a0358 100644 (file)
--- a/unittest/src/test_watch.cc
+++ b/unittest/src/test_watch.cc
@@ -22,6 +22,7 @@
 #include <watch_mirror.hh>
 
 #include <evas_mock.h>
+#include <vconf_mock.h>
 
 using namespace std;
 using namespace tizen_base;
@@ -63,6 +64,10 @@ const char* __elm_win_aux_msg_val_get_fake(Evas_Object* obj, Elm_Win_Aux_Message
   return "prebind";
 }
 
+int __vconf_set_str_fake(const char *in_key, const char *strval) {
+  return 0;
+}
+
 class WatchMirrorStub : public WatchMirror {
  public:
   WatchMirrorStub(Evas_Object* win)
@@ -219,8 +224,8 @@ TEST_F(WatchTest, BlockUpdate) {
   WatchTest::stub->BlockUpdate(true);
 }
 
-TEST_F(WatchTest, NotifyChangedEvent_N) {
-  EXPECT_EQ(-1, WatchTest::stub->NotifyChangedEvent());
+TEST_F(WatchTest, NotifyChangedEvent) {
+  EXPECT_EQ(0, WatchTest::stub->NotifyChangedEvent());
 }
 
 TEST_F(WatchTest, Bind) {
@@ -232,6 +237,7 @@ TEST_F(WatchTest, Bind) {
   evas_object_evas_get_fake.custom_fake = __evas_object_evas_get_fake;
   elm_win_aux_msg_key_get_fake.custom_fake = __elm_win_aux_msg_key_get_fake;
   elm_win_aux_msg_val_get_fake.custom_fake = __elm_win_aux_msg_val_get_fake;
+  vconf_set_str_fake.custom_fake = __vconf_set_str_fake;
 
   Evas_Object* bindwin = elm_win_add(NULL, "Bind Window", ELM_WIN_BASIC);
   EXPECT_NE(WatchTest::stub, nullptr);