diff --git a/accessControl/BUILD.gn b/accessControl/BUILD.gn new file mode 100644 index 0000000000000000000000000000000000000000..4ed34438de79f09d94dbd7e12db436277d34b060 --- /dev/null +++ b/accessControl/BUILD.gn @@ -0,0 +1,23 @@ +# 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("//build/ohos_var.gni") +import("//test/xts/tools/build/suite.gni") + +group("accessControl") { + testonly = true + if (is_standard_system) { + deps = [ + "access_token/AccessTokenTest_Normal_js:ActsAccessTokenApiJSNormalTest", + ] + } +} diff --git a/security/access_token/AccessTokenTest_Normal_js/BUILD.gn b/accessControl/access_token/AccessTokenTest_Normal_js/BUILD.gn similarity index 96% rename from security/access_token/AccessTokenTest_Normal_js/BUILD.gn rename to accessControl/access_token/AccessTokenTest_Normal_js/BUILD.gn index 07ff1ae83778a1799373070cba8cb201ca5a4f12..051b118db249a99cb7b311e01cbe44bb57c40a96 100644 --- a/security/access_token/AccessTokenTest_Normal_js/BUILD.gn +++ b/accessControl/access_token/AccessTokenTest_Normal_js/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (C) 2021 Huawei Device Co., Ltd. +# 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 @@ -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. +# limitations under the License. import("//test/xts/tools/build/suite.gni") diff --git a/security/access_token/AccessTokenTest_Normal_js/Test.json b/accessControl/access_token/AccessTokenTest_Normal_js/Test.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/Test.json rename to accessControl/access_token/AccessTokenTest_Normal_js/Test.json diff --git a/security/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b b/accessControl/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b rename to accessControl/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/config.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/config.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/config.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/config.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js similarity index 94% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js index 37aa79e4519ba957fcb84d27a32c566c86ae7844..b23d7086246b5e3e9b2ac759ca3c8216ecadcf43 100644 --- a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js +++ b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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 diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js similarity index 92% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js index d99bc8194920ccf3d2557a8e44988ed47a1ef21f..884cc20854791620ba6797627eeea4a25bdf7072 100644 --- a/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js +++ b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * 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 diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js similarity index 96% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js index 9af19838267bbf38b437bfc170daaf20461b53ee..f4b67f08023ac6a5ea21182df4e812105cdd6998 100644 --- a/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js +++ b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except compliance with the License. * You may obtain a copy of the License at @@ -47,7 +47,6 @@ describe('AccessTokenTest', function () { tokenID = appInfo.accessTokenId; console.info("AccessTokenTest accessTokenId:" + appInfo.accessTokenId + ", name:" + appInfo.name + ", bundleName:" + appInfo.bundleName) - // setTimeout(done(),TIMEOUT); console.info("sleep begin"); sleep(TIMEOUT); diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js similarity index 91% rename from security/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js index 0de75af6e3d630f0292140c5f41a49ca07f68d06..7309bdcb055cfc43d8ddf73a33971bb32cffa8bc 100644 --- a/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js +++ b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Huawei Device Co., Ltd. + * Copyright (C) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except compliance with the License. * You may obtain a copy of the License at diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json diff --git a/security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png b/accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png similarity index 100% rename from security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png rename to accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png diff --git a/security/BUILD.gn b/security/BUILD.gn index e83d5664cb300b7288458d1db68f792c8282d1be..79f2b644f189eed4d34f416a5e8b9c338867d96f 100644 --- a/security/BUILD.gn +++ b/security/BUILD.gn @@ -17,7 +17,6 @@ group("security") { testonly = true if (is_standard_system) { deps = [ - "access_token/AccessTokenTest_Normal_js:ActsAccessTokenApiJSNormalTest", "cipher/datacipher:datacipher", "security_huks_basic", ] diff --git a/test_packages.gni b/test_packages.gni index b0d7aa0d3c3d0aa9a86fa72c48341c79710a77f5..4677bc656488f33395713e081019d986075456c9 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -17,6 +17,7 @@ _all_test_packages = [ "${ACTS_ROOT}/arkXtest:arkXtest", "${ACTS_ROOT}/global:global", "${ACTS_ROOT}/security:security", + "${ACTS_ROOT}/accessControl:accessControl", "${ACTS_ROOT}/useriam:useriam", "${ACTS_ROOT}/multimedia:multimedia", "${ACTS_ROOT}/bundlemanager:appexecfwk",