Fix calling source code of strncmp function in unit test

Change-Id: Ic351e505e47281aee15caf051b99199afc3a5425
Signed-off-by: JinWang An <jinwang.an@samsung.com>

diff --git a/tests/tct-base-utils-core.cpp b/tests/tct-base-utils-core.cpp
index dadac47..12ee8da 100644 (file)
--- a/tests/tct-base-utils-core.cpp
+++ b/tests/tct-base-utils-core.cpp
@@ -56,55 +56,39 @@ extern "C" {
 #include <gtest/gtest.h>
 
 TEST(base_utils, base_utils){
-       char *pszGetTCName = NULL;
-    pszGetTCName = (char*)malloc( 256 );
-    memset( pszGetTCName, 0x00, 256);
-    strcpy( pszGetTCName, "utc_capi_base");
        int i=0, result=0;
-
-       dlog_print(DLOG_INFO, "NativeTCT", "[%s:%d] Executing TC Name = %s", __FUNCTION__, __LINE__, pszGetTCName);
-
     int successCnt = 0;
     int errorCnt = 0;
        for ( i = 0; tc_array[i].name; i++ )
        {
-               if ( 0 == strncmp(pszGetTCName, tc_array[i].name, strlen(pszGetTCName)) )
+               if ( tc_array[i].startup )
                {
-                       if ( tc_array[i].startup )
-                       {
-                               tc_array[i].startup();
-                       }
+                       tc_array[i].startup();
+               }
 
-                       result = tc_array[i].function();
+               result = tc_array[i].function();
 
-            if( result == 0 ){
-                successCnt++;
-            }
-            else {
-                           dlog_print(DLOG_INFO, "NativeTCT", "[Error][%d] %s returns value = %d", i, tc_array[i].name, result);
-                errorCnt++;
-            }
+               if( result == 0 ){
+                       successCnt++;
+               }
+               else {
+                       dlog_print(DLOG_INFO, "NativeTCT", "[Error][%d] %s returns value = %d", i, tc_array[i].name, result);
+                       errorCnt++;
+               }
 
-            EXPECT_EQ(result, 0);
-            // ASSERT_EQ(result, 0);
+               EXPECT_EQ(result, 0);
+               // ASSERT_EQ(result, 0);
 
-                       if ( tc_array[i].cleanup )
-                       {
-                               tc_array[i].cleanup();
-                       }
+               if ( tc_array[i].cleanup )
+               {
+                       tc_array[i].cleanup();
                }
-        else {
-                       dlog_print(DLOG_INFO, "NativeTCT", "Name check error! [%s][%s]", pszGetTCName, tc_array[i].name);
-            ASSERT_EQ(0, 1);
-        }
        }
 
        dlog_print(DLOG_INFO, "NativeTCT", "==========================");
        dlog_print(DLOG_INFO, "NativeTCT", "Success [%4d / %4d]", successCnt, successCnt + errorCnt);
        dlog_print(DLOG_INFO, "NativeTCT", "Error   [%4d / %4d]", errorCnt, successCnt + errorCnt);
        dlog_print(DLOG_INFO, "NativeTCT", "==========================");
-
-       FREE_MEMORY_TC(pszGetTCName);
 }
 
 int main(int argc, char** argv) {

diff --git a/tests/utc-capi-base-utils-formattable.c b/tests/utc-capi-base-utils-formattable.c
index 015180c..e926fa7 100644 (file)
--- a/tests/utc-capi-base-utils-formattable.c
+++ b/tests/utc-capi-base-utils-formattable.c
@@ -84,7 +84,7 @@ int utc_capi_base_utils_i18n_formattable_set_string_p(void)
     i18n_formattable_get_type(formattable, &type);
 
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(set_string, string_to_set, strlen(string_to_set)), 0);
+    assert_eq(strncmp(set_string, string_to_set, strlen(set_string) + 1), 0);
     assert_eq(type, I18N_FORMATTABLE_TYPE_STRING);
 
     return 0;
@@ -1607,7 +1607,7 @@ int utc_capi_base_utils_i18n_formattable_create_with_char_string_p(void)
     i18n_formattable_type_e type;
     i18n_formattable_get_type(formattable, &type);
 
-    assert_eq(strncmp(set_string, string_to_set, strlen(string_to_set)), 0);
+    assert_eq(strncmp(set_string, string_to_set, strlen(set_string) + 1), 0);
     assert_eq(type, I18N_FORMATTABLE_TYPE_STRING);
 
     return 0;

diff --git a/tests/utc-capi-base-utils-measure-format.c b/tests/utc-capi-base-utils-measure-format.c
index fb1dc0a..873762e 100644 (file)
--- a/tests/utc-capi-base-utils-measure-format.c
+++ b/tests/utc-capi-base-utils-measure-format.c
@@ -1017,7 +1017,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_p(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(output_buffer, output_string, strlen(output_string)), 0);
+    assert_eq(strncmp(output_buffer, output_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strnlen(output_string, BUFSIZE));
 
     return 0;
@@ -1047,7 +1047,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_p2(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(output_buffer, output_string, strlen(output_string)), 0);
+    assert_eq(strncmp(output_buffer, output_string, strlen(output_string) + 1), 0);
     assert_eq(output_length, strnlen(output_string, BUFSIZE));
 
     return 0;
@@ -1077,7 +1077,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, -1);
 
     return 0;
@@ -1106,7 +1106,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n2(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, -1);
 
     return 0;
@@ -1136,7 +1136,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n3(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, -1);
 
     return 0;
@@ -1162,7 +1162,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n4(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, -1);
 
     return 0;
@@ -1192,7 +1192,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n5(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_BUFFER_OVERFLOW);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strlen("6,378 kilometers, 137 meters"));
 
     return 0;
