Fix apply not exist allow list bug 43/206443/5
authorhyunho <hhstark.kang@samsung.com>
Mon, 20 May 2019 02:06:02 +0000 (11:06 +0900)
committerHyunho Kang <hhstark.kang@samsung.com>
Wed, 22 May 2019 02:48:39 +0000 (02:48 +0000)
Clear current provider ID, type so that send request cause provider not available callback

Change-Id: I4b18ffd9fa42931e53e0ca396a1b13447fc5bee0
Signed-off-by: hyunho <hhstark.kang@samsung.com>
unittest/src/test-watchface-complication.cc
watchface-complication/complication.cc

index 7b2ac34..32a2cf6 100644 (file)
@@ -540,7 +540,6 @@ TEST_F(CWC, watchface_complication_transfer_event)
   EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
 }
 
-
 TEST_F(CWC, watchface_complication_allowed_list)
 {
   g_dbus_connection_signal_subscribe_fake.custom_fake =
@@ -578,4 +577,32 @@ TEST_F(CWC, watchface_complication_allowed_list)
   EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
 }
 
+
+TEST_F(CWC, apply_not_exist_allowed_list)
+{
+  g_dbus_connection_signal_subscribe_fake.custom_fake =
+      __fake_signal_subscribe_on_data_updated;
+  int comp_id = 777;
+  int ret = watchface_complication_create(comp_id,
+    "org.tizen.gmock_comp_provider/test",
+    WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT,
+    WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT,
+    WATCHFACE_COMPLICATION_EVENT_TAP,
+    &complication_);
+  ret = watchface_complication_allowed_list_create(&allowed_list_);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
+  ret = watchface_complication_allowed_list_add(allowed_list_,
+      "org.tizen.gmock_comp_provider/notexsist",
+      WATCHFACE_COMPLICATION_TYPE_SHORT_TEXT);
+  ret = watchface_complication_allowed_list_add(allowed_list_,
+      "org.tizen.gmock_comp_provider2/notexsist",
+      WATCHFACE_COMPLICATION_TYPE_LONG_TEXT);
+  ret = watchface_complication_allowed_list_apply(complication_,
+      allowed_list_);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_NONE, ret);
+
+  ret = watchface_complication_send_update_request(complication_);
+  EXPECT_EQ(WATCHFACE_COMPLICATION_ERROR_PROVIDER_NOT_AVAILABLE, ret);
+}
+
 }
\ No newline at end of file
index 4714158..c2b7547 100644 (file)
@@ -963,6 +963,8 @@ int Complication::ApplyAllowedList(
   */
   if (ret == WATCHFACE_COMPLICATION_ERROR_NOT_EXIST) {
     impl_->cur_data_idx_ = -1;
+    impl_->cur_provider_appid_ = "";
+    impl_->cur_provider_id_ = "";
     return WATCHFACE_COMPLICATION_ERROR_NONE;
   }
   return ret;