From: SukhyungKang Date: Mon, 6 Jun 2022 03:00:04 +0000 (+0900) Subject: Fix spec and unittest for coverage X-Git-Tag: submit/tizen/20220607.073648~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57c51e5980d5100fcd88854cb3b5f5b867153f62;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git Fix spec and unittest for coverage Change-Id: I30c3e5b9b9200285e34bf5333c6379083c9fb7ad Signed-off-by: SukhyungKang --- diff --git a/mock/mock.cc b/mock/mock.cc index 7c19be69..331f5c67 100644 --- 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 3522571e..5acbbd9c 100644 --- 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 715dca00..563750a5 100644 --- 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 ababe60c..9bca20d4 100644 --- a/unittest/src/test_watch.cc +++ b/unittest/src/test_watch.cc @@ -22,6 +22,7 @@ #include #include +#include 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);