Remove _WITH_MSG from unit tests

Azure · Oct 11, 2018 · 3529d26 · 3529d26
1 parent eccfda0
commit 3529d26
Show file tree

Hide file tree

Showing 73 changed files with 641 additions and 640 deletions.
diff --git a/c-utility b/c-utility
diff --git a/deps/uhttp b/deps/uhttp
diff --git a/iothub_client/tests/blob_ut/blob_ut.c b/iothub_client/tests/blob_ut/blob_ut.c
@@ -1172,7 +1172,7 @@ TEST_FUNCTION(Blob_UploadMultipleBlocksFromSasUri_64MB_unhappy_paths)
             BLOB_RESULT result = Blob_UploadMultipleBlocksFromSasUri("https://h.h/something?a=b", FileUpload_GetData_Callback, &context, &httpResponse, testValidBufferHandle, NULL, NULL);
 
             ///assert
-            ASSERT_ARE_NOT_EQUAL_WITH_MSG(BLOB_RESULT, BLOB_OK, result, temp_str);
+            ASSERT_ARE_NOT_EQUAL(BLOB_RESULT, BLOB_OK, result, temp_str);
         }
     }
 
@@ -1402,7 +1402,7 @@ TEST_FUNCTION(Blob_UploadMultipleBlocksFromSasUri_64MB_with_certificate_unhappy_
             BLOB_RESULT result = Blob_UploadMultipleBlocksFromSasUri("https://h.h/something?a=b", FileUpload_GetData_Callback, &context, &httpResponse, testValidBufferHandle, "a", NULL);
 
             ///assert
-            ASSERT_ARE_NOT_EQUAL_WITH_MSG(BLOB_RESULT, BLOB_OK, result, temp_str);
+            ASSERT_ARE_NOT_EQUAL(BLOB_RESULT, BLOB_OK, result, temp_str);
         }
     }
 

diff --git a/iothub_client/tests/common_device_method_e2e/iothubclient_common_device_method_e2e.c b/iothub_client/tests/common_device_method_e2e/iothubclient_common_device_method_e2e.c
diff --git a/iothub_client/tests/common_dt_e2e/iothubclient_common_dt_e2e.c b/iothub_client/tests/common_dt_e2e/iothubclient_common_dt_e2e.c
diff --git a/iothub_client/tests/common_e2e/iothubclient_common_e2e.c b/iothub_client/tests/common_e2e/iothubclient_common_e2e.c
diff --git a/iothub_client/tests/iothub_client_retry_control_ut/iothub_client_retry_control_ut.c b/iothub_client/tests/iothub_client_retry_control_ut/iothub_client_retry_control_ut.c
@@ -554,7 +554,7 @@ TEST_FUNCTION(Retrieve_Options_failure_checks)
         OPTIONHANDLER_HANDLE result = retry_control_retrieve_options(handle);
 
         sprintf(error_msg, "On failed call %zu", i);
-        ASSERT_IS_NULL_WITH_MSG(result, error_msg);
+        ASSERT_IS_NULL(result, error_msg);
     }
 
     // cleanup
@@ -703,7 +703,7 @@ TEST_FUNCTION(Set_Options_failure_checks)
 
         // assert
         sprintf(error_msg, "On failed call %zu", i);
-        ASSERT_ARE_NOT_EQUAL_WITH_MSG(int, 0, result, error_msg);
+        ASSERT_ARE_NOT_EQUAL(int, 0, result, error_msg);
     }
 
     // cleanup

