Implements WatchBase

[platform/core/appfw/widget-viewer.git] / unittest / src / test_watch_holder.cc

diff --git a/unittest/src/test_watch_holder.cc b/unittest/src/test_watch_holder.cc
index 6d11977..085d260 100644 (file)
--- a/unittest/src/test_watch_holder.cc
+++ b/unittest/src/test_watch_holder.cc
@@ -41,24 +41,22 @@ class WatchHolderStub : public WatchHolder {
       Bundle extra) {
     OnAmbientEvent(ev, sender, extra);
   }
-  void OnAdded(const Watch& watch) override {}
-  void OnUpdated(const Watch& watch) override {}
-  void OnRemoved(const Watch& watch) override {}
-  void OnLaunched(const Watch& watch) override {}
-  void OnDead(const Watch& watch) override {}
-  void OnBound(const Watch& watch) override {}
-
-  std::shared_ptr<Watch> CreateWatch(int rid, std::string id,
-      std::string appid, Evas_Object* viewer_win,
-      Watch::IEvent* listener, bool mock) override {
-    return WatchHolder::CreateWatch(rid, id, appid, viewer_win, listener, true);
-  }
-  std::shared_ptr<Watch> CreateWatch(int rid, std::string id,
-      std::string appid, Evas_Object* viewer_win, tizen_base::Bundle extra,
-      Watch::IEvent* listener, bool mock) override {
-    return WatchHolder::CreateWatch(rid, id, appid, viewer_win, extra, listener, true);
+  void OnAdded(const WatchBase& watch) override {}
+  void OnUpdated(const WatchBase& watch) override {}
+  void OnRemoved(const WatchBase& watch) override {}
+  void OnLaunched(const WatchBase& watch) override {}
+  void OnDead(const WatchBase& watch) override {}
+  void OnBound(const WatchBase& watch) override {}
+
+  std::shared_ptr<WatchBase> CreateWatch(int rid, std::string id,
+      std::string appid, bool mock) override {
+    return WatchHolder::CreateWatch(rid, id, appid, true);
   }
 
+  std::shared_ptr<WatchBase> CreateWatch(int rid, std::string id,
+      std::string appid, tizen_base::Bundle extra, bool mock) override {
+    return WatchHolder::CreateWatch(rid, id, appid, extra, true);
+  }
 };
 
 static int (*__app_com_cb)(const char *endpoint, aul_app_com_result_e result, bundle *envelope, void *user_data);
@@ -120,17 +118,15 @@ TEST_F(WatchHolderTest, CreateInstance) {
 }
 
 TEST_F(WatchHolderTest, CreateWatch) {
-  Evas_Object* watchwin = elm_win_add(NULL, "Watch", ELM_WIN_BASIC);
-  std::shared_ptr<Watch> w =
-    WatchHolderTest::stub->CreateWatch(1, string("id"), string("appid"),
-    watchwin, WatchHolderTest::stub, true);
+  std::shared_ptr<WatchBase> w =
+    WatchHolderTest::stub->CreateWatch(1, string("id"), string("appid"), true);
   EXPECT_NE(w, nullptr);
 
   Bundle b;
   b.Add("__APP_AMBIENT_EVENT__", "1");
-  std::shared_ptr<Watch> w2 =
-    WatchHolderTest::stub->CreateWatch(1, string("id"), string("appid"),
-    watchwin, b, WatchHolderTest::stub, true);
+  std::shared_ptr<WatchBase> w2 =
+    WatchHolderTest::stub->CreateWatch(1, string("id"),
+        string("appid"), b, true);
   EXPECT_NE(w2, nullptr);
 }
 
@@ -144,7 +140,7 @@ TEST_F(WatchHolderTest, LaunchWatch) {
 }
 
 TEST_F(WatchHolderTest, GetStack) {
-  std::list<std::shared_ptr<Watch>> list;
+  std::list<std::shared_ptr<WatchBase>> list;
   list = WatchHolderTest::stub->GetStack();
   EXPECT_EQ(list.size(), 0);
 }
@@ -185,16 +181,6 @@ TEST_F(WatchHolderTest, OnReceiveSignal) {
   __app_com_cb("end", AUL_APP_COM_R_OK, b.GetHandle(), stub);
 }
 
-TEST_F(WatchHolderTest, EnableRendering) {
-  EXPECT_NE(WatchHolderTest::stub, nullptr);
-  WatchHolderTest::stub->EnableRendering();
-}
-
-TEST_F(WatchHolderTest, DisableRendering) {
-  EXPECT_NE(WatchHolderTest::stub, nullptr);
-  WatchHolderTest::stub->DisableRendering(0);
-}
-
 TEST_F(WatchHolderTest, OnAmbientChanged) {
   Bundle *b = nullptr;
   EXPECT_NE(WatchHolderTest::stub, nullptr);