!2077 更新杂散定时服务用例

Merge pull request !2077 from 高曦/OpenHarmony-3.0-LTS

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","TimerTest_js:timer_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"
 }
-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,9 +2,9 @@
     "description": "Configuration for time js api Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "600000",
         "package": "ohos.acts.miscservices.timer",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

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/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 = "ActsTimerJSApiTest"
 }
-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,9 +2,9 @@
     "description": "Configuration for time js api Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "600000",
         "package": "ohos.acts.miscservices.timer",
-        "shell-timeout": "60000"
+        "shell-timeout": "600000"
     },
     "kits": [
         {

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