Free session and peer before assert

Change-Id: I7053c0a0cbed4db02a86f521c8fa7f5799f7d41d

diff --git a/tests/unittest/wifi-aware-session-unittest.cpp b/tests/unittest/wifi-aware-session-unittest.cpp
index fc30ad5..fdda34e 100644 (file)
--- a/tests/unittest/wifi-aware-session-unittest.cpp
+++ b/tests/unittest/wifi-aware-session-unittest.cpp
@@ -76,9 +76,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_create_p1)
        int ret = 0;
 
        ret = wifi_aware_session_create(WIFI_AWARE_SESSION_PUBLISH, &g_session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_create");
+       wifi_aware_session_destroy(g_session);
 
-       ret = wifi_aware_session_destroy(g_session);
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_create");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_create_p2)
@@ -86,9 +86,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_create_p2)
        int ret = 0;
 
        ret = wifi_aware_session_create(WIFI_AWARE_SESSION_SUBSCRIBE, &g_session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_create");
+       wifi_aware_session_destroy(g_session);
 
-       ret = wifi_aware_session_destroy(g_session);
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_create");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_create_n1)
@@ -136,9 +136,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_terminated_cb_p)
        wifi_aware_mock_emit_gdbus_signal(SESSION_TERMINATED);
        RUN_GMAIN_LOOP;
 
-       ASSERT_TRUE(g_session_terminated) << "SessionTerminated signal";
-
        __destroy_dummy_session(session);
+
+       ASSERT_TRUE(g_session_terminated) << "SessionTerminated signal";
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_set_terminated_cb_n)
@@ -176,13 +176,18 @@ TEST_F(WifiAwareSession, wifi_aware_session_publish_p)
 
        ret = wifi_aware_session_publish(session,
                        config, WifiAwareSession::__published_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               __destroy_dummy_session(session);
+               __destroy_dummy_publish_config(config);
+       }
        CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_publish");
 
        RUN_GMAIN_LOOP;
