!603 L2 notification中ans整改

Merge pull request !603 from jiyong/master

notification/BUILD.gn

@@ -16,6 +16,9 @@ import("//build/ohos_var.gni")
 group("notification") {
   testonly = true
   if (is_standard_system) {
-    deps = [ "ces_standard:ces_standard" ]
+    deps = [
+      "ans_standard:ans_standard",
+      "ces_standard:ces_standard",
+    ]
   }
 }

notification/ans_standard/BUILD.gn

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos_var.gni")
+
+group("ans_standard") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [
+      "cancel_test:cancel_test",
+      "publish_test:publish_test",
+    ]
+  }
+}

notification/ans_standard/cancel_test/BUILD.gn

@@ -10,10 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//build/config/ohos/rules.gni")
-import("//test/xts/tools/build/suite.gni")
+import("//build/ohos_var.gni")
 
-ohos_js_hap_suite("AnsNotificationTestCancel") {
-  test_hap_name = "AnsNotificationTestCancel"
-  hap_source_path = "hap/ans_signed.hap"
+group("cancel_test") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [ "MyApplicationCancelAll:ans_signed" ]
+  }
 }

notification/ans_standard/cancel_test/MyApplicationCancelAll/BUILD.gn

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("ans_signed") {
+  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"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/js/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}

notification/ans_standard/cancel_test/MyApplicationCancelAll/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "21600000",
+        "package": "com.example.myapplication",
+        "shell-timeout": "21600000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ans_signed.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}

notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/default/pages/index/index.js

@@ -18,6 +18,9 @@ import device from '@system.device'
 import router from '@system.router'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
 
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
 export default {
     data: {
         title: ""

notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/resources/base/element/string.json → notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "MyApplication"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "MyApplication"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
 }
\ No newline at end of file

notification/ans_standard/publish_test/BUILD.gn

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos_var.gni")
+
+group("publish_test") {
+  testonly = true
+  if (is_standard_system) {
+    deps = [ "notification-ContentType-All:contentType-signed" ]
+  }
+}

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

+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("contentType-signed") {
+  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"
+}
+ohos_js_assets("hjs_demo_js_assets") {
+  source_dir = "./entry/src/main/js/default"
+}
+ohos_resources("hjs_demo_resources") {
+  sources = [ "./entry/src/main/js/resources" ]
+  hap_profile = "./entry/src/main/config.json"
+}

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

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "JSUnitTest",
+        "test-timeout": "21600000",
+        "package": "com.example.test",
+        "shell-timeout": "21600000"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "contentType-signed.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}

notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/default/pages/index/index.js

@@ -18,6 +18,9 @@ import device from '@system.device'
 import router from '@system.router'
 import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
 
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
 export default {
     data: {
         title: ""

notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/resources/base/element/string.json → notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "ContentType"
-    },
-    {
-      "name": "mainability_description",
-      "value": "JS_Phone_Empty Feature Ability"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "ContentType"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
 }
\ No newline at end of file