add hiappsub test suites

Signed-off-by: Nchenxuihui <chenxuhui2@huawei.com>

hiviewdfx/BUILD.gn

@@ -18,6 +18,7 @@ group("hiviewdfxtestacts") {
       "bytracetest:ActsBytraceJsTest",
       "hiappeventtest/hiappeventcpptest:ActsHiAppEventCPPTest",
       "hiappeventtest/hiappeventjstest:ActsHiAppeventTest",
+      "hiappeventtest/hiappeventsubjstest:ActsHiAppeventSubTest",
       "hicheckertest/hicheckerjstest:hicheckerjstest",
       "hidebugtest/hidebugtestjstest:ActsHiDebugTest",
       "hilogtest/hilogjstest:ActsHilogJsTest",

hiviewdfx/hiappeventtest/hiappeventsubjstest/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("ActsHiAppeventSubTest") {
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hiappevent_js_assets",
+    ":hiappevent_resources",
+  ]
+
+  #  shared_libraries = [
+  #    "//third_party/giflib:libgif",
+  #    "//third_party/libpng:libpng",
+  #  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ActsHiAppeventSubTest"
+
+  #  part_name = "prebuilt_hap"
+  #  subsystem_name = "xts"
+}
+ohos_js_assets("hiappevent_js_assets") {
+  js2abc = true
+  hap_profile = "./src/main/config.json"
+  source_dir = "./src/main/js"
+}
+ohos_resources("hiappevent_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "270000",
+        "shell-timeout": "270000",
+        "bundle-name": "ohos.acts.hiviewdfx.hiappeventsub.function",
+        "package-name": "ohos.acts.hiviewdfx.hiappeventsub.function"
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsHiAppeventSubTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        }
+    ]
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/config.json

+{
+    "app": {
+        "bundleName": "ohos.acts.hiviewdfx.hiappeventsub.function",
+        "vendor": "example",
+        "version": {
+            "code": 1,
+            "name": "1.0"
+        },
+        "apiVersion": {
+            "compatible": 4,
+            "target": 5
+        }
+    },
+    "deviceConfig": {},
+    "module": {
+        "package": "ohos.acts.hiviewdfx.hiappeventsub.function",
+        "name": ".entry",
+        "deviceType": [
+            "phone"
+        ],
+        "distro": {
+            "deliveryWithInstall": true,
+            "moduleName": "entry",
+            "moduleType": "entry"
+        },
+        "abilities": [
+            {
+                "skills": [
+                    {
+                        "entities": [
+                            "entity.system.home"
+                        ],
+                        "actions": [
+                            "action.system.home"
+                        ]
+                    }
+                ],
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".MainAbility",
+                "srcLanguage": "js",
+                "srcPath": "MainAbility",
+                "icon": "$media:icon",
+                "description": "$string:MainAbility_desc",
+                "label": "$string:MainAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            },
+            {
+                "orientation": "unspecified",
+                "formsEnabled": false,
+                "name": ".TestAbility",
+                "srcLanguage": "js",
+                "srcPath": "TestAbility",
+                "icon": "$media:icon",
+                "description": "$string:TestAbility_desc",
+                "label": "$string:TestAbility_label",
+                "type": "page",
+                "visible": true,
+                "launchType": "standard"
+            }
+        ],
+        "js": [
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": "default",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            },
+            {
+                "pages": [
+                    "pages/index/index"
+                ],
+                "name": ".TestAbility",
+                "window": {
+                    "designWidth": 720,
+                    "autoDesignWidth": false
+                }
+            }
+        ],
+        "testRunner": {
+            "name": "OpenHarmonyTestRunner",
+            "srcPath": "TestRunner"
+        },
+        "mainAbility": ".MainAbility",
+        "srcPath": ""
+    }
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/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');
+    }
+};

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/MainAbility/pages/index/index.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.
+ */
+import app from '@system.app'
+import device from '@system.device'
+import router from '@system.router'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow finish')
+    },
+    onReady() {
+    },
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/app.js

