[UTC][base-utils][Non-ACR][change logic and remove tc by icu upgrade]

Change-Id: I4f95de424884cb909a9d793e9a5847927edf2ec9
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/src/utc/base-utils/tct-base-utils-core_mobile.h b/src/utc/base-utils/tct-base-utils-core_mobile.h
index a924bff1a09442849384146313114ddab5d5667c..42a1a69888e3d37787497e4155f743975c549918 100755 (executable)
--- a/src/utc/base-utils/tct-base-utils-core_mobile.h
+++ b/src/utc/base-utils/tct-base-utils-core_mobile.h
@@ -450,7 +450,6 @@ extern int utc_capi_base_utils_i18n_unumber_format_double_currency_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void);
-extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n4(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_n(void);
@@ -2662,7 +2661,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n",utc_capi_base_utils_i18n_unumber_format_double_currency_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n2",utc_capi_base_utils_i18n_unumber_format_double_currency_n2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n3",utc_capi_base_utils_i18n_unumber_format_double_currency_n3,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
-       {"utc_capi_base_utils_i18n_unumber_format_double_currency_n4",utc_capi_base_utils_i18n_unumber_format_double_currency_n4,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p",utc_capi_base_utils_i18n_unumber_parse_p,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p2",utc_capi_base_utils_i18n_unumber_parse_p2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_n",utc_capi_base_utils_i18n_unumber_parse_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},

diff --git a/src/utc/base-utils/tct-base-utils-core_tizeniot.h b/src/utc/base-utils/tct-base-utils-core_tizeniot.h
index 319b5c4ce4ca09aa61cf91c53031330a75f5ac73..1686130fb583be6ff4d5c6eeb5e2ac2c9eea03b7 100755 (executable)
--- a/src/utc/base-utils/tct-base-utils-core_tizeniot.h
+++ b/src/utc/base-utils/tct-base-utils-core_tizeniot.h
@@ -442,7 +442,6 @@ extern int utc_capi_base_utils_i18n_unumber_format_double_currency_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void);
-extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n4(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_n(void);
@@ -2495,7 +2494,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n",utc_capi_base_utils_i18n_unumber_format_double_currency_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n2",utc_capi_base_utils_i18n_unumber_format_double_currency_n2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n3",utc_capi_base_utils_i18n_unumber_format_double_currency_n3,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
-       {"utc_capi_base_utils_i18n_unumber_format_double_currency_n4",utc_capi_base_utils_i18n_unumber_format_double_currency_n4,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p",utc_capi_base_utils_i18n_unumber_parse_p,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p2",utc_capi_base_utils_i18n_unumber_parse_p2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_n",utc_capi_base_utils_i18n_unumber_parse_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},

diff --git a/src/utc/base-utils/tct-base-utils-core_wearable.h b/src/utc/base-utils/tct-base-utils-core_wearable.h
index a924bff1a09442849384146313114ddab5d5667c..42a1a69888e3d37787497e4155f743975c549918 100755 (executable)
--- a/src/utc/base-utils/tct-base-utils-core_wearable.h
+++ b/src/utc/base-utils/tct-base-utils-core_wearable.h
@@ -450,7 +450,6 @@ extern int utc_capi_base_utils_i18n_unumber_format_double_currency_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n2(void);
 extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void);
-extern int utc_capi_base_utils_i18n_unumber_format_double_currency_n4(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_p2(void);
 extern int utc_capi_base_utils_i18n_unumber_parse_n(void);
@@ -2662,7 +2661,6 @@ testcase tc_array[] = {
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n",utc_capi_base_utils_i18n_unumber_format_double_currency_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n2",utc_capi_base_utils_i18n_unumber_format_double_currency_n2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_format_double_currency_n3",utc_capi_base_utils_i18n_unumber_format_double_currency_n3,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
-       {"utc_capi_base_utils_i18n_unumber_format_double_currency_n4",utc_capi_base_utils_i18n_unumber_format_double_currency_n4,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p",utc_capi_base_utils_i18n_unumber_parse_p,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_p2",utc_capi_base_utils_i18n_unumber_parse_p2,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},
        {"utc_capi_base_utils_i18n_unumber_parse_n",utc_capi_base_utils_i18n_unumber_parse_n,utc_capi_base_utils_unumber_startup,utc_capi_base_utils_unumber_cleanup},

diff --git a/src/utc/base-utils/utc-capi-base-utils-unumber.c b/src/utc/base-utils/utc-capi-base-utils-unumber.c
index 42d2a7d1ab2ab0f3b83a90579e46d6e484c8262f..c0afb2a2538de9118c4d8be7bc1e7ce372ae71b0 100755 (executable)
--- a/src/utc/base-utils/utc-capi-base-utils-unumber.c
+++ b/src/utc/base-utils/utc-capi-base-utils-unumber.c
@@ -768,29 +768,9 @@ int utc_capi_base_utils_i18n_unumber_format_double_currency_n(void)
  * @testcase        utc_capi_base_utils_i18n_unumber_format_double_currency_n2
  * @since_tizen     2.3.1
  * @description     Formats a double currency amount using a number handle,
- *                  passing invalid currency string.
- */
-int utc_capi_base_utils_i18n_unumber_format_double_currency_n2(void)
-{
-    assert_eq(ret, I18N_ERROR_NONE);
-    assert_neq(num_format, NULL);
-
-    i18n_uchar result[BUF_SIZE] = { 0, };
-
-    i18n_unumber_format_double_currency(num_format, 2014.0, NULL, result, BUF_SIZE, NULL);
-    ret = get_last_result();
-    assert_eq(ret, I18N_ERROR_INVALID_PARAMETER);
-
-    return 0;
-}
-
-/**
- * @testcase        utc_capi_base_utils_i18n_unumber_format_double_currency_n3
- * @since_tizen     2.3.1
- * @description     Formats a double currency amount using a number handle,
  *                  passing invalid output buffer.
  */
-int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void)
+int utc_capi_base_utils_i18n_unumber_format_double_currency_n2(void)
 {
     assert_eq(ret, I18N_ERROR_NONE);
     assert_neq(num_format, NULL);
@@ -809,12 +789,12 @@ int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void)
 }
 
 /**
- * @testcase        utc_capi_base_utils_i18n_unumber_format_double_currency_n4
+ * @testcase        utc_capi_base_utils_i18n_unumber_format_double_currency_n3
  * @since_tizen     2.3.1
  * @description     Formats a double currency amount using a number handle,
  *                  passing invalid maximum size.
  */
-int utc_capi_base_utils_i18n_unumber_format_double_currency_n4(void)
+int utc_capi_base_utils_i18n_unumber_format_double_currency_n3(void)
 {
     assert_eq(ret, I18N_ERROR_NONE);
     assert_neq(num_format, NULL);
@@ -1147,7 +1127,7 @@ int utc_capi_base_utils_i18n_unumber_parse_decimal_p(void)
     ret = get_last_result();
     free(_text);
     assert_eq(ret, I18N_ERROR_NONE);
-    assert_eq(strcmp(result, "12345678.1234"), 0);
+    assert_eq(strcmp(result, "1.23456781234E+7"), 0);
 
     return 0;
 }