From e4b6ba56b9dda7700ec57292bf2387ee85b06644 Mon Sep 17 00:00:00 2001 From: teamol <28105285@qq.com> Date: Fri, 18 Jun 2021 17:25:04 +0800 Subject: [PATCH] test: fix 2 testcases for API tzset 1.modifications: testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp testsuites/unittest/time/timer/time_timer_test.cpp 2.influence: none Signed-off-by: teamol <28105285@qq.com> --- .../time/timer/smoke/timer_test_tzset_001.cpp | 7 +----- .../time/timer/smoke/timer_test_tzset_002.cpp | 9 ++------ .../unittest/time/timer/time_timer_test.cpp | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp b/testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp index 1e5e8466..8cc51b4b 100644 --- a/testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp +++ b/testsuites/unittest/time/timer/smoke/timer_test_tzset_001.cpp @@ -36,7 +36,7 @@ #include "lt_timer_test.h" #include -static UINT32 testcase1(VOID) +static UINT32 testcase(VOID) { time_t td; int ret = 0; @@ -58,11 +58,6 @@ OUT: return LOS_NOK; } -static UINT32 testcase(VOID) -{ - testcase1(); -} - void TIME_TEST_TZSET_001(void) { TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION); diff --git a/testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp b/testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp index 3c006993..311def89 100644 --- a/testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp +++ b/testsuites/unittest/time/timer/smoke/timer_test_tzset_002.cpp @@ -36,13 +36,13 @@ #include "lt_timer_test.h" #include -static UINT32 testcase1(VOID) +static UINT32 testcase(VOID) { time_t td; int ret = 0; errno = 0; - ret = putenv("TZ=GMT-100"); + ret = putenv((char *) "TZ=GMT-100"); ICUNIT_ASSERT_EQUAL(ret, 0, ret); tzset(); @@ -58,11 +58,6 @@ OUT: return LOS_NOK; } -static UINT32 testcase(VOID) -{ - testcase1(); -} - void TIME_TEST_TZSET_002(void) { TEST_ADD_CASE(__FUNCTION__, testcase, TEST_POSIX, TEST_SWTMR, TEST_LEVEL0, TEST_FUNCTION); diff --git a/testsuites/unittest/time/timer/time_timer_test.cpp b/testsuites/unittest/time/timer/time_timer_test.cpp index 3384ff70..dc2d9648 100644 --- a/testsuites/unittest/time/timer/time_timer_test.cpp +++ b/testsuites/unittest/time/timer/time_timer_test.cpp @@ -97,5 +97,27 @@ HWTEST_F(TimeTimerTest, TimerTest005, TestSize.Level0) { TimerTest005(); } + +/* * + * @tc.name: TIME_TEST_TZSET_001 + * @tc.desc: function for TIME_TEST_TZSET_001 + * @tc.type: FUNC + * @tc.require: AR000EEMQ9 + */ +HWTEST_F(TimeTimerTest, TIME_TEST_TZSET_001, TestSize.Level0) +{ + TIME_TEST_TZSET_001(); +} + +/* * + * @tc.name: TIME_TEST_TZSET_002 + * @tc.desc: function for TimeTimerTest + * @tc.type: FUNC + * @tc.require: AR000EEMQ9 + */ +HWTEST_F(TimeTimerTest, TIME_TEST_TZSET_002, TestSize.Level0) +{ + TIME_TEST_TZSET_002(); +} #endif } // namespace OHOS -- GitLab