-       CHECK_RESULT(g_published, true, "wifi_aware_session_publish");
 
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(g_published, true, "wifi_aware_session_publish");
 }
 
 /**
@@ -195,9 +200,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_publish_n1)
        wifi_aware_publish_h config = __create_dummy_publish_config();
 
        ret = wifi_aware_session_publish(NULL, config, WifiAwareSession::__published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_publish");
-
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_publish");
 }
 
 /**
@@ -210,9 +215,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_publish_n2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_publish(session, NULL, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_publish");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_publish");
 }
 
 /**
@@ -227,10 +232,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_publish_n3)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
        ret = wifi_aware_session_publish(session, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_publish");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_publish");
 }
 
 /**
@@ -243,14 +248,13 @@ TEST_F(WifiAwareSession, wifi_aware_session_publish_n4)
        wifi_aware_publish_h config = __create_dummy_publish_config();
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
-       ret = wifi_aware_session_publish(session, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_publish");
+       wifi_aware_session_publish(session, config, __published_cb, NULL);
 
        ret = wifi_aware_session_publish(session, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NOW_IN_PROGRESS, ret, "wifi_aware_session_publish");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NOW_IN_PROGRESS, ret, "wifi_aware_session_publish");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_update_publish_p)
@@ -265,13 +269,19 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_publish_p)
 
        g_published = false;
        ret = wifi_aware_session_update_publish(session, config, __published_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               __destroy_dummy_session(session);
+               __destroy_dummy_publish_config(config);
+       }
+
        CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_update_publish");
 
        RUN_GMAIN_LOOP;
-       CHECK_RESULT(g_published, true, "wifi_aware_session_update_publish");
 
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(g_published, true, "wifi_aware_session_update_publish");
 }
 
 /**
@@ -284,10 +294,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_publish_n1)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_update_publish(session, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_publish");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_publish");
 }
 
 /**
@@ -299,9 +309,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_publish_n2)
        wifi_aware_publish_h config = __create_dummy_publish_config();
 
        ret = wifi_aware_session_update_publish(NULL, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_publish");
-
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_publish");
 }
 
 /**
@@ -313,9 +323,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_publish_n3)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_update_publish(session, NULL, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_publish");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_publish");
 }
 
 /**
@@ -329,10 +339,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_publish_n4)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_update_publish(session, config, __published_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_publish");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_publish");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_subscribe_p)
@@ -342,13 +352,19 @@ TEST_F(WifiAwareSession, wifi_aware_session_subscribe_p)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
        ret = wifi_aware_session_subscribe(session, config, WifiAwareSession::__subscribed_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               __destroy_dummy_session(session);
+               __destroy_dummy_subscribe_config(config);
+       }
+
        CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_subscribe");
 
        RUN_GMAIN_LOOP;
-       CHECK_RESULT(g_subscribed, true, "wifi_aware_session_subscribe");
 
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(g_subscribed, true, "wifi_aware_session_subscribe");
 }
 
 /**
@@ -360,9 +376,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_subscribe_n1)
        wifi_aware_subscribe_h config = __create_dummy_subscribe_config();
 
        ret = wifi_aware_session_subscribe(NULL, config, WifiAwareSession::__subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_subscribe");
-
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_subscribe");
 }
 
 /**
@@ -374,9 +390,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_subscribe_n2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
        ret = wifi_aware_session_subscribe(session, NULL, WifiAwareSession::__subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_subscribe");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_subscribe");
 }
 
 /**
@@ -390,10 +406,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_subscribe_n3)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_subscribe(session, config, WifiAwareSession::__subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_subscribe");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_subscribe");
 }
 
 /**
@@ -406,14 +422,13 @@ TEST_F(WifiAwareSession, wifi_aware_session_subscribe_n4)
        wifi_aware_subscribe_h config = __create_dummy_subscribe_config();
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
-       ret = wifi_aware_session_subscribe(session, config, WifiAwareSession::__subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_subscribe");
+       wifi_aware_session_subscribe(session, config, WifiAwareSession::__subscribed_cb, NULL);
 
        ret = wifi_aware_session_subscribe(session, config, WifiAwareSession::__subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NOW_IN_PROGRESS, ret, "wifi_aware_session_subscribe");
-
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NOW_IN_PROGRESS, ret, "wifi_aware_session_subscribe");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_p)
@@ -427,13 +442,19 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_p)
 
        g_subscribed = false;
        ret = wifi_aware_session_update_subscribe(session, config, __subscribed_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               __destroy_dummy_session(session);
+               __destroy_dummy_subscribe_config(config);
+       }
+
        CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_update_subscribe");
 
        RUN_GMAIN_LOOP;
-       CHECK_RESULT(g_subscribed, true, "wifi_aware_session_update_subscribe");
 
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(g_subscribed, true, "wifi_aware_session_update_subscribe");
 }
 
 /**
@@ -446,10 +467,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_n1)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
        ret = wifi_aware_session_update_subscribe(session, config, __subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_subscribe");
-
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_subscribe");
 }
 
 /**
@@ -461,9 +482,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_n2)
        wifi_aware_subscribe_h config = __create_dummy_subscribe_config();
 
        ret = wifi_aware_session_update_subscribe(NULL, config, __subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_subscribe");
-
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_subscribe");
 }
 
 /**
@@ -475,9 +496,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_n3)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 0);
 
        ret = wifi_aware_session_update_subscribe(session, NULL, __subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_subscribe");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_update_subscribe");
 }
 
 /**
@@ -491,10 +512,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_update_subscribe_n4)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_update_subscribe(session, config, __subscribed_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_subscribe");
-
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_update_subscribe");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_stop_p1)
@@ -547,6 +568,7 @@ TEST_F(WifiAwareSession, wifi_aware_session_stop_n2)
 
        ret = wifi_aware_session_stop(session);
        __destroy_dummy_session(session);
+
        CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_stop");
 }
 
@@ -567,9 +589,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_service_discovered_cb_p)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 1);
 
        ret = wifi_aware_session_set_service_discovered_cb(session, __discovered_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_set_service_discovered_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_set_service_discovered_cb");
 }
 
 // wifi_aware_service_discovered_cb is called
@@ -582,9 +604,8 @@ TEST_F(WifiAwareSession, wifi_aware_service_discovered_cb_p)
        wifi_aware_mock_emit_gdbus_signal(SERVICE_DISCOVERED);
        RUN_GMAIN_LOOP;
 
-       ASSERT_TRUE(g_discovered) << "ServiceDiscovered signal";
-
        __destroy_dummy_session(session);
+       ASSERT_TRUE(g_discovered) << "ServiceDiscovered signal";
 }
 
 // wifi_aware_service_discovered_cb is not called
@@ -595,9 +616,9 @@ TEST_F(WifiAwareSession, wifi_aware_service_discovered_cb_n)
        wifi_aware_session_set_service_discovered_cb(session, __discovered_cb, NULL);
        RUN_GMAIN_LOOP;
 
-       CHECK_RESULT(g_discovered, false, "service_discovered_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(g_discovered, false, "service_discovered_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_set_service_discovered_cb_n1)
@@ -614,9 +635,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_service_discovered_cb_n2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_set_service_discovered_cb(session, __discovered_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_set_service_discovered_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_set_service_discovered_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_set_service_discovered_cb_n3)
@@ -625,9 +646,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_service_discovered_cb_n3)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 1);
 
        ret = wifi_aware_session_set_service_discovered_cb(session, NULL, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_set_service_discovered_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_set_service_discovered_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_unset_service_discovered_cb_p)
@@ -638,9 +659,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_unset_service_discovered_cb_p)
        wifi_aware_session_set_service_discovered_cb(session, __discovered_cb, NULL);
 
        ret = wifi_aware_session_unset_service_discovered_cb(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_service_discovered_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_service_discovered_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_unset_service_discovered_cb_n)
@@ -664,15 +685,15 @@ TEST_F(WifiAwareSession, wifi_aware_session_send_message_p)
        if (ret != WIFI_AWARE_ERROR_NONE) {
                __destroy_dummy_peer(peer);
                __destroy_dummy_session(session);
+
                CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_send_message");
        }
 
        RUN_GMAIN_LOOP;
 
-       ASSERT_TRUE(g_message_sent) << "Followup message";
-
        __destroy_dummy_peer(peer);
        __destroy_dummy_session(session);
+       ASSERT_TRUE(g_message_sent) << "Followup message";
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_send_message_n1)
@@ -683,9 +704,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_send_message_n1)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_send_message(session, NULL, message, strlen(MESSAGE), __send_reply, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_send_message");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_send_message");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_send_message_n2)
@@ -704,9 +725,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_message_received_cb_p)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_set_message_received_cb(session, WifiAwareSession::__received_cb, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_set_message_received_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_set_message_received_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_set_message_received_cb_n1)
@@ -723,9 +744,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_set_message_received_cb_n2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_set_message_received_cb(session, NULL, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_set_message_received_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_PARAMETER, ret, "wifi_aware_session_set_message_received_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_unset_message_received_cb_p)
@@ -736,9 +757,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_unset_message_received_cb_p)
        wifi_aware_session_set_message_received_cb(session, WifiAwareSession::__received_cb, NULL);
 
        ret = wifi_aware_session_unset_message_received_cb(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_message_received_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_message_received_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_unset_message_received_cb_n)
@@ -759,9 +780,9 @@ TEST_F(WifiAwareSession, wifi_aware_message_received_cb_p)
        wifi_aware_mock_emit_gdbus_signal(MESSAGE_RECEIVED);
        RUN_GMAIN_LOOP;
 
-       ASSERT_TRUE(g_message_received) << "MessageReceived signal";
-
        __destroy_dummy_session(session);
+
+       ASSERT_TRUE(g_message_received) << "MessageReceived signal";
 }
 
 TEST_F(WifiAwareSession, wifi_aware_message_received_cb_n)
@@ -775,8 +796,8 @@ TEST_F(WifiAwareSession, wifi_aware_message_received_cb_n)
 
        RUN_GMAIN_LOOP;
 
-       CHECK_RESULT(false, g_message_received, "message_received_cb");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(false, g_message_received, "message_received_cb");
 }