diff --git a/iothub_client/tests/iothub_invalidcert_e2e/iothub_invalidcert_e2e.c b/iothub_client/tests/iothub_invalidcert_e2e/iothub_invalidcert_e2e.c
@@ -49,7 +49,7 @@ BEGIN_TEST_SUITE(iothub_invalidcert_e2e)
 static void send_confirm_callback(IOTHUB_CLIENT_CONFIRMATION_RESULT result, void* user_ctx)
 {
     CONNECTION_STATUS_INFO* conn_status = (CONNECTION_STATUS_INFO*)user_ctx;
-    ASSERT_IS_NOT_NULL_WITH_MSG(conn_status, "connection status callback context is NULL");
+    ASSERT_IS_NOT_NULL(conn_status, "connection status callback context is NULL");
 
     conn_status->status_set = true;
     conn_status->current_confirmation = result;
@@ -58,7 +58,7 @@ static void send_confirm_callback(IOTHUB_CLIENT_CONFIRMATION_RESULT result, void
 static void connection_status_callback(IOTHUB_CLIENT_CONNECTION_STATUS status, IOTHUB_CLIENT_CONNECTION_STATUS_REASON reason, void* user_ctx)
 {
     CONNECTION_STATUS_INFO* conn_status = (CONNECTION_STATUS_INFO*)user_ctx;
-    ASSERT_IS_NOT_NULL_WITH_MSG(conn_status, "connection status callback context is NULL");
+    ASSERT_IS_NOT_NULL(conn_status, "connection status callback context is NULL");
 
     conn_status->status_set = true;
     conn_status->current_status = status;
@@ -71,10 +71,10 @@ static IOTHUB_DEVICE_CLIENT_LL_HANDLE create_client(IOTHUB_CLIENT_TRANSPORT_PROV
 
     IOTHUB_DEVICE_CLIENT_LL_HANDLE iothub_handle;
     iothub_handle = IoTHubDeviceClient_LL_CreateFromConnectionString(connection_string, protocol);
-    ASSERT_IS_NOT_NULL_WITH_MSG(iothub_handle, "Could not create IoTHubDeviceClient_LL_CreateFromConnectionString");
+    ASSERT_IS_NOT_NULL(iothub_handle, "Could not create IoTHubDeviceClient_LL_CreateFromConnectionString");
 
     IOTHUB_CLIENT_RESULT result = IoTHubDeviceClient_LL_SetConnectionStatusCallback(iothub_handle, connection_status_callback, conn_status);
-    ASSERT_ARE_EQUAL_WITH_MSG(IOTHUB_CLIENT_RESULT, IOTHUB_CLIENT_OK, result, "Could not set connection Status Callback");
+    ASSERT_ARE_EQUAL(IOTHUB_CLIENT_RESULT, IOTHUB_CLIENT_OK, result, "Could not set connection Status Callback");
 
     return iothub_handle;
 }
@@ -91,8 +91,8 @@ static void wait_for_unauthorized_send(IOTHUB_DEVICE_CLIENT_LL_HANDLE dev_handle
         (nowTime = time(NULL)),
         (difftime(nowTime, beginOperation) < MAX_CONNECT_CALLBACK_WAIT_TIME) && (!conn_status->status_set) // time box
         );
-    ASSERT_IS_TRUE_WITH_MSG(conn_status->status_set, "Status callback did not get executed");
-    ASSERT_ARE_EQUAL_WITH_MSG(IOTHUB_CLIENT_CONFIRMATION_RESULT, IOTHUB_CLIENT_CONFIRMATION_ERROR, conn_status->current_confirmation, "Sending message was successful and should not have been");
+    ASSERT_IS_TRUE(conn_status->status_set, "Status callback did not get executed");
+    ASSERT_ARE_EQUAL(IOTHUB_CLIENT_CONFIRMATION_RESULT, IOTHUB_CLIENT_CONFIRMATION_ERROR, conn_status->current_confirmation, "Sending message was successful and should not have been");
 }
 
 static void wait_for_unauthorized_connection(IOTHUB_DEVICE_CLIENT_LL_HANDLE dev_handle, CONNECTION_STATUS_INFO* conn_status)
@@ -111,8 +111,8 @@ static void wait_for_unauthorized_connection(IOTHUB_DEVICE_CLIENT_LL_HANDLE dev_
         (nowTime = time(NULL)),
         (difftime(nowTime, beginOperation) < MAX_CONNECT_CALLBACK_WAIT_TIME) && (!conn_status->status_set) // time box
         );
-    ASSERT_IS_TRUE_WITH_MSG(conn_status->status_set, "Status callback did not get executed");
-    ASSERT_ARE_EQUAL_WITH_MSG(IOTHUB_CLIENT_CONNECTION_STATUS, IOTHUB_CLIENT_CONNECTION_UNAUTHENTICATED, conn_status->current_status, "Connection was successful and should not have been");
+    ASSERT_IS_TRUE(conn_status->status_set, "Status callback did not get executed");
+    ASSERT_ARE_EQUAL(IOTHUB_CLIENT_CONNECTION_STATUS, IOTHUB_CLIENT_CONNECTION_UNAUTHENTICATED, conn_status->current_status, "Connection was successful and should not have been");
 }
 
 static void run_invalidcert_test(IOTHUB_CLIENT_TRANSPORT_PROVIDER protocol)
@@ -147,7 +147,7 @@ TEST_SUITE_INITIALIZE(TestClassInitialize)
 {
     TEST_INITIALIZE_MEMORY_DEBUG(g_dllByDll);
     int result = IoTHub_Init();
-    ASSERT_ARE_EQUAL_WITH_MSG(int, 0, result, "Iothub init failed");
+    ASSERT_ARE_EQUAL(int, 0, result, "Iothub init failed");
 }
 
 TEST_SUITE_CLEANUP(TestClassCleanup)

diff --git a/iothub_client/tests/iothubclient_edge_ut/iothubclient_edge_ut.c b/iothub_client/tests/iothubclient_edge_ut/iothubclient_edge_ut.c
@@ -545,7 +545,7 @@ TEST_FUNCTION(IoTHubClient_EdgeHandle_Create_FAIL)
         IOTHUB_CLIENT_EDGE_HANDLE handle = IoTHubClient_EdgeHandle_Create(&config, TEST_AUTHORIZATION_HANDLE, TEST_MODULE_ID);
 
         //assert
-        ASSERT_IS_NULL_WITH_MSG(handle, tmp_msg);
+        ASSERT_IS_NULL(handle, tmp_msg);
     }
 
     umock_c_negative_tests_deinit();
