!5352 【账号】接口属性覆盖

Merge pull request !5352 from 何海涛/master

account/appaccount/BUILD.gn

@@ -18,6 +18,7 @@ group("appaccount_hap") {
   if (is_standard_system) {
     deps = [
       "actsaccounttest:ActsAccountTest",
+      "actsaccounttstest:ActsAccountTsTest",
       "actsgetallaccounts:ActsGetAllAccountsTest",
       "actssetchecksyncenable:ActsSetCheckSyncEnableTest",
       "getallaccessibleaccounts:accessibleaccounts",

account/appaccount/actsaccounttest/src/main/js/test/AssociatedData.test.js

@@ -1161,5 +1161,35 @@ export default function ActsAccountAssociatedData() {
                 }
             }
         })
+
+
+        /*
+        * @tc.number    : ActsAccountAssociatedData_3100
+        * @tc.name      : The correct calls setAssociatedData and getAssociatedData get the value
+        * @tc.desc      : The setAssociatedData setting valueis called when the forwarding parameters
+        *                 are correct, and then getAssociatedData is called for the value(callback)
+        */
+        it('ActsAccountAssociatedData_3100', 0, async function (done) {
+            console.debug("====>ActsAccountAssociatedData_3100 start====");
+            var appAccountManager = account.createAppAccountManager();
+            console.debug("====>creat finish====");
+            appAccountManager.addAccount("account_name_3100",(err)=>{
+                console.debug("====>add ActsAccountAssociatedData_3100 err:" + JSON.stringify(err));
+                expect(err).assertEqual(null);
+                appAccountManager.setAssociatedData("account_name_3100", "key31", "value31", (err)=>{
+                    console.debug("====>setAssociatedData ActsAccountAssociatedData_3100 err:" + JSON.stringify(err));
+                    expect(err).assertEqual(null);
+                    var result = appAccountManager.getAssociatedDataSync("account_name_3100", "key31")
+                    console.debug("====>getAssociatedData ActsAccountAssociatedData_3100 result:" + JSON.stringify(result));
+                    expect(result).assertEqual("value31");
+                    appAccountManager.deleteAccount("account_name_3100", (err)=>{
+                        console.debug("====>delete Account 0100 err:" + JSON.stringify(err));
+                        expect(err).assertEqual(null);
+                        console.debug("====>ActsAccountAssociatedData_3100 end====");
+                        done();
+                    });
+                });
+            });
+        });
     })
 }
\ No newline at end of file

account/appaccount/actsaccounttstest/AppScope/app.json

+{
+    "app": {
+        "bundleName": "com.example.accounttstest",
+        "vendor": "huawei",
+        "versionCode": 1000000,
+        "versionName": "1.0.0",
+        "debug": false,
+        "icon": "$media:icon",
+        "label": "$string:app_name",
+        "description": "$string:description_application",
+        "distributedNotificationEnabled": true,
+        "keepAlive": true,
+        "singleUser": true,
+        "minAPIVersion": 9,
+        "targetAPIVersion": 9,
+        "car": {
+            "apiCompatibleVersion": 9,
+            "singleUser": false
+        }
+    }
+}

account/appaccount/actsaccounttstest/AppScope/resources/base/element/string.json

+{
+ "string":[
+    {
+      "name":"app_name",
+      "value":"ohosProject"
+    }
+  ]
+}      
\ No newline at end of file

account/appaccount/actsaccounttstest/BUILD.gn

+# 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("//test/xts/tools/build/suite.gni")
+
+ohos_js_hap_suite("ActsAccountTsTest") {
+  hap_profile = "./entry/src/main/module.json"
+  js_build_mode = "debug"
+  deps = [
+    ":accounttstest_js_assets",
+    ":accounttstest_resources",
+  ]
+  ets2abc = true
+  certificate_profile = "signature/openharmony_sx.p7b"
+  hap_name = "ActsAccountTsTest"
+  part_name = "accessibility"
+  subsystem_name = "barrierfree"
+}
+
+ohos_app_scope("accounttstest_app_profile") {
+  app_profile = "AppScope/app.json"
+  sources = [ "AppScope/resources" ]
+}
+
+ohos_js_assets("accounttstest_js_assets") {
+  source_dir = "./entry/src/main/ets"
+}
+
+ohos_resources("accounttstest_resources") {
+  sources = [ "./entry/src/main/resources" ]
+  deps = [ ":accounttstest_app_profile" ]
+  hap_profile = "./entry/src/main/module.json"
+}

