gtest: Bring-in changes

Signed-off-by: Saya Sugiura <ssugiura@jp.adit-jv.com>

1 files changed, 15 insertions, 12 deletions

diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp
index 918af11..cc7851a 100644
--- a/tests/gtest_dlt_user.cpp
+++ b/tests/gtest_dlt_user.cpp
@@ -163,8 +163,6 @@ TEST(t_dlt_user_log_write_start, normal)
     /* the defined enum values for log level */
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEFAULT));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_FATAL));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_ERROR));
@@ -173,10 +171,13 @@ TEST(t_dlt_user_log_write_start, normal)
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_INFO));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    /* To test the default behaviour and the default log level set to DLT_LOG_INFO */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_OFF));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_DEBUG));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start(&context, &contextData, DLT_LOG_VERBOSE));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
 
     EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
     EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());
@@ -259,8 +260,6 @@ TEST(t_dlt_user_log_write_start_id, normal)
     messageid = 0;
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
@@ -269,16 +268,17 @@ TEST(t_dlt_user_log_write_start_id, normal)
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    /* To test the default behaviour and the default log level set to DLT_LOG_INFO */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
 
     messageid = UINT32_MAX;
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEFAULT, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_FATAL, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_ERROR, messageid));
@@ -287,10 +287,13 @@ TEST(t_dlt_user_log_write_start_id, normal)
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_INFO, messageid));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    /* To test the default behaviour and the default log level set to DLT_LOG_INFO */
+    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_OFF, messageid));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_DEBUG, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
     EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_start_id(&context, &contextData, DLT_LOG_VERBOSE, messageid));
-    EXPECT_LE(DLT_RETURN_OK, dlt_user_log_write_finish(&contextData));
+    EXPECT_LE(DLT_RETURN_WRONG_PARAMETER, dlt_user_log_write_finish(&contextData));
 
     EXPECT_LE(DLT_RETURN_OK, dlt_unregister_context(&context));
     EXPECT_LE(DLT_RETURN_OK, dlt_unregister_app());