@@ -798,7 +798,7 @@ TEST_FUNCTION(IoTHubClient_Edge_DeviceMethodInvoke_FAIL)
         IOTHUB_CLIENT_RESULT result = IoTHubClient_Edge_DeviceMethodInvoke(handle, TEST_DEVICE_ID2, TEST_METHOD_NAME, TEST_METHOD_PAYLOAD, TEST_TIMEOUT, &responseStatus, &responsePayload, &responsePayloadSize);
 
         //assert
-        ASSERT_IS_TRUE_WITH_MSG(result == IOTHUB_CLIENT_ERROR, tmp_msg);
+        ASSERT_IS_TRUE(result == IOTHUB_CLIENT_ERROR, tmp_msg);
     }
 
     //cleanup
@@ -1041,7 +1041,7 @@ TEST_FUNCTION(IoTHubClient_Edge_ModuleMethodInvoke_FAIL)
         IOTHUB_CLIENT_RESULT result = IoTHubClient_Edge_ModuleMethodInvoke(handle, TEST_DEVICE_ID2, TEST_MODULE_ID2, TEST_METHOD_NAME, TEST_METHOD_PAYLOAD, TEST_TIMEOUT, &responseStatus, &responsePayload, &responsePayloadSize);
 
         //assert
-        ASSERT_IS_TRUE_WITH_MSG(result == IOTHUB_CLIENT_ERROR, tmp_msg);
+        ASSERT_IS_TRUE(result == IOTHUB_CLIENT_ERROR, tmp_msg);
     }
 
     //cleanup