account/appaccount/actsaccounttstest/Test.json

+{
+    "description": "Configuration for hjunit demo Tests",
+    "driver": {
+        "type": "OHJSUnitTest",
+        "test-timeout": "180000",
+        "bundle-name": "com.example.accounttstest",
+        "module-name": "phone",
+        "shell-timeout": "180000",
+        "testcase-timeout": 70000
+    },
+    "kits": [
+        {
+            "test-file-name": [
+                "ActsAccountTsTest.hap"
+            ],
+            "type": "AppInstallKit",
+            "cleanup-apps": true
+        },
+        {
+            "type": "ShellKit",
+            "teardown-command":[
+                "bm uninstall -n com.example.accounttstest"
+            ]
+        }
+    ]
+}

account/appaccount/actsaccounttstest/entry/src/main/ets/Application/AbilityStage.ts

+import AbilityStage from "@ohos.application.AbilityStage"
+
+export default class MyAbilityStage extends AbilityStage {
+    onCreate() {
+        console.log("[Demo] MyAbilityStage onCreate")
+    }
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/MainAbility.ts

+/*
+ * 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 Ability from '@ohos.application.Ability'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+import { Hypium } from '@ohos/hypium'
+import testsuite from '../test/List.test'
+
+export default class MainAbility extends Ability {
+    onCreate(want,launchParam){
+        // Ability is creating, initialize resources for this ability
+        console.log("[Demo] MainAbility onCreate")
+        globalThis.abilityWant = want;
+        var abilityDelegator: any
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var abilityDelegatorArguments: any
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        console.info('start run testcase!!!')
+        Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
+    }
+
+    onDestroy() {
+        // Ability is destroying, release resources for this ability
+        console.log("[Demo] MainAbility onDestroy")
+    }
+
+    onWindowStageCreate(windowStage) {
+        // Main window is created, set main page for this ability
+        console.log("[Demo] MainAbility onWindowStageCreate windowStage=" + windowStage)
+        //globalThis.windowStage = windowStage
+        //globalThis.abilityStorage = this.storage
+        globalThis.abilityContext = this.context
+        windowStage.setUIContent(this.context, "MainAbility/pages/index/index", null)
+    }
+
+    onWindowStageDestroy() {
+        //Main window is destroyed, release UI related resources
+        console.log("[Demo] MainAbility onWindowStageDestroy")
+    }
+
+    onForeground() {
+        // Ability has brought to foreground
+        console.log("[Demo] MainAbility onForeground")
+    }
+
+    onBackground() {
+        // Ability has back to background
+        console.log("[Demo] MainAbility onBackground")
+    }
+};
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/MainAbility/pages/index/index.ets

+/*
+ * 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 router from '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+    @State message: string = 'accessibilityEvent For Gesture';
+
+    aboutToAppear(){
+        console.info("start run testcase!!!!");
+    }
+
+    build() {
+        Row() {
+            Column() {
+                Text(this.message)
+                    .fontSize(50)
+                    .fontWeight(FontWeight.Bold)
+            }
+            .width('100%')
+        }
+        .height('100%')
+    }
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/TestAbility.ts

+/*
+ * 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 Ability from '@ohos.application.Ability'
+
+export default class TestAbility extends Ability {
+    onCreate(want, launchParam) {
+        console.log('TestAbility onCreate')
+    }
+
+    onDestroy() {
+        console.log('TestAbility onDestroy')
+    }
+
+    onWindowStageCreate(windowStage) {
+        console.log('TestAbility onWindowStageCreate')
+        windowStage.loadContent("TestAbility/pages/index", (err, data) => {
+            if (err.code) {
+                console.error('Failed to load the content. Cause:' + JSON.stringify(err));
+                return;
+            }
+            console.info('Succeeded in loading the content. Data: ' + JSON.stringify(data))
+        });
+
+        globalThis.abilityContext = this.context;
+    }
+
+    onWindowStageDestroy() {
+        console.log('TestAbility onWindowStageDestroy')
+    }
+
+    onForeground() {
+        console.log('TestAbility onForeground')
+    }
+
+    onBackground() {
+        console.log('TestAbility onBackground')
+    }
+};
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/TestAbility/pages/index.ets

+/*
+ * 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 router from '@ohos.router';
+
+@Entry
+@Component
+struct Index {
+  aboutToAppear() {
+    console.info('TestAbility index aboutToAppear')
+  }
+ @State message: string = 'Hello World'
+   build() {
+         Row() {
+           Column() {
+             Text(this.message)
+               .fontSize(50)
+               .fontWeight(FontWeight.Bold)
+             Button() {
+               Text('next page')
+                 .fontSize(20)
+                 .fontWeight(FontWeight.Bold)
+             }.type(ButtonType.Capsule)
+             .margin({
+               top: 20
+             })
+             .backgroundColor('#0D9FFB')
+             .width('35%')
+             .height('5%')
+             .onClick(()=>{
+             })
+           }
+             .width('100%')
+         }
+             .height('100%')
+   }
+ }
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts

+/*
+ * 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 TestRunner from '@ohos.application.testRunner'
+import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
+
+var abilityDelegator = undefined
+var abilityDelegatorArguments = undefined
+
+function translateParamsToString(parameters) {
+    const keySet = new Set([
+        '-s class', '-s notClass', '-s suite', '-s it',
+        '-s level', '-s testType', '-s size', '-s timeout',
+        '-s dryRun'
+    ])
+    let targetParams = '';
+    for (const key in parameters) {
+        if (keySet.has(key)) {
+            targetParams = `${targetParams} ${key} ${parameters[key]}`
+        }
+    }
+    return targetParams.trim()
+}
+
+async function onAbilityCreateCallback() {
+    console.log("onAbilityCreateCallback");
+}
+
+async function addAbilityMonitorCallback(err: any) {
+    console.info("addAbilityMonitorCallback : " + JSON.stringify(err))
+}
+
+export default class OpenHarmonyTestRunner implements TestRunner {
+    constructor() {
+    }
+
+    onPrepare() {
+        console.info("OpenHarmonyTestRunner OnPrepare ")
+    }
+
+    async onRun() {
+        console.log('OpenHarmonyTestRunner onRun run')
+        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
+        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
+        var testAbilityName = abilityDelegatorArguments.bundleName + '.MainAbility'
+        let lMonitor = {
+            abilityName: testAbilityName,
+            onAbilityCreate: onAbilityCreateCallback,
+        };
+        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
+        var cmd = 'aa start -d 0 -a com.example.accounttstest.MainAbility' + ' -b ' + abilityDelegatorArguments.bundleName
+        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
+        var debug = abilityDelegatorArguments.parameters["-D"]
+        if (debug == 'true')
+        {
+            cmd += ' -D'
+        }
+        console.info('cmd : '+cmd)
+        abilityDelegator.executeShellCommand(cmd,
+            (err: any, d: any) => {
+                console.info('executeShellCommand : err : ' + JSON.stringify(err));
+                console.info('executeShellCommand : data : ' + d.stdResult);
+                console.info('executeShellCommand : data : ' + d.exitCode);
+            })
+        console.info('OpenHarmonyTestRunner onRun end')
+    }
+};
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/test/List.test.ets

+/*
+ * 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 oauthTokenInfoTest from './OAuthTokenInfoTest.test.ets'
+
+export default function testsuite() {
+    oauthTokenInfoTest()
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/ets/test/OAuthTokenInfoTest.test.ets

+/*
+ * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
+import appAccount from "@ohos.account.appAccount"
+
+export default function oauthTokenInfoTest() {
+    describe('OAuthTokenInfoTest', function () {
+        beforeAll(async function (done) {
+            console.info('AccountTsTest: beforeAll');
+            done();
+        })
+
+        afterAll(async function (done) {
+            console.info('AccountTsTest: afterAll');
+            done();
+        })
+
+        beforeEach(async function (done) {
+            console.info('AccountTsTest: beforeEach');
+            done();
+        })
+
+        afterEach(async function (done) {
+            console.info('AccountTsTest: afterEach');
+            done();
+        })
+
+        /*
+         * @tc.number  OAuthTokenInfoTest_0100
+         * @tc.name    OAuthTokenInfoTest_0100
+         * @tc.desc    OAuthTokenInfo without account. 
+         * @tc.size    SmallTest
+         * @tc.type    User
+         */
+        it('OAuthTokenInfoTest_0100', 0, async function (done) {
+            let info : appAccount.OAuthTokenInfo = {
+                authType: "getSocialData",
+                token: "xxxxx"
+            }
+            console.log("OAuthTokenInfoTest_0100 info: " + JSON.stringify(info));
+            expect(info.hasOwnProperty("accounts")).assertEqual(false)
+            expect(info.hasOwnProperty("account")).assertEqual(false)
+            done()
+        })
+
+        /*
+         * @tc.number  OAuthTokenInfoTest_0200
+         * @tc.name    OAuthTokenInfoTest_0200
+         * @tc.desc    OAuthTokenInfo with account. 
+         * @tc.size    SmallTest
+         * @tc.type    User
+         */
+        it('OAuthTokenInfoTest_0200', 0, async function (done) {
+            let info : appAccount.OAuthTokenInfo = {
+                authType: "getSocialData",
+                token: "xxxxx",
+                account: {
+                    name: "zhangsan",
+                    owner: "com.ohos.testapp"
+                }
+            }
+            console.log("OAuthTokenInfoTest_0200 info: " + JSON.stringify(info))
+            expect(info.hasOwnProperty("accounts")).assertEqual(false)
+            expect(info.hasOwnProperty("account")).assertEqual(true)
+            expect(info.account.owner).assertEqual("com.ohos.testapp")
+            done();
+        })
+    })
+}

