Implements WatchBase

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

diff --git a/unittest/src/test_watch.cc b/unittest/src/test_watch.cc
index 771514f..ababe60 100644 (file)
--- a/unittest/src/test_watch.cc
+++ b/unittest/src/test_watch.cc
@@ -69,43 +69,40 @@ class WatchMirrorStub : public WatchMirror {
     : WatchMirror(win) {
   }
 
-  void OnChanged(const ISharableWatch& watch) override {}
-  void OnAdded(const ISharableWatch& watch) override {}
-  void OnUpdated(const ISharableWatch& watch) override {}
-  void OnRemoved(const ISharableWatch& watch) override {}
+  void OnChanged(const ISharableWatchBase& watch) override {}
+  void OnAdded(const ISharableWatchBase& watch) override {}
+  void OnUpdated(const ISharableWatchBase& watch) override {}
+  void OnRemoved(const ISharableWatchBase& watch) override {}
 };
 
-class WatchStub : public Watch{
+class WatchStub : public Watch {
  public:
   WatchStub(string appid, Evas_Object* win, WatchMirrorStub* listener)
     : Watch(appid, win, listener, true) {
   }
-  WatchStub(int rid, std::string id, string appid, Evas_Object* win, WatchMirrorStub* listener)
+  WatchStub(int rid, std::string id, string appid, Evas_Object* win,
+      WatchMirrorStub* listener)
     : Watch(rid, id, appid, win, listener, true) {
   }
-  WatchStub(string appid, Evas_Object* win, tizen_base::Bundle extra,WatchMirrorStub* listener)
+  WatchStub(string appid, Evas_Object* win,
+      tizen_base::Bundle extra,
+      WatchMirrorStub* listener)
     : Watch(appid, win, extra, listener, true) {
   }
-  WatchStub(int rid, std::string id, string appid, Evas_Object* win, tizen_base::Bundle extra, WatchMirrorStub* listener)
+  WatchStub(int rid, std::string id, string appid, Evas_Object* win,
+      tizen_base::Bundle extra,
+      WatchMirrorStub* listener)
     : Watch(rid, id, appid, win, extra, listener, true) {
   }
 
   void InvokeEvasAdded() {
-    screen_connector::EvasObject eo(reinterpret_cast<Evas_Object*>(&__not_null),
-        false);
-    OnEvasAdded("TestAppId", "TestInstId", 99, eo);
   }
 
   void InvokeEvasRemoved() {
-    screen_connector::EvasObject eo(reinterpret_cast<Evas_Object*>(&__not_null),
-        false);
-    OnEvasRemoved("TestAppId", "TestInstId", 99, eo);
+    OnRemoved("TestAppId", "TestInstId", 99, nullptr);
   }
 
   void InvokeEvasChanged() {
-    screen_connector::EvasObject eo(reinterpret_cast<Evas_Object*>(&__not_null),
-        false);
-    OnEvasChanged("TestAppId", "TestInstId", 99, eo);
   }
 
   void InvokeSetFaulted(bool faulted) {
@@ -167,7 +164,8 @@ TEST_F(WatchTest, CreateInstance4) {
   WatchMirrorStub* mirrorstub = new WatchMirrorStub(mirwin);
   EXPECT_NE(mirrorstub, nullptr);
   Evas_Object* win = elm_win_add(NULL, "Watch", ELM_WIN_BASIC);
-  WatchStub* stub = new WatchStub(0, string("id"), string("test"), win, b,mirrorstub);
+  WatchStub* stub = new WatchStub(0, string("id"),
+      string("test"), win, b, mirrorstub);
   EXPECT_NE(stub, nullptr);
   delete stub;
   delete mirrorstub;
@@ -197,12 +195,6 @@ TEST_F(WatchTest, GetAppId) {
   EXPECT_EQ(appid, "test");
 }
 
-TEST_F(WatchTest, GetCurrentImage_N) {
-  Evas_Object* cur;
-  cur = WatchTest::stub->GetCurrentImage();
-  EXPECT_EQ(cur, nullptr);
-}
-
 TEST_F(WatchTest, GetExtra) {
   Bundle b;
   b = WatchTest::stub->GetExtra();