@@ -1244,7 +1244,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n7(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
 
     return 0;
 }
@@ -1274,7 +1274,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measures_n8(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, -1);
 
     return 0;
@@ -1477,7 +1477,7 @@ int utc_capi_base_utils_i18n_measure_format_format_measure_per_unit_n5(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, append_to, BUFSIZE);
     assert_eq(ret, I18N_ERROR_BUFFER_OVERFLOW);
-    assert_eq(strncmp(output_buffer, sample_string, strlen(sample_string)), 0);
+    assert_eq(strncmp(output_buffer, sample_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strlen("300,000 kilometers per second"));
 
     return 0;

diff --git a/tests/utc-capi-base-utils-measure.c b/tests/utc-capi-base-utils-measure.c
index 6725ca1..fcb47a0 100644 (file)
--- a/tests/utc-capi-base-utils-measure.c
+++ b/tests/utc-capi-base-utils-measure.c
@@ -287,7 +287,7 @@ int utc_capi_base_utils_i18n_measure_clone_p(void)
 
     ret = i18n_measure_unit_get_type(measure_unit, &ref_type);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(type, ref_type, strlen(ref_type)), 0);
+    assert_eq(strncmp(type, ref_type, strlen(type) + 1), 0);
 
     bool equal = false;
     ret = i18n_formattable_equal(formattable_clone, formattable, &equal);

diff --git a/tests/utc-capi-base-utils-plural-rules.c b/tests/utc-capi-base-utils-plural-rules.c
index c9ac794..e9bcf4a 100644 (file)
--- a/tests/utc-capi-base-utils-plural-rules.c
+++ b/tests/utc-capi-base-utils-plural-rules.c
@@ -350,7 +350,7 @@ int utc_capi_base_utils_i18n_plural_rules_select_int32_p(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, buffer, BUFSIZE);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(output_buffer, output_string, strlen(output_string)), 0);
+    assert_eq(strncmp(output_buffer, output_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strlen(output_string));
 
     return 0;
@@ -419,7 +419,7 @@ int utc_capi_base_utils_i18n_plural_rules_select_double_p(void)
     char output_buffer[BUFSIZE] = { 0 };
     i18n_ustring_copy_au_n(output_buffer, buffer, BUFSIZE);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strncmp(output_buffer, output_string, strlen(output_string)), 0);
+    assert_eq(strncmp(output_buffer, output_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strnlen(output_string, BUFSIZE));
 
     return 0;
@@ -750,7 +750,7 @@ int utc_capi_base_utils_i18n_plural_rules_get_keyword_other_p(void)
     i18n_ustring_copy_au_n(output_buffer, buffer, BUFSIZE);
     assert_eq(ret, I18N_ERROR_NONE);
 
-    assert_eq(strncmp(output_buffer, output_string, strlen(output_string)), 0);
+    assert_eq(strncmp(output_buffer, output_string, strlen(output_buffer) + 1), 0);
     assert_eq(output_length, strlen(output_string));
 
     return 0;

diff --git a/tests/utc-capi-base-utils-ubrk.c b/tests/utc-capi-base-utils-ubrk.c
index 63a5a26..f782312 100644 (file)
--- a/tests/utc-capi-base-utils-ubrk.c
+++ b/tests/utc-capi-base-utils-ubrk.c
@@ -965,7 +965,7 @@ static int _loccmp(const char *string, const char *prefix)
     int32_t string_len = (int32_t)strlen(string);
     int32_t prefix_len = (int32_t)strlen(prefix);
 
-    int32_t compare = strncmp(string, prefix, prefix_len);
+    int32_t compare = strncmp(string, prefix, string_len + 1);
     if (compare)
         return -1;
     if (string_len == prefix_len)
@@ -1046,4 +1046,4 @@ int utc_capi_base_utils_i18n_ubrk_get_locale_by_type_n2(void)
     assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
 
     return 0;
-}
\ No newline at end of file
+}