Remove unnecessary prints in unittests

Change-Id: Iab2be919c3fd0339c6410314725c3f3091a4b632

diff --git a/tests/client-request-test.cpp b/tests/client-request-test.cpp
index 81990e371c85b187782c0575ea109d642241f03f..19f251d07f1f13c003b9737066c4ea6743d5a5a1 100644 (file)
--- a/tests/client-request-test.cpp
+++ b/tests/client-request-test.cpp
@@ -287,17 +287,11 @@ TEST_F(ClientRequestTest, request_to_not_supported_server_N)
             retVal = wauthn_process<TestClientRequestMC>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredCreationOptions, callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NOT_SUPPORTED)
-                << "[wauthn_process<TestClientRequestMC>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NOT_SUPPORTED);
             sleep(1);
-            EXPECT_EQ(userdata->called_qr, false)
-                << "The QR callback should not be called by cancel" << std::endl;
-            EXPECT_EQ(userdata->called_response, false)
-                << "The response callback should not be called by cancel" << std::endl;
-            EXPECT_EQ(0, userdata->times_update_linked_data)
-                << "The update_linked_data callback should not be called by cancel"
-                << std::endl;
+            EXPECT_EQ(userdata->called_qr, false);
+            EXPECT_EQ(userdata->called_response, false);
+            EXPECT_EQ(0, userdata->times_update_linked_data);
 
             free(userdata);
             free(callbacks);
@@ -337,20 +331,14 @@ TEST_F(ClientRequestTest, MC_with_LD_and_not_call_QR_callback_P)
             retVal = wauthn_process<TestClientRequestMC>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredCreationOptions, callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestMC>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);
-            EXPECT_EQ(userdata->called_qr, false)
-                << "The QR callback should not be called" << std::endl;
-            EXPECT_EQ(userdata->called_response, true)
-                << "The response callback should be called" << std::endl;
+            EXPECT_EQ(userdata->called_qr, false);
+            EXPECT_EQ(userdata->called_response, true);
             EXPECT_EQ(g_target_times_update_linked_data,
-                      userdata->times_update_linked_data)
-                << "The update_linked_data callback should be called for setted times"
-                << std::endl;
+                      userdata->times_update_linked_data);
             free(userdata);
             free(callbacks);
         }
@@ -388,20 +376,14 @@ TEST_F(ClientRequestTest, MC_without_LD_and_call_QR_callback_P)
             retVal = wauthn_process<TestClientRequestMC>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredCreationOptionsNoLD, callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestMC>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);
-            EXPECT_EQ(userdata->called_qr, true)
-                << "The QR callback should be called" << std::endl;
-            EXPECT_EQ(userdata->called_response, true)
-                << "The response callback should be called" << std::endl;
+            EXPECT_EQ(userdata->called_qr, true);
+            EXPECT_EQ(userdata->called_response, true);
             EXPECT_EQ(g_target_times_update_linked_data,
-                      userdata->times_update_linked_data)
-                << "The update_linked_data callback should be called for setted times"
-                << std::endl;
+                      userdata->times_update_linked_data);
 
             free(userdata);
             free(callbacks);
@@ -442,20 +424,14 @@ TEST_F(ClientRequestTest, GA_with_LD_and_not_call_QR_callback_P)
             retVal = wauthn_process<TestClientRequestGA>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredRequestOptions, callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestGA>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);
-            EXPECT_EQ(userdata->called_qr, false)
-                << "The QR callback should not be called" << std::endl;
-            EXPECT_EQ(userdata->called_response, true)
-                << "The response callback should be called" << std::endl;
+            EXPECT_EQ(userdata->called_qr, false);
+            EXPECT_EQ(userdata->called_response, true);
             EXPECT_EQ(g_target_times_update_linked_data,
-                      userdata->times_update_linked_data)
-                << "The update_linked_data callback should be called for setted times"
-                << std::endl;
+                      userdata->times_update_linked_data);
 
             free(userdata);
             free(callbacks);
@@ -495,20 +471,14 @@ TEST_F(ClientRequestTest, GA_without_LD_and_call_QR_callback_P)
             retVal = wauthn_process<TestClientRequestGA>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredRequestOptionsNoLD, callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestGA>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);
