diff --git a/hiviewdfx/BUILD.gn b/hiviewdfx/BUILD.gn index 1df36f17fd47f7f4030f1586e425960325f18152..0406a0344c2cb66550fb7eb25224e59d43a04c65 100755 --- a/hiviewdfx/BUILD.gn +++ b/hiviewdfx/BUILD.gn @@ -16,6 +16,7 @@ group("hiviewdfxtestacts") { if (is_standard_system) { deps = [ "hiappeventtest/hiappeventjstest:ActsHiAppeventTest", + "hicheckertest/hicheckerjstest:hicheckerjstest", "hiview/faultlogger/faultloggerjs:faultloggerjs_test", ] } diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn b/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn new file mode 100755 index 0000000000000000000000000000000000000000..085a406410c5284c968a489bf2be66cfb82d5b6c --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/BUILD.gn @@ -0,0 +1,38 @@ +# 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("hicheckerjstest") { + hap_profile = "./src/main/config.json" + deps = [ + ":hichecker_js_assets", + ":hichecker_resources", + ] + + # shared_libraries = [ + # "//third_party/giflib:libgif", + # "//third_party/libpng:libpng", + # ] + certificate_profile = "./signature/openharmony_sx.p7b" + hap_name = "ActsHicheckerTest" + + # part_name = "prebuilt_hap" + # subsystem_name = "xts" +} +ohos_js_assets("hichecker_js_assets") { + source_dir = "./src/main/js/default" +} +ohos_resources("hichecker_resources") { + sources = [ "./src/main/resources" ] + hap_profile = "./src/main/config.json" +} diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/Test.json b/hiviewdfx/hicheckertest/hicheckerjstest/Test.json new file mode 100755 index 0000000000000000000000000000000000000000..fa4b358bcb7ce669f54cf56d4714ccfa0550692c --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/Test.json @@ -0,0 +1,18 @@ +{ + "description": "Configuration for hjunit demo Tests", + "driver": { + "type": "JSUnitTest", + "test-timeout": "120000", + "package": "ohos.hichecker.test", + "shell-timeout": "60000" + }, + "kits": [ + { + "test-file-name": [ + "ActsHicheckerTest.hap" + ], + "type": "AppInstallKit", + "cleanup-apps": true + } + ] +} diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/signature/openharmony_sx.p7b b/hiviewdfx/hicheckertest/hicheckerjstest/signature/openharmony_sx.p7b new file mode 100755 index 0000000000000000000000000000000000000000..9be1e98fa4c0c28ca997ed660112fa16b194f0f5 Binary files /dev/null and b/hiviewdfx/hicheckertest/hicheckerjstest/signature/openharmony_sx.p7b differ diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/config.json b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/config.json new file mode 100755 index 0000000000000000000000000000000000000000..d37021af5baf74af227008dc4b9691f762160259 --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/config.json @@ -0,0 +1,60 @@ +{ + "app": { + "bundleName": "ohos.hichecker.test", + "vendor": "example", + "version": { + "code": 1, + "name": "1.0" + }, + "apiVersion": { + "compatible": 4, + "target": 5 + } + }, + "deviceConfig": {}, + "module": { + "package": "ohos.hichecker.test", + "name": ".MyApplication", + "deviceType": [ + "phone" + ], + "distro": { + "deliveryWithInstall": true, + "moduleName": "entry", + "moduleType": "entry" + }, + "abilities": [ + { + "visible": true, + "skills": [ + { + "entities": [ + "entity.system.home" + ], + "actions": [ + "action.system.home" + ] + } + ], + "name": "ohos.hichecker.test.MainAbility", + "icon": "$media:icon", + "description": "$string:mainability_description", + "label": "MyApplication", + "type": "page", + "launchType": "standard" + } + ], + "js": [ + { + "pages": [ + "pages/index/index" + ], + "name": "default", + "window": { + "designWidth": 720, + "autoDesignWidth": false + } + } + ] + } +} diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/app.js b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/app.js new file mode 100755 index 0000000000000000000000000000000000000000..3ee099f58926b1a7c42f02bb88ebb4998f9e4ac4 --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/app.js @@ -0,0 +1,22 @@ +/* + * 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'); + } +}; diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/en-US.json b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/en-US.json new file mode 100755 index 0000000000000000000000000000000000000000..e63c70d978a3a53be988388c87182f81785e170c --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/en-US.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "Hello", + "world": "World" + } +} \ No newline at end of file diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/zh-CN.json b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/zh-CN.json new file mode 100755 index 0000000000000000000000000000000000000000..de6ee5748322f44942c1b003319d8e66c837675f --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/i18n/zh-CN.json @@ -0,0 +1,6 @@ +{ + "strings": { + "hello": "您好", + "world": "世界" + } +} \ No newline at end of file diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.css b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.css new file mode 100755 index 0000000000000000000000000000000000000000..6fda792753f2e15f22b529c7b90a82185b2770bf --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.css @@ -0,0 +1,9 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; +} + +.title { + font-size: 100px; +} diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.hml b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.hml new file mode 100755 index 0000000000000000000000000000000000000000..f64b040a5ae394dbaa5e185e1ecd4f4556b92184 --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.hml @@ -0,0 +1,5 @@ +
+ + {{ $t('strings.hello') }} {{ title }} + +
diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.js b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.js new file mode 100755 index 0000000000000000000000000000000000000000..ddfa5264d22ca8046b64fafb96cede07df986c2b --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/pages/index/index.js @@ -0,0 +1,43 @@ +/* + * 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 {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 diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/HiChecker.test.js b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/HiChecker.test.js new file mode 100755 index 0000000000000000000000000000000000000000..76288c23dfe328c04a975b7cce25a60312d25274 --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/HiChecker.test.js @@ -0,0 +1,154 @@ +/* + * 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 hichecker from '@ohos.hichecker' +import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' + +describe('HiCheckerTest', function () { + + beforeAll(function() { + console.info('HiCheckerTest beforeAll called') + }) + + afterAll(function() { + console.info('HiCheckerTest afterAll called') + }) + + beforeEach(function() { + console.info('HiCheckerTest beforeEach called'); + hichecker.removeRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS); + hichecker.removeRule(hichecker.RULE_CHECK_SLOW_EVENT); + hichecker.removeRule(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK); + hichecker.removeRule(hichecker.RULE_CAUTION_PRINT_LOG); + hichecker.removeRule(hichecker.RULE_CAUTION_TRIGGER_CRASH); + }) + + afterEach(function() { + console.info('HiCheckerTest afterEach called') + }) + + async function msleep(time) { + let promise = new Promise((resolve, reject) => { + setTimeout(() => resolve("done!"), time) + }); + let result = await promise; + } + + /** + * @tc.number + * @tc.name HiCheckerTest001 + * @tc.desc + */ + it('HiCheckerTest001', 0, async function (done) { + console.info('HiCheckerTest001 start'); + hichecker.addRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS); + let tmp = hichecker.contains(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS); + console.log('add rule success!'); + expect(tmp).assertTrue(); + done(); + }) + + /** + * @tc.number + * @tc.name HiCheckerTest002 + * @tc.desc + */ + it('HiCheckerTest002', 0, async function (done) { + console.info('HiCheckerTest002 start'); + hichecker.addRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT); + hichecker.addRule(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + console.log('add rule success!'); + expect(hichecker.contains(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS)).assertTrue(); + expect(hichecker.contains(hichecker.RULE_CHECK_SLOW_EVENT)).assertTrue(); + expect(hichecker.contains(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK)).assertTrue(); + expect(hichecker.contains(hichecker.RULE_CAUTION_PRINT_LOG)).assertTrue(); + expect(hichecker.contains(hichecker.RULE_CAUTION_TRIGGER_CRASH)).assertTrue(); + let tmp = (hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT | hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + expect(hichecker.getRule() == tmp).assertTrue(); + done(); + }) + + /** + * @tc.number + * @tc.name HiCheckerTest003 + * @tc.desc + */ + it('HiCheckerTest003', 0, async function (done) { + console.info('HiCheckerTest003 start'); + hichecker.addRule(-1); + console.log('add wrong rule!'); + expect(hichecker.contains(-1)).assertEqual(false); + hichecker.addRule(0); + console.log('add wrong rule!'); + expect(hichecker.contains(0)).assertEqual(false); + hichecker.addRule(999999); + console.log('add wrong rule!'); + expect(hichecker.contains(-1)).assertEqual(false); + done(); + }) + + /** + * @tc.number + * @tc.name HiCheckerTest004 + * @tc.desc + */ + it('HiCheckerTest004', 0, async function (done) { + console.info('HiCheckerTest004 start'); + hichecker.addRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS); + expect(hichecker.contains(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS)).assertTrue(); + console.log('add rule success!'); + hichecker.removeRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS); + expect(hichecker.contains(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS)).assertEqual(false); + done(); + }) + + /** + * @tc.number + * @tc.name HiCheckerTest005 + * @tc.desc + */ + it('HiCheckerTest005', 0, async function (done) { + console.info('HiCheckerTest005 start'); + hichecker.addRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT); + hichecker.addRule(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + console.log('add rule success!'); + let tmp = (hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + hichecker.removeRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT); + expect(hichecker.getRule() == tmp).assertTrue(); + hichecker.removeRule(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + expect(hichecker.getRule() == 0).assertTrue(); + done(); + }) + + /** + * @tc.number + * @tc.name HiCheckerTest006 + * @tc.desc + */ + it('HiCheckerTest006', 0, async function (done) { + console.info('HiCheckerTest006 start'); + hichecker.addRule(hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT); + hichecker.addRule(hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + console.log('add rule success!'); + let tmp = (hichecker.RULE_THREAD_CHECK_SLOW_PROCESS | hichecker.RULE_CHECK_SLOW_EVENT | hichecker.RULE_CHECK_ABILITY_CONNECTION_LEAK | hichecker.RULE_CAUTION_PRINT_LOG | hichecker.RULE_CAUTION_TRIGGER_CRASH); + hichecker.removeRule(-1); + expect(hichecker.getRule() == tmp).assertTrue(); + hichecker.removeRule(0); + expect(hichecker.getRule() == tmp).assertTrue(); + hichecker.removeRule(999999); + expect(hichecker.getRule() == tmp).assertTrue(); + done(); + }) + +}) diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/List.test.js b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/List.test.js new file mode 100755 index 0000000000000000000000000000000000000000..a8691f54e3cff52a29f8d57ae0687c379d504023 --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/js/default/test/List.test.js @@ -0,0 +1,15 @@ +/* + * 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('./HiChecker.test.js') diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/element/string.json b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/element/string.json new file mode 100755 index 0000000000000000000000000000000000000000..e86ea4f968856950f0b87b9046606fc5542d9aab --- /dev/null +++ b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/element/string.json @@ -0,0 +1,12 @@ +{ + "string": [ + { + "name": "app_name", + "value": "hichecker" + }, + { + "name": "mainability_description", + "value": "hap sample empty page" + } + ] +} diff --git a/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/media/icon.png b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/media/icon.png new file mode 100755 index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c Binary files /dev/null and b/hiviewdfx/hicheckertest/hicheckerjstest/src/main/resources/base/media/icon.png differ