libds-mock: initialize member variables and add exception code @ constructor of MockW...

Change-Id: I7ac66ef93fce9a08b3e5bbacd48079c7b44e00f5
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/tests/libds-mock.h b/tests/libds-mock.h
index 6bd23ef..ac77287 100644 (file)
--- a/tests/libds-mock.h
+++ b/tests/libds-mock.h
@@ -40,13 +40,19 @@ class MockWaylandCompositor : public DSObject
 {
 public:
        MockWaylandCompositor()
-               : surfaceCreated(false)
+               : surfaceCreated(false),
+                 surfaceCommitted(false),
+                 __waylandSurface(nullptr)
        {
                __eventLoop = DSEventLoop::getInstance();
 
                __waylandCompositor = DSWaylandCompositor::getInstance();
-               __waylandCompositor->create();
-               __waylandCompositor->registerCallbackSurfaceCreated(this, std::bind(&MockWaylandCompositor::onSurfaceCreated, this, std::placeholders::_1));
+
+               if (__waylandCompositor)
+               {
+                       __waylandCompositor->create();
+                       __waylandCompositor->registerCallbackSurfaceCreated(this, std::bind(&MockWaylandCompositor::onSurfaceCreated, this, std::placeholders::_1));
+               }
        }
 
        ~MockWaylandCompositor()