!1111 Modify test code

Merge pull request !1111 from blackleon/update_lts_1117

notification/ans_standard/BUILD.gn

@@ -20,8 +20,6 @@ group("ans_standard") {
       #"actsansnotificationremove:ActsAnsNotificationRemove",
       "actsansslottest:ActsAnsSlotTest",
       "publish_test:publish_test",
-
-      #"publishicontest:ActsAnsIconTest",
     ]
   }
 }

notification/ans_standard/actsansnotificationcancel/Test.json

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

notification/ans_standard/actsansnotificationcancel/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.actsansnotificationcancel",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.actsansnotificationcancel",
-    "name": ".actsansnotificationcancel",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.actsansnotificationcancel.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.actsansnotificationcancel",
+    "vendor": "example",
+    "version": {
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5,
+      "releaseType": "Beta1"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.actsansnotificationcancel",
+    "name": ".actsansnotificationcancel",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry"
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.actsansnotificationcancel.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "launchType": "standard",
+        "visible": true
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

notification/ans_standard/actsansnotificationcancel/entry/src/main/js/default/app.js

-/*
-* 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.
-*/
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};
+/*
+* 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.
+*/
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

notification/ans_standard/actsansnotificationcancel/entry/src/main/js/resources/base/element/string.json

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

notification/ans_standard/actsansnotificationcancel/entry/src/main/js/test/List.test.js

-/*
-* 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.
-*/
-require('./ActsAnsNotificationCancel.test.js')
+/*
+* 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.
+*/
+require('./ActsAnsNotificationCancel.test.js')

notification/ans_standard/actsansnotificationremove/Test.json

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

notification/ans_standard/actsansnotificationremove/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "com.example.actsansnotificationremove",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Beta1"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "com.example.actsansnotificationremove",
-    "name": ".actsansnotificationremove",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry"
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "com.example.actsansnotificationremove.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
+{
+  "app": {
+    "bundleName": "com.example.actsansnotificationremove",
+    "vendor": "example",
+    "version": {
+      "code": 1,
+      "name": "1.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5,
+      "releaseType": "Beta1"
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "com.example.actsansnotificationremove",
+    "name": ".actsansnotificationremove",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry"
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "com.example.actsansnotificationremove.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "launchType": "standard",
+        "visible": true
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
 }
\ No newline at end of file

notification/ans_standard/actsansnotificationremove/entry/src/main/js/default/app.js

-/*
-* 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.
-*/
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};
+/*
+* 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.
+*/
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

notification/ans_standard/actsansnotificationremove/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/actsansnotificationremove/entry/src/main/js/test/List.test.js

-/*
-* 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.
-*/
+/*
+* 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.
+*/
 require('./ActsAnsNotificationRemove.test.js')
\ No newline at end of file

notification/ans_standard/actsansslottest/BUILD.gn

@@ -17,11 +17,14 @@ group("ActsAnsSlotTest") {
   testonly = true
   if (is_standard_system) {
     deps = [
+      "actsansgetslotWithoutadd:ActsAnsGetSlotWithoutAdd",
       "actsansgetslottestcallback:ActsAnsGetSlotTestCallback",
       "actsansgetslottestpromise:ActsAnsGetSlotTestPromise",
       "actsansremoveslottest:ActsAnsRemoveSlotTest",
+      "actsansremoveslotwithoutadd:ActsAnsRemoveSlotWithoutAdd",
 
       #"actsansslotbybundle:ActsAnsSlotByBundle",
+      #"actsansaddslotsystem:ActsAnsAddSlotSystem",
       #"actsansslotsystemcallback:ActsAnsSlotSystemCallback",
       #"actsansslotsystempromise:ActsAnsSlotSystemPromise",
       #"actsansslottaddremoveall:ActsAnsSlotAddRemoveAll",

notification/ans_standard/publish_test/getactive/getactivenormal/active/BUILD.gn → notification/ans_standard/actsansslottest/actsansaddslotsystem/BUILD.gn

@@ -13,14 +13,14 @@
 
 import("//test/xts/tools/build/suite.gni")
 
-ohos_js_hap_suite("ActsAnsGetActiveTest") {
+ohos_js_hap_suite("ActsAnsAddSlotSystem") {
   hap_profile = "./entry/src/main/config.json"
   deps = [
     ":hjs_demo_js_assets",
     ":hjs_demo_resources",
   ]
   certificate_profile = "./signature/openharmony_sx.p7b"
-  hap_name = "ActsAnsGetActiveTest"
+  hap_name = "ActsAnsAddSlotSystem"
 }
 ohos_js_assets("hjs_demo_js_assets") {
   source_dir = "./entry/src/main/js/default"

notification/ans_standard/publish_test/activeButton/Test.json → notification/ans_standard/actsansslottest/actsansaddslotsystem/Test.json

@@ -3,13 +3,13 @@
     "driver": {
         "type": "JSUnitTest",
         "test-timeout": "60000",
-        "package": "com.example.actsansactionbuttontest",
+        "package": "com.example.actsansaddslotsystem",
         "shell-timeout": "60000"
     },
     "kits": [
         {
             "test-file-name": [
-                "ActsAnsActionButtonTest"
+                "ActsAnsAddSlotSystem.hap"
             ],
             "type": "AppInstallKit",
             "cleanup-apps": true

notification/ans_standard/publish_test/badgedisplayed/badgedisplayfour/entry/src/main/js/default/app.js → notification/ans_standard/actsansslottest/actsansaddslotsystem/entry/src/main/js/default/app.js

-/*
- * 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.
- */
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};
+/*
+ * 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.
+ */
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

notification/ans_standard/publish_test/publishcontentype/entry/src/main/js/default/pages/index/index.hml → notification/ans_standard/actsansslottest/actsansaddslotsystem/entry/src/main/js/default/pages/index/index.hml

 <div class="container">
     <text class="title">
-        contentType
+        {{title}}
     </text>
 </div>