From 41e467e6d2526786446e83075abd4dfb77840326 Mon Sep 17 00:00:00 2001 From: cc_ggboy Date: Wed, 14 Sep 2022 18:35:25 +0800 Subject: [PATCH] =?UTF-8?q?xts=E7=9B=AE=E5=BD=95=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: cc_ggboy --- accessControl/BUILD.gn | 23 ------------------ security/BUILD.gn | 1 + .../AccessTokenTest_Normal_js/BUILD.gn | 0 .../AccessTokenTest_Normal_js/Test.json | 0 .../signature/openharmony_sx.p7b | Bin .../src/main/config.json | 0 .../src/main/js/MainAbility/app.js | 0 .../src/main/js/MainAbility/i18n/en-US.json | 0 .../src/main/js/MainAbility/i18n/zh-CN.json | 0 .../main/js/MainAbility/pages/index/index.css | 0 .../main/js/MainAbility/pages/index/index.hml | 0 .../main/js/MainAbility/pages/index/index.js | 0 .../src/main/js/TestAbility/app.js | 0 .../src/main/js/TestAbility/i18n/en-US.json | 0 .../src/main/js/TestAbility/i18n/zh-CN.json | 0 .../main/js/TestAbility/pages/index/index.css | 0 .../main/js/TestAbility/pages/index/index.hml | 0 .../main/js/TestAbility/pages/index/index.js | 0 .../js/TestRunner/OpenHarmonyTestRunner.js | 0 .../src/main/js/test/AccessToken.test.js | 0 .../src/main/js/test/List.test.js | 0 .../main/resources/base/element/string.json | 0 .../src/main/resources/base/media/icon.png | Bin test_packages.gni | 1 - 24 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 accessControl/BUILD.gn rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/BUILD.gn (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/Test.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/config.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json (100%) rename {accessControl => security}/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png (100%) diff --git a/accessControl/BUILD.gn b/accessControl/BUILD.gn deleted file mode 100644 index 4ed34438d..000000000 --- a/accessControl/BUILD.gn +++ /dev/null @@ -1,23 +0,0 @@ -# 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/BUILD.gn b/security/BUILD.gn index 79f2b644f..e83d5664c 100644 --- a/security/BUILD.gn +++ b/security/BUILD.gn @@ -17,6 +17,7 @@ group("security") { testonly = true if (is_standard_system) { deps = [ + "access_token/AccessTokenTest_Normal_js:ActsAccessTokenApiJSNormalTest", "cipher/datacipher:datacipher", "security_huks_basic", ] diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/BUILD.gn b/security/access_token/AccessTokenTest_Normal_js/BUILD.gn similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/BUILD.gn rename to security/access_token/AccessTokenTest_Normal_js/BUILD.gn diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/Test.json b/security/access_token/AccessTokenTest_Normal_js/Test.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/Test.json rename to security/access_token/AccessTokenTest_Normal_js/Test.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b b/security/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b rename to security/access_token/AccessTokenTest_Normal_js/signature/openharmony_sx.p7b diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/config.json b/security/access_token/AccessTokenTest_Normal_js/src/main/config.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/config.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/config.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/app.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/en-US.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/i18n/zh-CN.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.css diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.hml diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/MainAbility/pages/index/index.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/app.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/en-US.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/i18n/zh-CN.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.css diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.hml diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestAbility/pages/index/index.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/TestRunner/OpenHarmonyTestRunner.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/test/AccessToken.test.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js b/security/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js rename to security/access_token/AccessTokenTest_Normal_js/src/main/js/test/List.test.js diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json b/security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json rename to security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/element/string.json diff --git a/accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png b/security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png similarity index 100% rename from accessControl/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png rename to security/access_token/AccessTokenTest_Normal_js/src/main/resources/base/media/icon.png diff --git a/test_packages.gni b/test_packages.gni index 4677bc656..b0d7aa0d3 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -17,7 +17,6 @@ _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", -- GitLab