From 45fd9b1bc77f9c828efe1ac20afd3ef429692f2c Mon Sep 17 00:00:00 2001 From: inter515 Date: Sat, 18 Jun 2022 17:23:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eapi=E7=94=A8=E4=BE=8B'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: inter515 --- .../js/test/ActsBmsAccessTokenTest.test.js | 28 +-- .../main/js/test/ActsBmsHapModuleTest.test.js | 3 + .../js/test/ActsBmsHasInstalldTest.test.js | 165 ++++++++++++++++++ .../entry/src/main/js/test/List.test.js | 4 +- .../src/main/js/test/ExampleJsunit.test.js | 37 +++- .../src/main/config.json | 1 + .../src/main/config.json | 1 + .../src/main/config.json | 1 + 8 files changed, 217 insertions(+), 23 deletions(-) create mode 100644 appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsHasInstalldTest.test.js diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsaccesstokentest/entry/src/main/js/test/ActsBmsAccessTokenTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsaccesstokentest/entry/src/main/js/test/ActsBmsAccessTokenTest.test.js index 8aa5e5532..2e66489f9 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsaccesstokentest/entry/src/main/js/test/ActsBmsAccessTokenTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsaccesstokentest/entry/src/main/js/test/ActsBmsAccessTokenTest.test.js @@ -67,9 +67,9 @@ describe('ActsBmsAccessTokenTest', function () { expect(bundleInfo.reqPermissions[1]).assertEqual("ohos.permission.BETA"); expect(bundleInfo.reqPermissions[2]).assertEqual("ohos.permission.KEEP_BACKGROUND_RUNNING"); expect(bundleInfo.reqPermissionStates.length).assertEqual(3); - expect(bundleInfo.reqPermissionStates[0]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[1]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[2]).assertEqual(0); + expect(bundleInfo.reqPermissionStates[0]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[1]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[2]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); done(); }).catch((err) => { expect(err).assertFail(); @@ -93,11 +93,11 @@ describe('ActsBmsAccessTokenTest', function () { expect(bundleInfo.reqPermissions[3]).assertEqual("ohos.permission.SYSTEM_FLOAT_WINDOW"); expect(bundleInfo.reqPermissions[4]).assertEqual("ohos.permission.USE_BLUETOOTH"); expect(bundleInfo.reqPermissionStates.length).assertEqual(5); - expect(bundleInfo.reqPermissionStates[0]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[1]).assertEqual(0); - expect(bundleInfo.reqPermissionStates[2]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[3]).assertEqual(0); - expect(bundleInfo.reqPermissionStates[4]).assertEqual(0); + expect(bundleInfo.reqPermissionStates[0]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[1]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); + expect(bundleInfo.reqPermissionStates[2]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[3]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); + expect(bundleInfo.reqPermissionStates[4]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); done(); }).catch((err) => { expect(err).assertFail(); @@ -122,12 +122,12 @@ describe('ActsBmsAccessTokenTest', function () { expect(bundleInfo.reqPermissions[4]).assertEqual("ohos.permission.SYSTEM_FLOAT_WINDOW"); expect(bundleInfo.reqPermissions[5]).assertEqual("ohos.permission.USE_BLUETOOTH"); expect(bundleInfo.reqPermissionStates.length).assertEqual(6); - expect(bundleInfo.reqPermissionStates[0]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[1]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[2]).assertEqual(0); - expect(bundleInfo.reqPermissionStates[3]).assertEqual(-1); - expect(bundleInfo.reqPermissionStates[4]).assertEqual(0); - expect(bundleInfo.reqPermissionStates[5]).assertEqual(0); + expect(bundleInfo.reqPermissionStates[0]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[1]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[2]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); + expect(bundleInfo.reqPermissionStates[3]).assertEqual(bundle.GrantStatus.PERMISSION_DENIED); + expect(bundleInfo.reqPermissionStates[4]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); + expect(bundleInfo.reqPermissionStates[5]).assertEqual(bundle.GrantStatus.PERMISSION_GRANTED); done(); }).catch((err) => { expect(err).assertFail(); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js index 8e928894d..712400f70 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmshapmoduletest/entry/src/main/js/test/ActsBmsHapModuleTest.test.js @@ -57,6 +57,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); + expect(hapModuleInfo.colorMode).assertEqual(-1); done(); } } @@ -121,6 +122,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); + expect(hapModuleInfo.colorMode).assertEqual(0); done(); } }); @@ -156,6 +158,7 @@ describe('ActsBmsHapModuleTest', function () { expect(hapModuleInfo.extensionAbilityInfo.length).assertEqual(0); expect(hapModuleInfo.metadata.length).assertEqual(0); expect(hapModuleInfo.installationFree).assertEqual(false); + expect(hapModuleInfo.colorMode).assertEqual(1); done(); } }); diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsHasInstalldTest.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsHasInstalldTest.test.js new file mode 100644 index 000000000..ec2e4476e --- /dev/null +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/ActsBmsHasInstalldTest.test.js @@ -0,0 +1,165 @@ +/* + * 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 pkg from '@system.package' +import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index' + +const NUM_TWO = 2; +const ERR_CODE = 202; +const ERR_MERSSAGE = 'value is not an available number'; + +describe('ActsBmsHasInstalldTest', function () { + + /** + * @tc.number hasInstalled_0100 + * @tc.name Package::hasInstalled + * @tc.desc Test hasInstalled interface. + */ + it('hasInstalled_0100', 0, async function (done) { + pkg.hasInstalled({ + bundleName: 'com.ohos.launcher', + success: function success(data) { + console.info('hasInstalled success function in'); + expect(data.result).assertTrue(); + done(); + }, + fail: function fail(data, code) { + console.info('hasInstalled fail function in'); + expect().assertFail(); + done(); + }, + complete: function complete() { + console.info('hasInstalled complete function in'); + expect().assertFail(); + done(); + } + }); + }); + + /** + * @tc.number hasInstalled_0200 + * @tc.name Package::hasInstalled + * @tc.desc Test hasInstalled interface. + */ + it('hasInstalled_0200', 0, async function (done) { + pkg.hasInstalled({ + bundleName: 'wrongName', + success: function success(data) { + console.info('hasInstalled success function in'); + expect(data.result).assertFalse(); + done(); + }, + fail: function fail(data, code) { + console.info('hasInstalled fail function in'); + expect().assertFail(); + done(); + }, + complete: function complete() { + console.info('hasInstalled complete function in'); + expect().assertFail(); + done(); + } + }); + }); + + /** + * @tc.number hasInstalled_0300 + * @tc.name Package::hasInstalled + * @tc.desc Test hasInstalled interface. + */ + it('hasInstalled_0300', 0, async function (done) { + pkg.hasInstalled({ + bundleName: 'wrongName', + success: function success(data) { + console.info('hasInstalled success function in'); + expect(data.result).assertFalse(); + done(); + } + }); + }); + + /** + * @tc.number hasInstalled_0400 + * @tc.name Package::hasInstalled + * @tc.desc Test hasInstalled interface. + */ + it('hasInstalled_0400', 0, async function (done) { + let flag = 0; + pkg.hasInstalled({ + bundleName: NUM_TWO, + success: function success(data) { + console.info('hasInstalled success function in'); + expect().assertFail(); + done(); + }, + fail: function fail(data, code) { + flag += 2; + console.info('hasInstalled fail function in'); + expect(data).assertEqual(ERR_MERSSAGE); + expect(code).assertEqual(ERR_CODE); + }, + complete: function complete() { + flag += 3; + console.info('hasInstalled complete function in'); + expect(flag).assertEqual(5) + done(); + } + }); + }); + + /* + * @tc.number: hasInstalled_0500 + * @tc.name: test hasInstalled bundleName is number + * @tc.desc: test hasInstalled bundleName is number without function fail + * @tc.level 3 + */ + it('hasInstalled_0500', 0, async function (done) { + pkg.hasInstalled({ + bundleName: NUM_TWO, + success: function success(data) { + console.info('hasInstalled success' + JSON.stringify(data)); + expect(error).assertFail(); + done(); + }, + complete: function complete() { + console.info('hasInstalled complete'); + done(); + } + }) + }); + + /* + * @tc.number: hasInstalled_0600 + * @tc.name: test hasInstalled bundleName is number + * @tc.desc: test hasInstalled bundleName is number without function complete + * @tc.level 3 + */ + it('hasInstalled_0600', 0, async function (done) { + pkg.hasInstalled({ + bundleName: NUM_TWO, + success: function success(data) { + console.info('hasInstalled success' + JSON.stringify(data)); + expect(error).assertFail(); + done(); + }, + fail: function fail(data, code) { + console.info('hasInstalled fail'); + expect(data).assertEqual("value is not an available number"); + expect(code).assertEqual(202); + done(); + } + }) + }); +}) \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/List.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/List.test.js index 6cadb5202..1bb3c4615 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/List.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbmsjstest/entry/src/main/js/test/List.test.js @@ -12,4 +12,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -require('./ActsBmsJsTest.test.js') \ No newline at end of file + +require('./ActsBmsJsTest.test.js') +require('./ActsBmsHasInstalldTest.test.js') \ No newline at end of file diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js index 18dd8e311..74ba8735a 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/test/ExampleJsunit.test.js @@ -106,7 +106,7 @@ describe('ActsBundleManagerTest', function () { * @tc.desc Test getBundleInfo interfaces with one hap. */ it('getBundleInfo_0600', 0, async function (done) { - await demo.getBundleInfo(NAME1, demo.BundleFlag.GET_BUNDLE_WITH_ABILITIES, OnReceiveEvent); + await demo.getBundleInfo(NAME1, demo.BundleFlag.GET_BUNDLE_WITH_ABILITIES|demo.BundleFlag.GET_ABILITY_INFO_WITH_DISABLE , OnReceiveEvent); function OnReceiveEvent(err, datainfo) { console.info("getBundleInfo_0600 dataInfo ====" + datainfo); expect(datainfo.name).assertEqual(NAME1); @@ -1074,7 +1074,7 @@ describe('ActsBundleManagerTest', function () { expect(datainfo.icon).assertEqual("$media:icon"); expect(datainfo.moduleName).assertEqual("entry"); expect(datainfo.bundleName).assertEqual(NAME2); - expect(datainfo.orientation).assertEqual(1); + expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.LANDSCAPE); expect(datainfo.launchMode).assertEqual(demo.LaunchMode.SINGLETON); expect(datainfo.applicationInfo.name).assertEqual(NAME2); expect(datainfo.applicationInfo.description).assertEqual(DESCRIPTION); @@ -1113,6 +1113,7 @@ describe('ActsBundleManagerTest', function () { expect(datainfo.icon).assertEqual("$media:icon"); expect(datainfo.moduleName).assertEqual("entry"); expect(datainfo.bundleName).assertEqual(NAME3); + expect(datainfo.type).assertEqual(demo.AbilityType.PAGE); expect(datainfo.applicationInfo.name).assertEqual(NAME3); expect(datainfo.applicationInfo.description).assertEqual(DESCRIPTION); expect(datainfo.applicationInfo.descriptionId >= 0).assertTrue(); @@ -1122,7 +1123,7 @@ describe('ActsBundleManagerTest', function () { expect(datainfo.applicationInfo.labelId >= 0).assertTrue(); expect(datainfo.applicationInfo.systemApp).assertEqual(true); expect(datainfo.applicationInfo.supportedModes).assertEqual(0); - expect(datainfo.orientation).assertEqual(2); + expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.PORTRAIT); expect(datainfo.applicationInfo.enabled).assertEqual(true); for (let j = 0; j < datainfo.applicationInfo.moduleInfos.length; j++) { expect(datainfo.applicationInfo.moduleInfos[j].moduleName).assertEqual("entry"); @@ -1131,14 +1132,16 @@ describe('ActsBundleManagerTest', function () { } if (datainfo.bundleName == NAME4) { expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility"); + expect(datainfo.type).assertEqual(demo.AbilityType.DATA); expect(datainfo.bundleName).assertEqual(NAME4); - expect(datainfo.orientation).assertEqual(3); + expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.FOLLOW_RECENT); queryResultCount++; } if (datainfo.bundleName == NAME5) { expect(datainfo.name).assertEqual("com.example.myapplication.MainAbility"); + expect(datainfo.type).assertEqual(demo.AbilityType.PAGE); expect(datainfo.bundleName).assertEqual(NAME5); - expect(datainfo.orientation).assertEqual(0); + expect(datainfo.orientation).assertEqual(demo.DisplayOrientation.UNSPECIFIED); queryResultCount++; } } @@ -1347,8 +1350,25 @@ describe('ActsBundleManagerTest', function () { * @tc.desc Test install errcode STATUS_FAILED_NO_SPACE_LEFT. */ it('installErrCodeTest_0100', 0, async function (done) { + expect(demo.InstallErrorCode.SUCCESS).assertEqual(0); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE).assertEqual(1); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_ABORTED).assertEqual(2); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_INVALID).assertEqual(3); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_CONFLICT).assertEqual(4); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_STORAGE).assertEqual(5); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_INCOMPATIBLE).assertEqual(6); + expect(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE).assertEqual(7); + expect(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE_BLOCKED).assertEqual(8); + expect(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE_ABORTED).assertEqual(9); + expect(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE_CONFLICT).assertEqual(10); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_DOWNLOAD_TIMEOUT).assertEqual(11); + expect(demo.InstallErrorCode.STATUS_INSTALL_FAILURE_DOWNLOAD_FAILED).assertEqual(12); + expect(demo.InstallErrorCode.STATUS_ABILITY_NOT_FOUND).assertEqual(64); + expect(demo.InstallErrorCode.STATUS_BMS_SERVICE_ERROR).assertEqual(65); expect(demo.InstallErrorCode.STATUS_FAILED_NO_SPACE_LEFT).assertEqual(66); - expect(demo.AbilitySubType.CA).assertEqual(1); + expect(demo.InstallErrorCode.STATUS_GRANT_REQUEST_PERMISSIONS_FAILED).assertEqual(67); + expect(demo.InstallErrorCode.STATUS_INSTALL_PERMISSION_DENIED).assertEqual(68); + expect(demo.InstallErrorCode.STATUS_UNINSTALL_PERMISSION_DENIED).assertEqual(69); done(); }) @@ -1357,8 +1377,9 @@ describe('ActsBundleManagerTest', function () { * @tc.name InstallErrorCode::STATUS_FAILED_NO_SPACE_LEFT * @tc.desc Test install errcode STATUS_FAILED_NO_SPACE_LEFT. */ - it('installErrCodeTest_0200', 0, async function (done) { - expect(demo.InstallErrorCode.STATUS_GRANT_REQUEST_PERMISSIONS_FAILED).assertEqual(67); + it('AbilityTypeTest_0100', 0, async function (done) { + expect(demo.AbilitySubType.CA).assertEqual(1); + expect(demo.AbilityType.UNKNOWN).assertEqual(0); done(); }) }) diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json index b08fd6a19..4083217bc 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfosfifthscene/src/main/config.json @@ -14,6 +14,7 @@ }, "deviceConfig": {}, "module": { + "colorMode": "light", "package": "com.example.third5", "name": ".BmsThirdBundle5", "mainAbility": "com.example.third5.AMainAbility", diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/src/main/config.json index 10db86225..bd95aa77d 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/src/main/config.json +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsgetinfossecondscene/src/main/config.json @@ -14,6 +14,7 @@ }, "deviceConfig": {}, "module": { + "colorMode": "dark", "package": "com.example.third2", "name": ".MyApplication", "deviceType": [ diff --git a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/src/main/config.json b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/src/main/config.json index 93e6b5b66..e1f1afbb8 100644 --- a/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/src/main/config.json +++ b/appexecfwk/bundle_standard/bundlemanager/sceneProject/bmsmainabilityfirstscene/src/main/config.json @@ -14,6 +14,7 @@ }, "deviceConfig": {}, "module": { + "colorMode": "auto", "package": "com.example.bmsmainabilityfirstscene", "mainAbility": "com.example.bmsmainabilityfirstscene.MainAbility", "name": ".MyApplication", -- GitLab