!5729 settingsdata接口新增ohos.permission.MANAGE_SECURE_SETTINGS权限管控机制，用例需适配、蓝区用例路径整改

Merge pull request !5729 from 安宁/OpenHarmony-3.2-Beta3

!5729 settingsdata接口新增ohos.permission.MANAGE_SECURE_SETTINGS权限管控机制，用例需适配、蓝区用例路径整改
Merge pull request !5729 from 安宁/OpenHarmony-3.2-Beta3
d1a68eb3 · openharmony_ci · Gitee · f164da1c · 00d00cfe · d1a68eb3
16 changed file
--- a/applications/BUILD.gn
+++ b/applications/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.
+group("applications") {
+  testonly = true
+  deps = [ "settingsdata:settingsdata" ]
+}
--- a/settingsdata/BUILD.gn
+++ b/settingsdata/BUILD.gn
--- a/settingsdata/settings_ets/BUILD.gn
+++ b/settingsdata/settings_ets/BUILD.gn
@@ -9,7 +9,7 @@
 # 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")

--- a/settingsdata/settings_ets/Test.json
+++ b/settingsdata/settings_ets/Test.json
 {
    "description": "Configuration for settings Tests",
    "driver": {
        "type": "OHJSUnitTest",
        "test-timeout": "600000",
        "bundle-name": "com.open.harmony.settings",
        "package-name": "com.open.harmony.settings",
        "shell-timeout": "600000"
    },
    "kits": [
        {
            "test-file-name": [
                "ActsSettingsEtsTest.hap"
            ],
            "type": "AppInstallKit",
            "cleanup-apps": true
        }
    ]
 }
