From 8ea3e07d50262dff9892668a76d0e3b2f55d69f7 Mon Sep 17 00:00:00 2001 From: "mk5004.lee" Date: Wed, 14 Mar 2018 20:44:45 +0900 Subject: [PATCH] Update additional unittest Change-Id: I42404ebab7aa25a3baba7a2e933ff52b339d2fee Signed-off-by: mk5004.lee --- unittest/src/test_complication.cc | 37 +++++++++++++++++++++++--- unittest/src/test_design_element.cc | 10 ++++++- unittest/src/test_received_editable.cc | 10 ++++++- watchface-complication-provider/CMakeLists.txt | 2 +- 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/unittest/src/test_complication.cc b/unittest/src/test_complication.cc index 9010cf2..f106560 100755 --- a/unittest/src/test_complication.cc +++ b/unittest/src/test_complication.cc @@ -95,23 +95,40 @@ TEST_F(WC, GetData) EXPECT_NE(curData.GetRaw(), nullptr); EXPECT_NE(nthData.GetRaw(), nullptr); + + EXPECT_EQ(WC::complication->GetProviderId(curData), providerId.c_str()); + EXPECT_EQ(WC::complication->GetType(curData), 1); } -TEST_F(WC, GetCurDataIdx) +TEST_F(WC, DataIdx) { EXPECT_EQ(WC::complication->GetCurDataIdx(),0); + EXPECT_EQ(WC::complication->GetLastDataIdx(), 0); + EXPECT_EQ(WC::complication->UpdateLastDataIdx(), 0); } -TEST_F(WC, GetName) +TEST_F(WC, Name) { EXPECT_EQ(WC::complication->GetName(), "TestComplication"); } -TEST_F(WC, GetShapeType) +TEST_F(WC, ShapeType) { + WC::complication->SetShapeType(IEditable::EditableShapeType::Circle); EXPECT_EQ(WC::complication->GetShapeType(), IEditable::EditableShapeType::Circle); } +TEST_F(WC, State) +{ + WC::complication->SetState(IEditable::EditableState::Complete); + EXPECT_EQ(WC::complication->GetState(), IEditable::EditableState::Complete); +} + +TEST_F(WC, Key) +{ + EXPECT_STREQ(WC::complication->GetProviderIdKey(), "__PROVIDER_ID_KEY__"); + EXPECT_STREQ(WC::complication->GetProviderTypeKey(), "__PROVIDER_TYPE_KEY__"); +} class WFC : public ::testing::Test { public: complication_h complication; @@ -128,6 +145,11 @@ class WFC : public ::testing::Test { int on_complication_update_cb(int complication_id, const char* provider_id, complication_type type, const bundle* data, void* user_data) { + const char* cur_provider_id = NULL; + complication_type cur_type; + + EXPECT_EQ(complication_get_provider_id(data, &cur_provider_id), 0); + EXPECT_EQ(complication_get_type(data, &cur_type), 0); return 0; } @@ -143,9 +165,16 @@ TEST_F(WFC, Callback) EXPECT_EQ(complication_update_cb_del(WFC::complication, on_complication_update_cb), 0); } -TEST_F(WFC, Id) +TEST_F(WFC, GetData) { + const char *cur_provider_id = NULL; + complication_type cur_type; + EXPECT_EQ(complication_set_provider("org.tizen.sample"), 0); + EXPECT_EQ(complication_get_cur_provider_id(WFC::complication, &cur_provider_id), 0); + EXPECT_EQ(cur_provider_id, "org.tizen.sample"); + EXPECT_EQ(complication_get_cur_type(WFC::complication, &cur_type), 0); + EXPECT_EQ(cur_type, COMPLICATION_SHORT_TEXT); EXPECT_EQ(complication_get_id(WFC::complication), -1); } diff --git a/unittest/src/test_design_element.cc b/unittest/src/test_design_element.cc index ccf6d48..df1b3dc 100755 --- a/unittest/src/test_design_element.cc +++ b/unittest/src/test_design_element.cc @@ -91,10 +91,12 @@ TEST_F(DE, GetData) EXPECT_NE(nthData.GetRaw(), nullptr); } -TEST_F(DE, GetCurDataIdx) +TEST_F(DE, DataIdx) { EXPECT_EQ(DE::element->SetCurDataIdx(0), 0); EXPECT_EQ(DE::element->GetCurDataIdx(), 0); + EXPECT_EQ(DE::element->UpdateLastDataIdx(), 0); + EXPECT_EQ(DE::element->GetLastDataIdx(), 0); } TEST_F(DE, GetName) @@ -112,6 +114,12 @@ TEST_F(DE, GetId) EXPECT_EQ(DE::element->GetId(), 0); } +TEST_F(DE, State) +{ + DE::element->SetState(IEditable::EditableState::Complete); + EXPECT_EQ(DE::element->GetState(), IEditable::EditableState::Complete); +} + TEST_F(DE, OnEditableUpdated) { DE::element->OnEditableUpdated(1, IEditable::EditableState::OnGoing); diff --git a/unittest/src/test_received_editable.cc b/unittest/src/test_received_editable.cc index f5af13c..9e658ad 100755 --- a/unittest/src/test_received_editable.cc +++ b/unittest/src/test_received_editable.cc @@ -98,9 +98,11 @@ TEST_F(RE, GetData) EXPECT_NE(nthData.GetRaw(), nullptr); } -TEST_F(RE, GetCurDataIdx) +TEST_F(RE, DataIdx) { EXPECT_EQ(RE::received->GetCurDataIdx(), 0); + EXPECT_EQ(RE::received->UpdateLastDataIdx(), 0); + EXPECT_EQ(RE::received->GetLastDataIdx(), 0); } TEST_F(RE, GetName) @@ -118,6 +120,12 @@ TEST_F(RE, GetId) EXPECT_EQ(RE::received->GetId(), 0); } +TEST_F(RE, State) +{ + RE::received->SetState(IEditable::EditableState::Complete); + EXPECT_EQ(RE::received->GetState(), IEditable::EditableState::Complete); +} + TEST_F(RE, OnEditableUpdated) { RE::received->OnEditableUpdated(1, IEditable::EditableState::OnGoing); diff --git a/watchface-complication-provider/CMakeLists.txt b/watchface-complication-provider/CMakeLists.txt index 48fefbc..30e836e 100755 --- a/watchface-complication-provider/CMakeLists.txt +++ b/watchface-complication-provider/CMakeLists.txt @@ -19,7 +19,7 @@ pkg_check_modules(watchface-complication-provider REQUIRED FOREACH(flag ${watchface-complication-provider_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -std=c++11 -fprofile-arcs -ftest-coverage") +SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -Winline -std=c++11") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}") SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g") -- 2.7.4