-            EXPECT_EQ(userdata->called_qr, true)
-                << "The QR callback should be called" << std::endl;
-            EXPECT_EQ(userdata->called_response, true)
-                << "The response callback should be called" << std::endl;
+            EXPECT_EQ(userdata->called_qr, true);
+            EXPECT_EQ(userdata->called_response, true);
             EXPECT_EQ(g_target_times_update_linked_data,
-                      userdata->times_update_linked_data)
-                << "The update_linked_data callback should be called for setted times"
-                << std::endl;
+                      userdata->times_update_linked_data);
 
             free(userdata);
             free(callbacks);
@@ -548,9 +518,7 @@ TEST_F(ClientRequestTest, not_allowed_N)
             retVal = wauthn_process<TestClientRequestMC>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredCreationOptionsNoLD, mc_callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestMC>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             sleep(1);
 
@@ -569,28 +537,18 @@ TEST_F(ClientRequestTest, not_allowed_N)
             retVal = wauthn_process<TestClientRequestGA>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredRequestOptions, ga_callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NOT_ALLOWED)
-                << "[wauthn_process<TestClientRequestGA>] failed. "
-                << "ret=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NOT_ALLOWED);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);
-            EXPECT_EQ(mc_userdata->called_qr, true)
-                << "The QR callback for MC should be called" << std::endl;
-            EXPECT_EQ(mc_userdata->called_response, true)
-                << "The response callback for MC should be called" << std::endl;
+            EXPECT_EQ(mc_userdata->called_qr, true);
+            EXPECT_EQ(mc_userdata->called_response, true);
             EXPECT_EQ(g_target_times_update_linked_data,
-                      mc_userdata->times_update_linked_data)
-                << "The update_linked_data callback for MC should be called for setted times"
-                << std::endl;
+                      mc_userdata->times_update_linked_data);
 
-            EXPECT_EQ(ga_userdata->called_qr, false)
-                << "The QR callback for GA should not be called by not allowed" << std::endl;
-            EXPECT_EQ(ga_userdata->called_response, false)
-                << "The response callback for GA should not be called by not allowed" << std::endl;
-            EXPECT_EQ(0, ga_userdata->times_update_linked_data)
-                << "The update_linked_data callback for GA should not be called by not allowed"
-                << std::endl;
+            EXPECT_EQ(ga_userdata->called_qr, false);
+            EXPECT_EQ(ga_userdata->called_response, false);
+            EXPECT_EQ(0, ga_userdata->times_update_linked_data);
 
             free(mc_userdata);
             free(ga_userdata);
@@ -632,9 +590,7 @@ TEST_F(ClientRequestTest, cancel_P)
             retVal = wauthn_process<TestClientRequestMC>(&TestCommonData::clientData,
                 &TestCommonData::pubkeyCredCreationOptions, mc_callbacks);
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_process<TestClientRequestMC>] failed. "
-                << "retVal=" << wauthn_error_to_string(retVal) << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
 
             TestClientRequest request(WebAuthnCall::CANCEL);
             request.Init();
@@ -643,17 +599,11 @@ TEST_F(ClientRequestTest, cancel_P)
                     << wauthn_error_to_string(request.GetStatus()));
             retVal = request.GetStatus();
 
-            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE)
-                << "[wauthn_cancel] failed. "
-                << "ret=" << wauthn_error_to_string(retVal) << std::endl;
-
-            EXPECT_EQ(mc_userdata->called_qr, false)
-                << "The QR callback should not be called by cancel" << std::endl;
-            EXPECT_EQ(mc_userdata->called_response, false)
-                << "The response callback should not be called by cancel" << std::endl;
-            EXPECT_EQ(0, mc_userdata->times_update_linked_data)
-                << "The update_linked_data callback should not be called by cancel"
-                << std::endl;
+            EXPECT_EQ(retVal, WAUTHN_ERROR_NONE);
+
+            EXPECT_EQ(mc_userdata->called_qr, false);
+            EXPECT_EQ(mc_userdata->called_response, false);
+            EXPECT_EQ(0, mc_userdata->times_update_linked_data);
 
             // Waiting for called the callbacks
             sleep(g_target_times_update_linked_data + 5);

