From: mk5004.lee Date: Mon, 24 Feb 2020 12:09:29 +0000 (+0900) Subject: Re-enable unittest X-Git-Tag: submit/tizen/20200226.074332~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F225808%2F4;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git Re-enable unittest Change-Id: Id666e4eaae1e379a32c0a62abd869c13aaaf2612 Signed-off-by: mk5004.lee --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c18f42e..86bbc61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,13 +8,13 @@ ADD_SUBDIRECTORY(frame-broker) ADD_SUBDIRECTORY(frame-provider) ADD_SUBDIRECTORY(ambient-viewer) ADD_SUBDIRECTORY(tool) -#ADD_SUBDIRECTORY(unittest) +ADD_SUBDIRECTORY(unittest) -#ADD_DEPENDENCIES(widget-viewer_unittests widget_viewer_evas) +ADD_DEPENDENCIES(widget-viewer_unittests widget_viewer_evas) ADD_DEPENDENCIES(widget_viewer_sdk widget_viewer_evas) ADD_DEPENDENCIES(widget_viewer_sdk watch-holder) -#ENABLE_TESTING() +ENABLE_TESTING() SET(WIDGET_VIEWER_UNIT_TESTS widget-viewer_unittests) ADD_TEST(NAME ${WIDGET_VIEWER_UNIT_TESTS} COMMAND ${WIDGET_VIEWER_UNIT_TESTS} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/unittest) diff --git a/ambient-viewer/src/ambient-viewer.cc b/ambient-viewer/src/ambient-viewer.cc index 2c41e876..48a01f3b 100644 --- a/ambient-viewer/src/ambient-viewer.cc +++ b/ambient-viewer/src/ambient-viewer.cc @@ -31,18 +31,16 @@ AmbientViewer::AmbientViewer(std::shared_ptr win) AmbientViewer::~AmbientViewer() = default; void AmbientViewer::Monitor() { - //top_app_surface_listener_ = new IAmbientViewer; - //watch_surface_listener_ = new Event; - //top_app_surface_ = std::make_shared(win_, top_app_surface_listener_); + top_app_surface_ = std::make_shared(win_, this); //To do //WatchSurface got error, need to check - //watch_surface_ = std::make_shared(win_, watch_surface_listener_); + //watch_surface_ = std::make_shared(win_, this); } void AmbientViewer::Unmonitor() { top_app_surface_.reset(); - //watch_surface_.reset(); + watch_surface_.reset(); } void AmbientViewer::OnReceived(AmbientViewer::EventType ev, std::string sender, diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec index 9f20600f..fd08d8ce 100644 --- a/packaging/libwidget_viewer.spec +++ b/packaging/libwidget_viewer.spec @@ -142,15 +142,15 @@ While developing the widget applications, this viewer will load it and execute i ################################################# # widget-viewer_unittests ################################################# -# %package -n widget-viewer_unittests -# Summary: GTest for widget-viewer -# Group: Development/Libraries +%package -n widget-viewer_unittests +Summary: GTest for widget-viewer +Group: Development/Libraries -# %description -n widget-viewer_unittests -# GTest for widget-viewer +%description -n widget-viewer_unittests +GTest for widget-viewer -# %files -n widget-viewer_unittests -# %{_bindir}/widget-viewer_unittests +%files -n widget-viewer_unittests +%{_bindir}/widget-viewer_unittests ################################################# # widget-viewer-gcov diff --git a/unittest/src/test_ambient_viewer.cc b/unittest/src/test_ambient_viewer.cc index f2fc94a2..a4a88d5a 100644 --- a/unittest/src/test_ambient_viewer.cc +++ b/unittest/src/test_ambient_viewer.cc @@ -24,19 +24,30 @@ using namespace std; using namespace ambient_viewer; using namespace screen_connector; +class AmbientViewerStub : public AmbientViewer { + public: + AmbientViewerStub(std::shared_ptr win) + : AmbientViewer(win) { + } + void OnAdded(const ISurface& surface) override {} + void OnUpdated(const ISurface& surface) override {} + void OnRemoved(const ISurface& surface) override {} +}; class AmbientViewerTest : public ::testing::Test { public: - AmbientViewer* stub; + AmbientViewerStub* stub; + virtual void SetUp() { - Evas_Object* win = elm_win_add(NULL, "Widget Viewer", ELM_WIN_BASIC); - stub = new AmbientViewer(shared_ptr(new EvasObject(win, false))); + Evas_Object* win = elm_win_add(NULL, "Widget Viewer", ELM_WIN_BASIC); + stub = new AmbientViewerStub(shared_ptr(new EvasObject(win, false))); } virtual void TearDown() { delete stub; } }; + TEST_F(AmbientViewerTest, create) { EXPECT_NE(AmbientViewerTest::stub, nullptr); } @@ -44,16 +55,10 @@ TEST_F(AmbientViewerTest, create) { TEST_F(AmbientViewerTest, Monitor) { AmbientViewerTest::stub->Monitor(); AmbientViewerTest::stub->Unmonitor(); - - //EXPECT_EQ(); } TEST_F(AmbientViewerTest, Get) { AmbientViewerTest::stub->Monitor(); - AmbientViewerTest::stub->GetTopAppSurface(); - AmbientViewerTest::stub->Unmonitor(); - - //EXPECT_EQ(); -} \ No newline at end of file +} diff --git a/unittest/src/test_top_app_surface.cc b/unittest/src/test_top_app_surface.cc deleted file mode 100644 index 9605abf6..00000000 --- a/unittest/src/test_top_app_surface.cc +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include - -class TopAppSurfaceTest : public ::testing::Test { - public: - TopAppSurface* surface; - - virtual void SetUp() { - } - virtual void TearDown() { - } -}; - -TEST_F(TopAppSurfaceTest, create) { -} - diff --git a/unittest/src/test_watch_surface.cc b/unittest/src/test_watch_surface.cc deleted file mode 100644 index 03922af1..00000000 --- a/unittest/src/test_watch_surface.cc +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include -#include -#include - -#include - - -class WatchSurfaceTest : public ::testing::Test { - public: - WatchSurface* surface; - - virtual void SetUp() { - } - virtual void TearDown() { - } -}; - -TEST_F(WatchSurfaceTest, create) { -} -