account/appaccount/actsaccounttstest/entry/src/main/module.json

+{
+    "module": {
+        "name": "phone",
+        "type": "entry",
+        "srcEntrance": "./ets/Application/AbilityStage.ts",
+        "description": "$string:phone_entry_dsc",
+        "mainElement": "MainAbility",
+        "deviceTypes": [
+            "phone"
+        ],
+        "deliveryWithInstall": true,
+        "installationFree": false,
+        "uiSyntax": "ets",
+        "pages": "$profile:main_pages",
+        "abilities": [{
+            "name": "com.example.accounttstest.MainAbility",
+            "srcEntrance": "./ets/MainAbility/MainAbility.ts",
+            "description": "$string:phone_entry_main",
+            "icon": "$media:icon",
+            "label": "$string:entry_label",
+            "visible": true,
+            "orientation": "portrait",
+            "skills": [{
+                "actions": [
+                    "action.system.home"
+                ],
+                "entities": [
+                    "entity.system.home"
+                ]
+            }]
+        }]
+    }
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/resources/base/element/string.json

+{
+    "string":  [
+        {
+            "name": "phone_entry_dsc",
+            "value": "i am an entry for phone"
+        },
+        {
+            "name": "phone_entry_main",
+            "value": "the phone entry ability"
+        },
+        {
+            "name": "entry_label",
+            "value": "AccountTsTest"
+        },
+        {
+            "name": "form_description",
+            "value": "my form"
+        },
+        {
+            "name": "serviceability_description",
+            "value": "my whether"
+        },
+        {
+            "name": "description_application",
+            "value": "demo for test"
+        },
+        {
+            "name": "app_name",
+            "value": "Demo"
+        },
+        {
+            "name": "AccountTsTest_desc",
+            "value": "AccountTsTest_description"
+        },
+        {
+            "name": "AccountTsTest_label",
+            "value": "AccountTsTest"
+        }
+    ]
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/resources/base/profile/accessibility_config.json

+{
+  "accessibilityCapabilities": [
+    "retrieve",
+    "touchGuide",
+    "gesture"
+  ],
+  "accessibilityCapabilityRationale": "a11y_rationale",
+  "settingsAbility": "com.accessibility.voiceaid.voiceAidSetting"
+}
\ No newline at end of file

account/appaccount/actsaccounttstest/entry/src/main/resources/base/profile/main_pages.json

+{
+    "src": [
+        "MainAbility/pages/index/index"
+    ]
+}