diff --git a/tests/webauthn-client-test.cpp b/tests/webauthn-client-test.cpp
index 6ced51e1f1934d3f95a5fd3cf4891b8b6e8b1259..0e141bc2c83bd474ad0a9162029160aab66dd780 100644 (file)
--- a/tests/webauthn-client-test.cpp
+++ b/tests/webauthn-client-test.cpp
@@ -52,9 +52,7 @@ TEST_F(WebAuthnTest, invalid_client_data_N)
                                  &TestCommonData::pubkeyCredCreationOptions,
                                  mc_callbacks);
 
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_client_data_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     wauthn_ga_callbacks_s *ga_callbacks = nullptr;
@@ -66,9 +64,7 @@ TEST_F(WebAuthnTest, invalid_client_data_N)
                                &TestCommonData::pubkeyCredRequestOptions,
                                ga_callbacks);
 
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_client_data_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     free(mc_callbacks);
     free(ga_callbacks);
@@ -87,9 +83,7 @@ TEST_F(WebAuthnTest, invalid_options_N)
                                  nullptr,
                                  mc_callbacks);
 
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_options_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     wauthn_ga_callbacks_s *ga_callbacks = nullptr;
@@ -101,9 +95,7 @@ TEST_F(WebAuthnTest, invalid_options_N)
                                nullptr,
                                ga_callbacks);
 
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_options_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     free(mc_callbacks);
     free(ga_callbacks);
@@ -115,9 +107,7 @@ TEST_F(WebAuthnTest, invalid_callbacks_N)
     ret = wauthn_make_credential(&TestCommonData::clientData,
                                  &TestCommonData::pubkeyCredCreationOptions,
                                  nullptr);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     wauthn_mc_callbacks_s *mc_callbacks = nullptr;
@@ -128,9 +118,7 @@ TEST_F(WebAuthnTest, invalid_callbacks_N)
     ret = wauthn_make_credential(&TestCommonData::clientData,
                                  &TestCommonData::pubkeyCredCreationOptions,
                                  mc_callbacks);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     mc_callbacks->response_callback = test_cb_mc_response;
@@ -138,17 +126,13 @@ TEST_F(WebAuthnTest, invalid_callbacks_N)
     ret = wauthn_make_credential(&TestCommonData::clientData,
                                  &TestCommonData::pubkeyCredCreationOptions,
                                  mc_callbacks);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     ret = wauthn_get_assertion(&TestCommonData::clientData,
                                &TestCommonData::pubkeyCredRequestOptions,
                                nullptr);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     wauthn_ga_callbacks_s *ga_callbacks = nullptr;
@@ -159,9 +143,7 @@ TEST_F(WebAuthnTest, invalid_callbacks_N)
     ret = wauthn_get_assertion(&TestCommonData::clientData,
                                &TestCommonData::pubkeyCredRequestOptions,
                                ga_callbacks);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     ga_callbacks->response_callback = test_cb_ga_response;
@@ -169,9 +151,7 @@ TEST_F(WebAuthnTest, invalid_callbacks_N)
     ret = wauthn_get_assertion(&TestCommonData::clientData,
                                &TestCommonData::pubkeyCredRequestOptions,
                                ga_callbacks);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[invalid_callbacks_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
     free(mc_callbacks);
     free(ga_callbacks);
 }
@@ -187,9 +167,7 @@ TEST_F(WebAuthnTest, miss_qr_callback_without_linked_data_N)
     ret = wauthn_make_credential(&TestCommonData::clientData,
                                  &TestCommonData::pubkeyCredCreationOptionsNoLD,
                                  mc_callbacks);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[miss_qr_callback_without_linked_data_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
 
     ret = WAUTHN_ERROR_NONE;
     wauthn_ga_callbacks_s *ga_callbacks = nullptr;
@@ -200,9 +178,7 @@ TEST_F(WebAuthnTest, miss_qr_callback_without_linked_data_N)
     ret = wauthn_get_assertion(&TestCommonData::clientData,
                                &TestCommonData::pubkeyCredRequestOptionsNoLD,
                                nullptr);
-    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER)
-        << "[miss_qr_callback_without_linked_data_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_INVALID_PARAMETER);
     free(mc_callbacks);
     free(ga_callbacks);
 }
@@ -211,9 +187,7 @@ TEST_F(WebAuthnTest, cancel_not_allowed_N)
 {
     int ret = WAUTHN_ERROR_NONE;
     ret = wauthn_cancel();
-    EXPECT_EQ(ret, WAUTHN_ERROR_NOT_ALLOWED)
-        << "[cancel_not_allowed_N] failed. "
-        << "ret=" << wauthn_error_to_string(ret) << std::endl;
+    EXPECT_EQ(ret, WAUTHN_ERROR_NOT_ALLOWED);
 }
 
 } // namespace WA