!1555 增加时间时区获取测试接口

Merge pull request !1555 from guduhanyan/master

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",
+  ]
 }

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"
 }

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

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

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

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"
 }

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

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",