+/*
+ * Copyright (c) 2022 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default {
+    onCreate() {
+        console.info('TestApplication onCreate')
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    },
+    onDestroy() {
+        console.info("TestApplication onDestroy");
+    }
+};

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  },
+  "Files": {
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/pages/index/index.css

+.container {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    left: 0px;
+    top: 0px;
+    width: 100%;
+    height: 100%;
+}
+
+.title {
+    font-size: 60px;
+    text-align: center;
+    width: 100%;
+    height: 40%;
+    margin: 10px;
+}
+
+@media screen and (device-type: phone) and (orientation: landscape) {
+    .title {
+        font-size: 60px;
+    }
+}
+
+@media screen and (device-type: tablet) and (orientation: landscape) {
+    .title {
+        font-size: 100px;
+    }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestAbility/pages/index/index.js

+/*
+ * Copyright (c) 2022 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 {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    }
+}
+
+
+

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/TestRunner/OpenHarmonyTestRunner.js

+/*
+ * Copyright (c) 2022 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s itName',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s package', '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams += ' ' + key + ' ' + parameters[key]
+        }
+    }
+    return targetParams.trim()
+}
+
+ export default {
+    onPrepare() {
+        console.info('OpenHarmonyTestRunner OnPrepare')
+    },
+    onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+
+        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
+
+        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        console.info('debug value : '+debug)
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd, (err, data) => {
+            console.info('executeShellCommand : err : ' + JSON.stringify(err));
+            console.info('executeShellCommand : data : ' + data.stdResult);
+            console.info('executeShellCommand : data : ' + data.exitCode);
+        })
+    }
+};

hiviewdfx/hiappeventtest/hiappeventsubjstest/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');
+    }
+};

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/pages/index/index.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.
+ */
+import app from '@system.app'
+import device from '@system.device'
+import router from '@system.router'
+import {Core, ExpectExtend, Constant} from 'deccjsunit/index'
+
+const injectRef = Object.getPrototypeOf(global) || global
+injectRef.regeneratorRuntime = require('@babel/runtime/regenerator')
+
+export default {
+    data: {
+        title: ""
+    },
+    onInit() {
+        this.title = this.$t('strings.world');
+    },
+    onShow() {
+        console.info('onShow finish')
+        const core = Core.getInstance()
+        const expectExtend = new ExpectExtend({
+            'id': 'extend'
+        })
+        core.addService('expect', expectExtend)
+        core.init()
+        const configService = core.getDefaultService('config')
+        configService.setConfig(this)
+
+        require('../../test/List.test')
+        core.execute()
+    },
+    onReady() {
+    },
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/js/default/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.
+ */
+import HiAppEventApiTest from './HiAppEventSub.test.js'
+export default function testsuite() {
+HiAppEventApiTest()
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/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.
+ */
+import Hiappeventsubtest from './HiAppEventSub.test.js'
+export default function testsuite() {
+Hiappeventsubtest()
+}

hiviewdfx/hiappeventtest/hiappeventsubjstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "test2demo"
+    },
+    {
+      "name": "mainability_description",
+      "value": "hap sample empty page"
+		},
+	{
+		"name": "MainAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "MainAbility_label",
+		"value": "label"
+	},
+		{
+		"name": "TestAbility_desc",
+		"value": "description"
+	},
+		{
+		"name": "TestAbility_label",
+		"value": "label"
+	}
+  ]
+}

hiviewdfx/hisyseventtest/hisyseventjstest/src/main/js/test/HiSysEvent.test.js

@@ -48,7 +48,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -76,6 +76,11 @@ describe('hiSysEventJsTest', function () {
 				expect(value == 0).assertTrue();
 				done();
 			}
+		).catch(
+			(err) => {
+				console.error(`HiSysEvent json-callback-error code=${err.code}`);
+				expect(err.code == 0).assertFail();
+			}
 		)
 		console.info('testHiSysEventApi02 end')
 	})
