diff --git a/miscservices/BUILD.gn b/miscservices/BUILD.gn index 06ca24ea3dd731235cb10ad1847ef8dad1d88a5d..bf26586acb38e6cedd61629861b87940fa177489 100755 --- a/miscservices/BUILD.gn +++ b/miscservices/BUILD.gn @@ -14,16 +14,8 @@ import("//build/ohos_var.gni") group("miscservices") { testonly = true - if (is_standard_system) { - deps = [ "TimeTest_js:time_js_test" ] - } else { - deps = [ - "DownloadTest:download_hap", - "InputMethodTest:InputMethodTest_hap", - "pasteboard:testpasteboard_hap", - "screenlock:ScreenLockTest_hap", - "timer:testtimer_hap", - "wallpaper:wallpaperTest_hap", - ] - } + deps = [ + "TimeTest_js:time_js_test", + "TimerTest_js:timer_js_test", + ] } diff --git a/miscservices/TimeTest_js/BUILD.gn b/miscservices/TimeTest_js/BUILD.gn index 18656b825c44c16cc03c0cece0f0c4030b808820..17fc37ff05f026a7f86a424dcc64963171447d9e 100755 --- a/miscservices/TimeTest_js/BUILD.gn +++ b/miscservices/TimeTest_js/BUILD.gn @@ -16,16 +16,16 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("time_js_test") { hap_profile = "./src/main/config.json" deps = [ - ":time_js_assets", - ":time_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsTimeJSApiTest" + hap_name = "TimeJSApiTest" } -ohos_js_assets("time_js_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" } -ohos_resources("time_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./src/main/resources" ] hap_profile = "./src/main/config.json" } diff --git a/miscservices/TimeTest_js/Test.json b/miscservices/TimeTest_js/Test.json index 1e562dd2daf4d5220899ddbe46de43792f4db406..906fff7003b2690eb43b8a6d7c4299aa44e6fa47 100755 --- a/miscservices/TimeTest_js/Test.json +++ b/miscservices/TimeTest_js/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for time js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "180000", + "test-timeout": "21600000", "package": "ohos.acts.miscservices.timer", - "shell-timeout": "60000" + "shell-timeout": "21600000" }, "kits": [ { "test-file-name": [ - "ActsTimeJSApiTest.hap" + "TimeJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/miscservices/TimeTest_js/src/main/js/default/test/List.test.js b/miscservices/TimeTest_js/src/main/js/default/test/List.test.js index c03cea948356a4c0f86dbfd06e8e86a5d2ae5361..73a1578832846d4352ea23240d3671e097ff9d76 100755 --- a/miscservices/TimeTest_js/src/main/js/default/test/List.test.js +++ b/miscservices/TimeTest_js/src/main/js/default/test/List.test.js @@ -13,5 +13,4 @@ * limitations under the License. */ -require('./Time.test.js') require('./SystemTimeJsunit.test.js') \ No newline at end of file diff --git a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js b/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js index 30639aa039a1b11428e289b680bbbccad34a4a7d..df7aac9af70bb753fd58e6df97074e934c2f4cae 100644 --- a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js +++ b/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js @@ -1853,4 +1853,132 @@ describe('TimeTest', function() { console.log('SUB_systemTime_setTimezone_JS_API_3000 end'); done() }) + + /** + * @tc.number SUB_systemTime_getTimezone_JS_API_0100 + * @tc.name Test systemTime.getTimezone timezone = 'Anadyr, Russia' + * @tc.desc Test systemTime_getTimezone API functionality. + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 0 + */ + it('systemTime_getTimezone_test1', 0, async function (done) { + console.log('SUB_systemTime_getTimezone_JS_API_0100 start') + var res = systemTime.getTimeZone() + .then(data =>{ + console.log('getTimezone ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getTimezone ===error ' + error) + console.log('getTimezone ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getTimezone_JS_API_0100 end'); + done() + }) + + it('systemTime_getCurrentTime_test1', 0, async function (done) { + console.log('SUB_systemTime_getCurrentTime_JS_API_0100 start') + var res = systemTime.getCurrentTime() + .then(data =>{ + console.log('getCurrentTime ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getCurrentTime ===error ' + error) + console.log('getCurrentTime ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getCurrentTime_JS_API_0100 end'); + done() + }) + + it('systemTime_getCurrentTimeNs_test1', 0, async function (done) { + console.log('SUB_systemTimeNs_getCurrentTime_JS_API_0100 start') + var res = systemTime.getCurrentTimeNs() + .then(data =>{ + console.log('getCurrentTimeNs ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getCurrentTimeNs ===error ' + error) + console.log('getCurrentTimeNs ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getCurrentTimeNs_JS_API_0100 end'); + done() + }) + + it('systemTime_getRealActiveTime_test1', 0, async function (done) { + console.log('SUB_systemTime_getRealActiveTime_JS_API_0100 start') + var res = systemTime.getRealActiveTime() + .then(data =>{ + console.log('getRealActiveTime ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getRealActiveTime ===error ' + error) + console.log('getRealActiveTime ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getRealActiveTime_JS_API_0100 end'); + done() + }) + + it('systemTime_getRealActiveTimeNs_test1', 0, async function (done) { + console.log('SUB_systemTime_getRealActiveTimeNs_JS_API_0100 start') + var res = systemTime.getRealActiveTimeNs() + .then(data =>{ + console.log('getRealActiveTimeNs ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getRealActiveTimeNs ===error ' + error) + console.log('getRealActiveTimeNs ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getRealActiveTimeNs_JS_API_0100 end'); + done() + }) + + it('systemTime_getRealTime_test1', 0, async function (done) { + console.log('SUB_systemTime_getRealTime_JS_API_0100 start') + var res = systemTime.getRealTime() + .then(data =>{ + console.log('getRealTime ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getRealTime ===error ' + error) + console.log('getRealTime ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getRealTime_JS_API_0100 end'); + done() + }) + + it('systemTime_getRealTimeNs_test1', 0, async function (done) { + console.log('SUB_systemTime_getRealTimeNs_JS_API_0100 start') + var res = systemTime.getRealTimeNs() + .then(data =>{ + console.log('getRealTimeNs ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getRealTimeNs ===error ' + error) + console.log('getRealTimeNs ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getRealTimeNs_JS_API_0100 end'); + done() + }) + + it('systemTime_getDate_test1', 0, async function (done) { + console.log('SUB_systemTime_getDate_JS_API_0100 start') + var res = systemTime.getDate() + .then(data =>{ + console.log('getDate ===data ' + data + res) + expect(true).to.a('boolean') + }).catch(error => { + console.log('getDate ===error ' + error) + console.log('getDate ===data ' + data) + execpt(0).assertLarger(1) + }); + console.log('SUB_systemTime_getDate_JS_API_0100 end'); + done() + }) }) \ No newline at end of file diff --git a/miscservices/TimerTest_js/BUILD.gn b/miscservices/TimerTest_js/BUILD.gn index 2f840116147d89d37192b0cdf6f1654071c5fa84..1fc48ed309a5ee57da52dcc4cb9bfdb544aa076e 100644 --- a/miscservices/TimerTest_js/BUILD.gn +++ b/miscservices/TimerTest_js/BUILD.gn @@ -16,16 +16,16 @@ import("//test/xts/tools/build/suite.gni") ohos_js_hap_suite("timer_js_test") { hap_profile = "./src/main/config.json" deps = [ - ":time_js_assets", - ":time_resources", + ":hjs_demo_js_assets", + ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsTimeJSApiTest" + hap_name = "TimerJSApiTest" } -ohos_js_assets("time_js_assets") { +ohos_js_assets("hjs_demo_js_assets") { source_dir = "./src/main/js/default" } -ohos_resources("time_resources") { +ohos_resources("hjs_demo_resources") { sources = [ "./src/main/resources" ] hap_profile = "./src/main/config.json" } diff --git a/miscservices/TimerTest_js/Test.json b/miscservices/TimerTest_js/Test.json index 0ddfb93bc65d11a3972c78edfd99fb8553a0e410..db25e45270ef84821ba8bb795829f35b888c6be7 100644 --- a/miscservices/TimerTest_js/Test.json +++ b/miscservices/TimerTest_js/Test.json @@ -2,14 +2,14 @@ "description": "Configuration for time js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "60000", + "test-timeout": "21600000", "package": "ohos.acts.miscservices.timer", - "shell-timeout": "60000" + "shell-timeout": "21600000" }, "kits": [ { "test-file-name": [ - "ActsTimeJSApiTest.hap" + "TimerJSApiTest.hap" ], "type": "AppInstallKit", "cleanup-apps": true diff --git a/miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js b/miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js index 4d27794609e92c89e7cc33a79e7e35a62562994e..8f99d0eb57fe065adf83aba9245015172d14e6c4 100644 --- a/miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js +++ b/miscservices/TimerTest_js/src/main/js/default/test/SystemTimerJsunit.test.js @@ -40,16 +40,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0100 end'); }); @@ -73,16 +70,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0200 end'); }); @@ -106,16 +100,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0300 end'); }); @@ -139,16 +130,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0400 end'); }); @@ -172,16 +160,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 0) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 0) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0500 end'); }); @@ -205,16 +190,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 5000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 5000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0600 end'); }); @@ -238,16 +220,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, Number.MAX_VALUE/2) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, Number.MAX_VALUE/2) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0700 end'); }); @@ -271,16 +250,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, Number.MAX_VALUE-1) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, Number.MAX_VALUE-1) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0800 end'); }); @@ -304,16 +280,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, Number.MAX_VALUE) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, Number.MAX_VALUE) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + ystemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_0900 end'); }); @@ -337,16 +310,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1000 end'); }); @@ -370,16 +340,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1100 end'); }); @@ -403,16 +370,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1200 end'); }); @@ -438,16 +402,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1300 end'); } }); @@ -473,16 +434,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1400 end'); }); @@ -507,16 +465,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1500 end'); }); @@ -541,16 +496,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1600 end'); }); @@ -575,16 +527,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1700 end'); }); @@ -609,16 +558,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1800 end'); }); @@ -637,23 +583,19 @@ describe('TimerTest', function() { repeat:false, interval:100000, persistent:false - //wantAgent:WantAgent } console.log("create timer") let timer = systemTimer.createTimer(options) expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_1900 end'); }); @@ -679,16 +621,13 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2000 end'); }); @@ -712,12 +651,10 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start a not exist timer") - let startTimerRes = systemTimer.startTimer(timer + 1, 100000) - expect(startTimerRes).assertEqual(false) + systemTimer.startTimer(timer + 1, 100000) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2100 end'); }); @@ -741,20 +678,16 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop a not exist timer") - let stopTimerRes = systemTimer.stopTimer(timer + 1) - expect(stopTimerRes).assertEqual(false) + systemTimer.stopTimer(timer + 1) console.log("stop the current timer") - stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2200 end'); }); @@ -778,20 +711,16 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy a not exist timer") - let destroyTimerRes = systemTimer.destroyTimer(timer + 1) - expect(destroyTimerRes).assertEqual(false) + systemTimer.destroyTimer(timer + 1) console.log("destroy timer") - destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2300 end'); }); @@ -815,12 +744,10 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("stop a not started timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(false) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2400 end'); }); @@ -844,12 +771,10 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("destroy a started timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2500 end'); }); @@ -873,20 +798,16 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("start timer again") - startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2600 end'); }); @@ -910,20 +831,16 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("stop timer again") - stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2700 end'); }); @@ -947,23 +864,49 @@ describe('TimerTest', function() { expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) console.log("start timer") - let startTimerRes = systemTimer.startTimer(timer, 100000) - expect(startTimerRes).assertEqual(true) + systemTimer.startTimer(timer, 100000) console.log("stop timer") - let stopTimerRes = systemTimer.stopTimer(timer) - expect(stopTimerRes).assertEqual(true) + systemTimer.stopTimer(timer) console.log("destroy timer") - let destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(true) + systemTimer.destroyTimer(timer) console.log("destroy timer again") - destroyTimerRes = systemTimer.destroyTimer(timer) - expect(destroyTimerRes).assertEqual(false) + systemTimer.destroyTimer(timer) console.log('SUB_systemTimer_Timer_JS_API_2800 end'); }); + /** + * @tc.number SUB_systemTimer_Timer_JS_API_2900 + * @tc.name Test systemTimer.createTTimer type = TIMER_TYPE_IDLE + * @tc.desc Test systemTimer_Timer API functionality. + * @tc.size : MEDIUM + * @tc.type : Function + * @tc.level : Level 0 + */ + it('systemTimer_Timer_test29',0, async () => { + console.log("SUB_systemTimer_Timer_JS_API_2900 start") + var options = { + type:TIMER_TYPE_IDLE, + repeat:false, + persistent:false + } + console.log("create timer") + let timer = systemTimer.createTimer(options) + expect(parseInt(timer) == parseFloat(timer)).assertEqual(true) + + console.log("start timer") + systemTimer.startTimer(timer, 100000) + + console.log("stop timer") + systemTimer.stopTimer(timer) + + console.log("destroy timer") + systemTimer.destroyTimer(timer) + console.log('SUB_systemTimer_Timer_JS_API_2900 end'); + }); + /** * @function Used for callback functions * @tc.name callbackFunction diff --git a/miscservices/TimerTest_js/src/main/resources/base/element/string.json b/miscservices/TimerTest_js/src/main/resources/base/element/string.json index c557307449d870c30d3424570a169ecdc9a06651..7d8cda7795aa2464c77c5bd64e5da3b1a860ea0b 100644 --- a/miscservices/TimerTest_js/src/main/resources/base/element/string.json +++ b/miscservices/TimerTest_js/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "JstimeTest" + "value": "JstimerTest" }, { "name": "mainability_description",