!639 L2 notification整改

Merge pull request !639 from jiyong/master

notification/ans_standard/BUILD.gn

@@ -15,6 +15,10 @@ import("//build/ohos_var.gni")
 group("ans_standard") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "publishicontest:ActsAnsIconTest" ]
+    deps = [
+      "cancel_test:MyApplicationCancelAll",
+      "publish_test:notification-ContentType-All",
+      "publishicontest:ActsAnsIconTest",
+    ]
   }
 }

notification/ans_standard/cancel_test/BUILD.gn

@@ -15,6 +15,6 @@ import("//build/ohos_var.gni")
 group("cancel_test") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "MyApplicationCancelAll:ans_signed" ]
+    deps = [ "MyApplicationCancelAll:ActsMyApplicationCancelAllTest" ]
   }
 }

notification/ans_standard/cancel_test/MyApplicationCancelAll/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ans_signed") {
+ohos_js_hap_suite("ActsMyApplicationCancelAllTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ans_signed"
+  hap_name = "ActsMyApplicationCancelAllTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/cancel_test/MyApplicationCancelAll/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ans_signed.hap"
+                "ActsMyApplicationCancelAllTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/BUILD.gn

@@ -15,6 +15,6 @@ import("//build/ohos_var.gni")
 group("publish_test") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "notification-ContentType-All:contentType-signed" ]
+    deps = [ "notification-ContentType-All:ActsContentTypeAllTest" ]
   }
 }

notification/ans_standard/publish_test/notification-ContentType-All/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("contentType-signed") {
+ohos_js_hap_suite("ActsContentTypeAllTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "contentType-signed"
+  hap_name = "ActsContentTypeAllTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/notification-ContentType-All/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "contentType-signed.hap"
+                "ActsContentTypeAllTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ces_standard/subscribeandpublish/BUILD.gn

@@ -17,8 +17,8 @@ group("SubscribeAndPublish") {
   testonly = true
   if (is_standard_system) {
     deps = [
-      "actssubscriberorderedtest:ActsSubscriberTestOrder",
-      "actssubscriberunordertest:ActsSubscriberTestUnorder",
+      "actssubscriberorderedtest:ActsSubscriberOrderTest",
+      "actssubscriberunordertest:ActsSubscriberUnorderTest",
     ]
   }
 }

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsSubscriberTestOrder") {
+ohos_js_hap_suite("ActsSubscriberOrderTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsSubscriberTestOrder"
+  hap_name = "ActsSubscriberOrderTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/Test.json

@@ -2,14 +2,14 @@
     "description": "Configuration for hjunit demo Tests",
     "driver": {
         "type": "JSUnitTest",
-        "test-timeout": "60000",
+        "test-timeout": "500000",
         "package": "com.example.actssubscribertestorder",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsSubscriberTestOrder.hap"
+                "ActsSubscriberOrderTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/app.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 export default {
-    async onCreate() {
+    onCreate() {
         console.info("============== AceApplication onCreate ==============");
     },
     onDestroy() {

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn

@@ -12,14 +12,14 @@
 # limitations under the License.
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsSubscriberTestUnorder") {
+ohos_js_hap_suite("ActsSubscriberUnorderTest") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsSubscriberTestUnorder"
+  hap_name = "ActsSubscriberUnorderTest"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/Test.json

@@ -9,7 +9,7 @@
     "kits": [
         {
             "test-file-name": [
-                "ActsSubscriberTestUnorder.hap"
+                "ActsSubscriberUnorderTest.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/app.js

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 export default {
-    async onCreate() {
+    onCreate() {
         console.info("============== AceApplication onCreate ==============");
     },
     onDestroy() {