From c358c7db0346ed797d26ab84773cfcd6075cd65f Mon Sep 17 00:00:00 2001 From: JinWang An Date: Fri, 25 Sep 2020 02:23:31 +0900 Subject: [PATCH] Fix unit test for ICU 67.1 - Change arg -1 to 0 at utc_capi_base_utils_i18n_ulocale_get_language_n2 - Fix default value to check measure default value. Change-Id: I5caa8423868eecd0c74defe01ec37c2b6f20fc02 Signed-off-by: JinWang An --- src/utils_i18n_ulocale.cpp | 1 + tests/CMakeLists.txt | 2 +- tests/utc-capi-base-utils-measure-unit.c | 8 ++++---- tests/utc-capi-base-utils-ulocale.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/utils_i18n_ulocale.cpp b/src/utils_i18n_ulocale.cpp index d727716..7e44bd0 100644 --- a/src/utils_i18n_ulocale.cpp +++ b/src/utils_i18n_ulocale.cpp @@ -42,6 +42,7 @@ int i18n_ulocale_get_language(const char *locale_id, char *language, int32_t lan int32_t *buf_size_language) { retv_if(buf_size_language == NULL || language == NULL, I18N_ERROR_INVALID_PARAMETER); +// retv_if(language_capacity < 0, I18N_ERROR_INVALID_PARAMETER); UErrorCode icu_error = U_ZERO_ERROR; *buf_size_language = uloc_getLanguage(locale_id, language, language_capacity, &icu_error); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cf5303f..163d049 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -29,4 +29,4 @@ TARGET_LINK_LIBRARIES(${UNITTEST_NAME} pthread ) -# INSTALL(PROGRAMS ${UNITTEST_NAME} DESTINATION ${BIN_INSTALL_DIR}) +#INSTALL(PROGRAMS ${UNITTEST_NAME} DESTINATION ${BIN_INSTALL_DIR}) diff --git a/tests/utc-capi-base-utils-measure-unit.c b/tests/utc-capi-base-utils-measure-unit.c index 6982404..122fffb 100644 --- a/tests/utc-capi-base-utils-measure-unit.c +++ b/tests/utc-capi-base-utils-measure-unit.c @@ -1317,7 +1317,7 @@ int utc_capi_base_utils_i18n_measure_unit_create_pound_per_square_inch_p(void) assert_eq(ret, I18N_ERROR_NONE); const char *ref_type = "pressure"; - const char *ref_subtype = "pound-per-square-inch"; + const char *ref_subtype = "pound-force-per-square-inch"; assert(!strcmp(type, ref_type)); assert(!strcmp(subtype, ref_subtype)); @@ -1360,7 +1360,7 @@ int utc_capi_base_utils_i18n_measure_unit_create_millimeter_of_mercury_p(void) assert_eq(ret, I18N_ERROR_NONE); const char *ref_type = "pressure"; - const char *ref_subtype = "millimeter-of-mercury"; + const char *ref_subtype = "millimeter-ofhg"; assert(!strcmp(type, ref_type)); assert(!strcmp(subtype, ref_subtype)); @@ -1446,7 +1446,7 @@ int utc_capi_base_utils_i18n_measure_unit_create_inch_hg_p(void) assert_eq(ret, I18N_ERROR_NONE); const char *ref_type = "pressure"; - const char *ref_subtype = "inch-hg"; + const char *ref_subtype = "inch-ofhg"; assert(!strcmp(type, ref_type)); assert(!strcmp(subtype, ref_subtype)); @@ -5188,7 +5188,7 @@ int utc_capi_base_utils_i18n_measure_unit_create_meter_per_second_squared_p(void assert_eq(ret, I18N_ERROR_NONE); const char *ref_type = "acceleration"; - const char *ref_subtype = "meter-per-second-squared"; + const char *ref_subtype = "meter-per-square-second"; assert(!strcmp(type, ref_type)); assert(!strcmp(subtype, ref_subtype)); diff --git a/tests/utc-capi-base-utils-ulocale.c b/tests/utc-capi-base-utils-ulocale.c index 1740cfc..6550f80 100644 --- a/tests/utc-capi-base-utils-ulocale.c +++ b/tests/utc-capi-base-utils-ulocale.c @@ -1307,7 +1307,7 @@ int utc_capi_base_utils_i18n_ulocale_get_language_n2(void) char language[I18N_LANG_CAPACITY]; int32_t buf_size_language; - ret = i18n_ulocale_get_language(NULL, language, -1, &buf_size_language); + ret = i18n_ulocale_get_language(NULL, language, 0, &buf_size_language); assert_eq(ret, I18N_ERROR_BUFFER_OVERFLOW); return 0; -- 2.34.1