mmifw-main-test : mmi_event_add_listener should be called before it's event called...

Change-Id: I8b9fc1646b526a41b326e1d57e97fdbe123d91dc

diff --git a/tests/mmifw-main-test.cpp b/tests/mmifw-main-test.cpp
index a4fa74a..69f62f4 100644 (file)
--- a/tests/mmifw-main-test.cpp
+++ b/tests/mmifw-main-test.cpp
@@ -144,14 +144,14 @@ TEST_F(MMIFWMainTest, MMIFWMainEventAddSingleListener)
 
        EXPECT_NE(h, nullptr);
 
-       wait_for_connect();
-
-       EXPECT_TRUE(mmi_ipc_is_connected());
-
        if(h){
                handler = mmi_event_add_listener(h, MMI_EVENT_CONNECTION, _cb_connection, h);
        }
 
+       wait_for_connect();
+
+       EXPECT_TRUE(mmi_ipc_is_connected());
+
        EXPECT_NE(handler, nullptr);
 
        if(handler)
@@ -175,14 +175,14 @@ TEST_F(MMIFWMainTest, MMIFWMainEventAddSingleListenerFail)
 
        EXPECT_NE(h, nullptr);
 
+       if(h){
+               handler = mmi_event_add_listener(h, MMI_EVENT_CONNECTION, NULL, NULL);
+       }
+
        wait_for_connect();
 
        EXPECT_TRUE(mmi_ipc_is_connected());
 
-       if(h){
-               handler = mmi_event_add_listener(h, MMI_EVENT_CONNECTION, NULL, NULL);
-       }    
-       
        EXPECT_EQ(handler, nullptr);
 
        if(handler)
@@ -206,14 +206,14 @@ TEST_F(MMIFWMainTest, MMIFWMainEventAddSingleListenerSecondFail)
 
        EXPECT_NE(h, nullptr);
 
-       wait_for_connect();
-
-       EXPECT_TRUE(mmi_ipc_is_connected());
-
        if(h){
                handler = mmi_event_add_listener(h, 100, _cb_connection, NULL);
        }
 
+       wait_for_connect();
+
+       EXPECT_TRUE(mmi_ipc_is_connected());
+
        EXPECT_EQ(handler, nullptr);
 
        if(handler)