@@ -95,7 +100,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -114,14 +119,14 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi05', 3, async function (done) {
 		console.info('testHiSysEventApi05 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "HIVIEWDFX",
+			name: "PLUGIN_STATS",
 			eventType: hiSysEvent.EventType.STATISTIC,
 		},(err, value) => {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -140,14 +145,14 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi06', 3, async function (done) {
 		console.info('testHiSysEventApi06 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "ACCOUNT",
+			name: "PERMISSION_EXCEPTION",
 			eventType: hiSysEvent.EventType.SECURITY,
 		},(err, value) => {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -166,14 +171,14 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi07', 3, async function (done) {
 		console.info('testHiSysEventApi07 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "HIVIEWDFX",
+			name: "PLUGIN_LOAD",
 			eventType: hiSysEvent.EventType.BEHAVIOR,
 		},(err, value) => {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -206,7 +211,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -225,8 +230,8 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi09', 3, async function (done) {
 		console.info('testHiSysEventApi09 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "HIVIEWDFX",
+			name: "PLUGIN_STATS",
 			eventType: hiSysEvent.EventType.STATISTIC,
 			params: {
 				PID: 487,
@@ -239,7 +244,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('HiSysEvent into json-callback');
 			if (err) {
 				console.error(`HiSysEvent json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`HiSysEvent json-callback-success value=${value}`);
@@ -258,8 +263,8 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi10', 3, async function (done) {
 		console.info('testHiSysEventApi10 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "ACCOUNT",
+			name: "PERMISSION_EXCEPTION",
 			eventType: hiSysEvent.EventType.SECURITY,
 			params: {
 				PID: 487,
@@ -272,7 +277,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('testHiSysEventApi10 into json-callback');
 			if (err) {
 				console.error(`testHiSysEventApi10 json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`testHiSysEventApi10 json-callback-success value=${value}`);
@@ -291,8 +296,8 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi11', 3, async function (done) {
 		console.info('testHiSysEventApi11 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "HIVIEWDFX",
+			name: "PLUGIN_LOAD",
 			eventType: hiSysEvent.EventType.BEHAVIOR,
 			params: {
 				PID: 487,
@@ -305,7 +310,7 @@ describe('hiSysEventJsTest', function () {
 			console.log('testHiSysEventApi11 into json-callback');
 			if (err) {
 				console.error(`testHiSysEventApi11 json-callback-error code=${err.code}`);
-				expect().assertFail();
+				expect(err.code == 0).assertFail();
 				done();
 			} else {
 				console.log(`testHiSysEventApi11 json-callback-success value=${value}`);
@@ -768,8 +773,8 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi24', 1, async function (done) {
 		console.info('testHiSysEventApi24 start')
 		hiSysEvent.write({
-			domain: "RELIABILITY",
-			name: "STACK",
+			domain: "ACCOUNT",
+			name: "PERMISSION_EXCEPTION",
 			eventType: hiSysEvent.EventType.SECURITY,
 			params: {
 				PID: 487,
@@ -794,8 +799,8 @@ describe('hiSysEventJsTest', function () {
                 endTime: -1,
                 maxEvents: 1,
             }, [{
-                domain: "RELIABILITY",
-                names: ["STACK"],
+                domain: "ACCOUNT",
+                names: ["PERMISSION_EXCEPTION"],
             }], {
                 onQuery: function (infos, seqs) {
                     console.info(`testHiSysEventApi24: onQuery...`)
@@ -840,22 +845,8 @@ describe('hiSysEventJsTest', function () {
 	it('testHiSysEventApi25', 1, async function (done) {
 		console.info('testHiSysEventApi25 start')
 		hiSysEvent.write({
-			domain: "AAFWK",
-			name: "JS_ERROR",
-			eventType: hiSysEvent.EventType.SECURITY,
-		},(err, value) => {
-			console.log('testHiSysEventApi25 into json-callback');
-			if (err) {
-				console.error('in testHiSysEventApi25 test callback: err.code = ' + err.code)
-                result = err.code
-			} else {
-				console.info('in testHiSysEventApi25 test callback: result = ' + value)
-                result = value;
-			}
-		});
-		hiSysEvent.write({
-			domain: "AAFWK",
-			name: "LIFECYCLE_TIMEOUT",
+			domain: "HIVIEWDFX",
+			name: "SYS_USAGE",
 			eventType: hiSysEvent.EventType.STATISTIC,
 		},(err, value) => {
 			console.log('testHiSysEventApi25 into json-callback');
@@ -867,14 +858,31 @@ describe('hiSysEventJsTest', function () {
                 result = value;
 			}
 		});
+		console.info('add second..')
+		setTimeout(() => {
+			hiSysEvent.write({
+				domain: "HIVIEWDFX",
+				name: "PLUGIN_STATS",
+				eventType: hiSysEvent.EventType.STATISTIC,
+			},(err, value) => {
+				console.log('testHiSysEventApi25 into json-callback');
+				if (err) {
+					console.error('in testHiSysEventApi25 test callback: err.code = ' + err.code)
+					result = err.code
+				} else {
+					console.info('in testHiSysEventApi25 test callback: result = ' + value)
+					result = value;
+				}
+			})
+		},1000)
 		setTimeout(() => {
             let ret = hiSysEvent.query({
                 beginTime: -1,
                 endTime: -1,
                 maxEvents: 5,
             }, [{
-                domain: "AAFWK",
-                names: ["JS_ERROR","LIFECYCLE_TIMEOUT"],
+                domain: "HIVIEWDFX",
+                names: ["SYS_USAGE","PLUGIN_STATS"],
             }], {
                 onQuery: function (infos, seqs) {
                     console.info(`testHiSysEventApi25: onQuery...`)