--- a/settingsdata/settings_ets/entry/src/main/config.json
+++ b/settingsdata/settings_ets/entry/src/main/config.json
 {
  "app": {
    "bundleName": "com.open.harmony.settings",
    "vendor": "open",
    "version": {
      "code": 1000000,
      "name": "1.0.0"
    },
    "apiVersion": {
      "compatible": 7,
      "releaseType": "Release",
      "target": 7
    }
  },
  "deviceConfig": {},
  "module": {
    "package": "com.open.harmony.settings",
    "name": ".MyApplication",
    "mainAbility": "com.open.harmony.settings.MainAbility",
    "srcPath": "",
    "deviceType": [
      "phone"
    ],
    "distro": {
      "deliveryWithInstall": true,
      "moduleName": "entry",
      "moduleType": "entry",
      "installationFree": false
    },
    "abilities": [
      {
        "skills": [
          {
            "entities": [
              "entity.system.home"
            ],
            "actions": [
              "action.system.home"
            ]
          }
        ],
        "orientation": "unspecified",
        "visible": true,
        "srcPath": "MainAbility",
        "name": ".MainAbility",
        "srcLanguage": "ets",
        "icon": "$media:icon",
        "description": "$string:description_mainability",
        "formsEnabled": false,
        "label": "$string:entry_MainAbility",
        "type": "page",
        "launchType": "standard"
      },
      {
        "orientation": "unspecified",
        "visible": true,
        "srcPath": "TestAbility",
        "name": ".TestAbility",
        "srcLanguage": "ets",
        "icon": "$media:icon",
        "description": "$string:TestAbility_desc",
        "formsEnabled": false,
        "label": "$string:TestAbility_label",
        "type": "page",
        "launchType": "standard"
      }
    ],
-    "js": [
+	"reqPermissions": [
-      {
+		{
-        "mode": {
+			"name":"ohos.permission.MANAGE_SECURE_SETTINGS",
-          "syntax": "ets",
+			"reason":"need use ohos.permission.,MANAGE_SECURE_SETTINGS"
-          "type": "pageAbility"
+		}
-        },
+	],
-        "pages": [
+    "js": [
-          "pages/index"
+      {
-        ],
+        "mode": {
-        "name": ".MainAbility",
+          "syntax": "ets",
-        "window": {
+          "type": "pageAbility"
-          "designWidth": 720,
+        },
-          "autoDesignWidth": false
+        "pages": [
-        }
+          "pages/index"
-      },
+        ],
-      {
+        "name": ".MainAbility",
-        "mode": {
+        "window": {
-          "syntax": "ets",
+          "designWidth": 720,
-          "type": "pageAbility"
+          "autoDesignWidth": false
-        },
+        }
-        "pages": [
+      },
-          "pages/index"
+      {
-        ],
+        "mode": {
-        "name": ".TestAbility",
+          "syntax": "ets",
-        "window": {
+          "type": "pageAbility"
-          "designWidth": 720,
+        },
-          "autoDesignWidth": false
+        "pages": [
-        }
+          "pages/index"
-      }
+        ],
-    ]
+        "name": ".TestAbility",
-  }
+        "window": {
-}
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
--- a/settingsdata/settings_ets/entry/src/main/ets/MainAbility/app.ets
+++ b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/app.ets
 /**
 * 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('Application onCreate')
  },
  onDestroy() {
    console.info('Application onDestroy')
  },
 }
\ No newline at end of file
--- a/settingsdata/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets
+++ b/settingsdata/settings_ets/entry/src/main/ets/MainAbility/pages/index.ets
 // @ts-nocheck
 /**
 * 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.
 */
 @Entry
 @Component
 struct MyComponent {
  aboutToAppear() {
  }
  build() {
    Flex({
      direction: FlexDirection.Column,
      alignItems: ItemAlign.Center,
      justifyContent: FlexAlign.Center
    }) {
      Text('Settings ETS TEST')
        .fontSize(50)
        .fontWeight(FontWeight.Bold)
    }
    .width('100%')
    .height('100%')
  }
 }
--- a/settingsdata/settings_ets/entry/src/main/ets/TestAbility/app.ets
+++ b/settingsdata/settings_ets/entry/src/main/ets/TestAbility/app.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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
 import { Hypium } from 'hypium/index'
 import testsuite from '../test/List.test'
 export default {
  onCreate() {
    console.info('Application onCreate')
    var abilityDelegator: any
    abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
    var abilityDelegatorArguments: any
    abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
    console.info('start run testcase!!!')
    Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
  },
  onDestroy() {
    console.info('Application onDestroy')
  },
 }
\ No newline at end of file
--- a/settingsdata/settings_ets/entry/src/main/ets/TestAbility/pages/index.ets
+++ b/settingsdata/settings_ets/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 '@system.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
--- a/settingsdata/settings_ets/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts
+++ b/settingsdata/settings_ets/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 itName',
        '-s level', '-s testType', '-s size', '-s timeout',
        '-s package'
    ])
    let targetParams = '';
    for (const key in parameters) {
        if (keySet.has(key)) {
            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')
    }
    onRun() {
        console.log('OpenHarmonyTestRunner onRun run')
        abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
        abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
        let lMonitor = {
            abilityName: testAbilityName,
            onAbilityCreate: onAbilityCreateCallback,
        };
        var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.TestAbility'
        abilityDelegator.addAbilityMonitor(lMonitor, addAbilityMonitorCallback)
        var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
        cmd += ' '+translateParamsToString(abilityDelegatorArguments.parameters)
        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 call abilityDelegator.getAppContext')
        var context = abilityDelegator.getAppContext()
        console.info('getAppContext : ' + JSON.stringify(context))
        console.info('OpenHarmonyTestRunner onRun end')
    }
 };
\ No newline at end of file
--- a/settingsdata/settings_ets/entry/src/main/ets/test/List.test.ets
+++ b/settingsdata/settings_ets/entry/src/main/ets/test/List.test.ets
 /**
 * 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 settingUiJsunit from './SettingUiJsunit.test.ets';
 export default function testsuite() {
  settingUiJsunit();
 }
\ No newline at end of file
--- a/settingsdata/settings_ets/entry/src/main/ets/test/SettingUiJsunit.test.ets
+++ b/settingsdata/settings_ets/entry/src/main/ets/test/SettingUiJsunit.test.ets
--- a/settingsdata/settings_ets/entry/src/main/resources/base/element/string.json
+++ b/settingsdata/settings_ets/entry/src/main/resources/base/element/string.json
 {
  "string": [
    {
      "name": "entry_MainAbility",
      "value": "entry_MainAbility"
    },
    {
      "name": "description_mainability",
      "value": "ETS_Empty Ability"
    },
    {
      "name": "TestAbility_desc",
      "value": "description"
    },
    {
      "name": "TestAbility_label",
      "value": "label"
    }
  ]
 }
\ No newline at end of file
--- a/settingsdata/settings_ets/entry/src/main/resources/base/media/icon.png
+++ b/settingsdata/settings_ets/entry/src/main/resources/base/media/icon.png
--- a/settingsdata/settings_ets/signature/openharmony_sx.p7b
+++ b/settingsdata/settings_ets/signature/openharmony_sx.p7b
--- a/test_packages.gni
+++ b/test_packages.gni
@@ -47,6 +47,7 @@ _all_test_packages = [
  "${ACTS_ROOT}/barrierfree:barrierfree",
  "${ACTS_ROOT}/customization:customization",
  "${ACTS_ROOT}/distributedschedule:systemabilitymgr",
+  "${ACTS_ROOT}/applications:applications",
 ]
 _all_test_packages_ivi = [