From e76adb3a17d792d17a3809d2b4fdb343cba813bb Mon Sep 17 00:00:00 2001 From: hu-jixiang1 Date: Thu, 10 Feb 2022 18:15:33 +0800 Subject: [PATCH] hujixiang1@huawei.com Signed-off-by: hu-jixiang1 Change-Id: Ie1b41b4404365e2aa4afc90931c0332ba0e89253 --- security/BUILD.gn | 3 - .../huks_standard/HuksAbnormalTest/Test.json | 2 +- .../HuksAlgCompletionTest/Test.json | 2 +- .../HuksConcurrencyApp1/Test.json | 2 +- .../HuksConcurrencyApp2/Test.json | 2 +- .../HuksConcurrencyTest/Test.json | 2 +- .../huks_standard/HuksJSTimingTest/Test.json | 2 +- .../huks_standard/HuksStressTest/Test.json | 2 +- .../userauth/entry/src/main/js/test/cancel.js | 141 ---------- .../src/main/js/test/checkAvailability.js | 162 ----------- .../userauth/entry/src/main/js/test/off.js | 80 ------ .../userauth/entry/src/main/js/test/on.js | 252 ------------------ .../entry/src/main/js/test/cancel.js | 60 ----- .../src/main/js/test/checkAvailability.js | 50 ---- .../performance/entry/src/main/js/test/off.js | 51 ---- .../performance/entry/src/main/js/test/on.js | 51 ---- test_packages.gni | 1 + useriam/BUILD.gn | 24 ++ .../function_test/userauth/BUILD.gn | 0 .../function_test/userauth/Test.json | 0 .../userauth/entry/src/main/config.json | 0 .../userauth/entry/src/main/js/default/app.js | 0 .../entry/src/main/js/default/i18n/en-US.json | 0 .../entry/src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../js/resources/base/element/string.json | 0 .../src/main/js/resources/base/media/icon.png | Bin .../entry/src/main/js/test/ListTest.js | 4 - .../entry/src/main/js/test/execute.js | 0 .../userauth/signature/openharmony_sx.p7b | Bin .../performance_test/performance/BUILD.gn | 0 .../performance_test/performance/Test.json | 0 .../performance/entry/src/main/config.json | 0 .../entry/src/main/js/default/app.js | 0 .../entry/src/main/js/default/i18n/en-US.json | 0 .../entry/src/main/js/default/i18n/zh-CN.json | 0 .../src/main/js/default/pages/index/index.css | 0 .../src/main/js/default/pages/index/index.hml | 0 .../src/main/js/default/pages/index/index.js | 0 .../js/resources/base/element/string.json | 0 .../src/main/js/resources/base/media/icon.png | Bin .../entry/src/main/js/test/ListTest.js | 4 - .../entry/src/main/js/test/execute.js | 0 .../src/main/js/test/getAuthenticator.js | 0 .../performance/signature/openharmony_sx.p7b | Bin 47 files changed, 32 insertions(+), 865 deletions(-) delete mode 100644 security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/cancel.js delete mode 100644 security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/checkAvailability.js delete mode 100644 security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/off.js delete mode 100644 security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/on.js delete mode 100644 security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/cancel.js delete mode 100644 security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/checkAvailability.js delete mode 100644 security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/off.js delete mode 100644 security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/on.js create mode 100644 useriam/BUILD.gn rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/BUILD.gn (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/Test.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/en-US.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/zh-CN.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.css (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.hml (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/media/icon.png (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js (86%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/function_test/userauth/signature/openharmony_sx.p7b (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/BUILD.gn (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/Test.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/config.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/app.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/en-US.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/zh-CN.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.css (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.hml (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/element/string.json (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/media/icon.png (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js (87%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/execute.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/getAuthenticator.js (100%) rename {security/user_iam => useriam}/face_auth/js_api_test/performance_test/performance/signature/openharmony_sx.p7b (100%) diff --git a/security/BUILD.gn b/security/BUILD.gn index 1ffa4d6e6..bce1e4094 100644 --- a/security/BUILD.gn +++ b/security/BUILD.gn @@ -18,8 +18,5 @@ group("security") { if (is_standard_system) { deps = [ "huks_standard", - #"user_iam/face_auth/js_api_test/function_test/userauth:ActsUserauthTest", - #"user_iam/face_auth/js_api_test/performance_test/performance:ActsUserauthPerformanceTest", - ] } } diff --git a/security/huks_standard/HuksAbnormalTest/Test.json b/security/huks_standard/HuksAbnormalTest/Test.json index 17d3d4366..1913b8251 100644 --- a/security/huks_standard/HuksAbnormalTest/Test.json +++ b/security/huks_standard/HuksAbnormalTest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for algorithm completion test", "driver": { "type": "JSUnitTest", - "test-timeout": "7200000", + "test-timeout": "600000", "package": "com.example.err", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksAlgCompletionTest/Test.json b/security/huks_standard/HuksAlgCompletionTest/Test.json index f7121dd29..b1431c54b 100644 --- a/security/huks_standard/HuksAlgCompletionTest/Test.json +++ b/security/huks_standard/HuksAlgCompletionTest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for algorithm completion test", "driver": { "type": "JSUnitTest", - "test-timeout": "26000000", + "test-timeout": "3600000", "package": "com.example.hksxtstest", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksConcurrencyApp1/Test.json b/security/huks_standard/HuksConcurrencyApp1/Test.json index 9d27ae2ae..e093a0225 100644 --- a/security/huks_standard/HuksConcurrencyApp1/Test.json +++ b/security/huks_standard/HuksConcurrencyApp1/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for concurrency test", "driver": { "type": "JSUnitTest", - "test-timeout": "72000000", + "test-timeout": "600000", "package": "com.example.concurrencyapp1", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksConcurrencyApp2/Test.json b/security/huks_standard/HuksConcurrencyApp2/Test.json index 794341a8f..b4eef89cf 100644 --- a/security/huks_standard/HuksConcurrencyApp2/Test.json +++ b/security/huks_standard/HuksConcurrencyApp2/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for concurrecny test", "driver": { "type": "JSUnitTest", - "test-timeout": "7200000", + "test-timeout": "600000", "package": "com.example.concurrencyapp2", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksConcurrencyTest/Test.json b/security/huks_standard/HuksConcurrencyTest/Test.json index 7f1d1e527..08400972c 100644 --- a/security/huks_standard/HuksConcurrencyTest/Test.json +++ b/security/huks_standard/HuksConcurrencyTest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for algorithm completion test", "driver": { "type": "JSUnitTest", - "test-timeout": "7200000", + "test-timeout": "600000", "package": "com.example.huksconcurrencytest", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksJSTimingTest/Test.json b/security/huks_standard/HuksJSTimingTest/Test.json index e8a329fff..22d355c68 100644 --- a/security/huks_standard/HuksJSTimingTest/Test.json +++ b/security/huks_standard/HuksJSTimingTest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for js timing test", "driver": { "type": "JSUnitTest", - "test-timeout": "7200000", + "test-timeout": "1200000", "package": "com.example.huksjstiming", "shell-timeout": "60000" }, diff --git a/security/huks_standard/HuksStressTest/Test.json b/security/huks_standard/HuksStressTest/Test.json index 0f17557cb..b489be11a 100644 --- a/security/huks_standard/HuksStressTest/Test.json +++ b/security/huks_standard/HuksStressTest/Test.json @@ -2,7 +2,7 @@ "description": "Configuration for huks stress test", "driver": { "type": "JSUnitTest", - "test-timeout": "30000000", + "test-timeout": "23000000", "package": "com.example.huksstresstest", "shell-timeout": "60000" }, diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/cancel.js b/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/cancel.js deleted file mode 100644 index 878a44703..000000000 --- a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/cancel.js +++ /dev/null @@ -1,141 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var index = require('../default/pages/index/index.js'); - -/** - * test case - */ -describe('userAuthTest', function () { - beforeEach(function(done) { - let waitTime = 1000; - setTimeout(function() { - done(); - }, waitTime); - }) - afterEach(function() { - }) - - /** - * @tc.name execute_authentication_callback_cancel - * @tc.number JSAPI_Function_Cancel_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Cancel_0100', 0, function (done) { - console.log("JSAPI_Function_Cancel_0100 start"); - const auth = userAuth.getAuthenticator(); - let flag = false; - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_Cancel_0100 execute:" + data); - if(data == 0){ - flag = true; - } - setTimeout(function() { - done(); - }, 1); - if(flag && data != 0){ - expect(data).assertEqual(2); - } - }); - let result = auth.cancel(); - console.log("JSAPI_Function_Cancel_0100 auth.cancel:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_Cancel_0100 end"); - }) - - /** - * @tc.name execute_authentication_promise_cancel - * @tc.number JSAPI_Function_Cancel_0200 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Cancel_0200', 0, function (done) { - console.log("JSAPI_Function_Cancel_0200 start"); - const auth = userAuth.getAuthenticator(); - let flag = false; - auth.execute("FACE_ONLY", "S2").then(function(data) { - console.log("JSAPI_Function_Cancel_0200 auth.execute:" + data); - if(data == 0){ - flag = true; - } - setTimeout(function() { - done(); - }, 1); - if(flag && data != 0){ - expect(data).assertEqual(2); - } - }); - let result = auth.cancel(); - expect(result).assertEqual(0); - console.log("JSAPI_Function_Cancel_0200 auth.cancel:" + result); - console.log("JSAPI_Function_Cancel_0200 end"); - }) - - /** - * @tc.name no userAuth cancel - * @tc.number JSAPI_Function_Cancel_0300 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Cancel_0300', 0, function () { - console.log("JSAPI_Function_Cancel_0300 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.cancel(); - console.log("JSAPI_Function_Cancel_0300 cancel result:" + Number(result)); - expect(result).assertEqual(1); - console.log("JSAPI_Function_Cancel_0300 end"); - }) - - /** - * @tc.name repeat cancel - * @tc.number JSAPI_Function_Cancel_0400 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Cancel_0400', 0, function (done) { - console.log("JSAPI_Function_Cancel_0400 start"); - const auth = userAuth.getAuthenticator(); - let flag = false; - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_Cancel_0400 auth.execute:" + data); - if(data == 0){ - flag = true; - } - setTimeout(function() { - done(); - }, 1); - if(flag && data != 0){ - expect(data).assertEqual(2); - } - // CANCELED(2) - let result2 = auth.cancel(); - console.log("JSAPI_Function_Cancel_0400 2 cancel result2:" + result2); - expect(result2).assertEqual(1); - setTimeout(function() { - done(); - }, 1); - }); - let result1 = auth.cancel(); - console.log("JSAPI_Function_Cancel_0400 1 cancel result1:" + result1); - console.log("JSAPI_Function_Cancel_0400 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/checkAvailability.js b/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/checkAvailability.js deleted file mode 100644 index 6858c4505..000000000 --- a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/checkAvailability.js +++ /dev/null @@ -1,162 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var index = require('../default/pages/index/index.js'); - -/** - * test case - */ -describe('userAuthTest', function () { - beforeEach(function(done) { - let waitTime = 1000; - setTimeout(function() { - done(); - }, waitTime); - }) - afterEach(function() { - }) - - /** - * @tc.name checkAvailability type=FACE_ONLY - * @tc.number JSAPI_Function_CheckAvailability_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0100', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0100 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", "S2"); - console.log("JSAPI_Function_CheckAvailability_0100 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0100 end"); - }) - - /** - * @tc.name checkAvailability type=ALL - * @tc.number JSAPI_Function_CheckAvailability_0200 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0200', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0200 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("ALL", "S2"); - console.log("JSAPI_Function_CheckAvailability_0200 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0200 end"); - }) - - /** - * @tc.name checkAvailability type=null - * @tc.number JSAPI_Function_CheckAvailability_0300 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0300', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0300 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("", "S2"); - console.log("JSAPI_Function_CheckAvailability_0300 result:" + result); - // AUTH_TYPE_NOT_SUPPORT - expect(result).assertEqual(1); - console.log("JSAPI_Function_CheckAvailability_0300 end"); - }) - - /** - * @tc.name checkAvailability level=S1 - * @tc.number JSAPI_Function_CheckAvailability_0400 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0400', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0400 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", "S1"); - console.log("JSAPI_Function_CheckAvailability_0400 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0400 end"); - }) - - /** - * @tc.name checkAvailability level=S2 - * @tc.number JSAPI_Function_CheckAvailability_0500 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0500', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0500 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", "S2"); - console.log("JSAPI_Function_CheckAvailability_0500 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0500 end"); - }) - - /** - * @tc.name checkAvailability level=S3 - * @tc.number JSAPI_Function_CheckAvailability_0600 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0600', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0600 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", "S3"); - console.log("JSAPI_Function_CheckAvailability_0600 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0600 end"); - }) - - /** - * @tc.name checkAvailability level=S4 - * @tc.number JSAPI_Function_CheckAvailability_0700 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0700', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0700 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", "S4"); - console.log("JSAPI_Function_CheckAvailability_0700 result:" + result); - expect(result).assertEqual(0); - console.log("JSAPI_Function_CheckAvailability_0700 end"); - }) - - /** - * @tc.name checkAvailability level=null - * @tc.number JSAPI_Function_CheckAvailability_0800 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_CheckAvailability_0800', 0, function () { - console.log("JSAPI_Function_CheckAvailability_0800 start"); - const auth = userAuth.getAuthenticator(); - let result = auth.checkAvailability("FACE_ONLY", ""); - console.log("JSAPI_Function_CheckAvailability_0800 result:" + result); - // SECURE_LEVEL_NOT_SUPPORT - expect(result).assertEqual(2); - console.log("JSAPI_Function_CheckAvailability_0800 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/off.js b/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/off.js deleted file mode 100644 index ffca2d9ba..000000000 --- a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/off.js +++ /dev/null @@ -1,80 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var index = require('../default/pages/index/index.js'); - -/** - * test case - */ -describe('userAuthTest', function () { - beforeEach(function(done) { - let waitTime = 1000; - setTimeout(function() { - done(); - }, waitTime); - }) - afterEach(function() { - }) - - /** - * @tc.name off FAILED - * @tc.number JSAPI_Function_Off_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Off_0100', 0, function (done) { - console.log("JSAPI_Function_Off_0100 start"); - const auth = userAuth.getAuthenticator(); - auth.off("tip8", function(data) { - console.log("JSAPI_Function_Off_0100 off:" + data); - // errorCode=FAILED - expect(data).assertEqual(1); - setTimeout(function() { - done(); - }, 1); - }); - console.log("JSAPI_Function_Off_0100 end"); - }) - - /** - * @tc.name off FAILED - * @tc.number JSAPI_Function_Off_0200 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_Off_0200', 0, function (done) { - console.log("JSAPI_Function_Off_0200 start"); - const auth = userAuth.getAuthenticator(); - auth.on("tip1", function(data) { - console.log("JSAPI_Function_Off_0200 tip1 on CallBack"); - }); - auth.on("tip2", function(data) { - console.log("JSAPI_Function_Off_0200 tip2 on CallBack"); - }); - auth.off("tip1", function(data) { - console.log("JSAPI_Function_Off_0200 off:" + data); - // errorCode=SUCCESS - expect(data).assertEqual(0); - setTimeout(function() { - done(); - }, 1); - }); - console.log("JSAPI_Function_Off_0200 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/on.js b/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/on.js deleted file mode 100644 index a65226e7d..000000000 --- a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/on.js +++ /dev/null @@ -1,252 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' -var index = require('../default/pages/index/index.js'); -var waitFlag = false; - -/** - * test case - */ -describe('userAuthTest', function () { - beforeEach(function(done) { - let waitTime = 1000; - if (waitFlag) { - waitTime = 30000; - } - setTimeout(function() { - done(); - }, waitTime); - }) - afterEach(function() { - }) - - /** - * @tc.name on getTips 0100 - * @tc.number JSAPI_Function_On_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_On_0100', 0, function (done) { - console.log("JSAPI_Function_On_0100 start"); - index.default.fileSave('JSAPI_Function_On_0100','12', - '8200 0 0 0 0 0 0 0 0 0 0', - '13 0 0 0 0 0 0 0 0 0 0', - '4 0 0 0 0 0 0 0 0 0 0', - '3 0 0 0 0 0 0 0 0 0 0', - '6 0 0 0 0 0 0 0 0 0 0', - '8 0 0 0 0 0 0 0 0 0 0', - '7 0 0 0 0 0 0 0 0 0 0', - '5 0 0 0 0 0 0 0 0 0 0', - '4105 0 0 0 0 0 0 0 0 0 0', - '9 0 0 0 0 0 0 0 0 0 0', - '2 0 0 0 0 0 0 0 0 0 0', - '17 0 0 0 0 0 0 0 0 0 0'); - const auth = userAuth.getAuthenticator(); - let tipCodeIndex = 1; - auth.on("tip", function(data) { - console.log("JSAPI_Function_On_0100 on.index:" + tipCodeIndex); - console.log("JSAPI_Function_On_0100 on.errorCode:" + data.errorCode); - console.log("JSAPI_Function_On_0100 on.tipEvent:" + data.tipEvent); - console.log("JSAPI_Function_On_0100 on.tipCode:" + data.tipCode); - if(tipCodeIndex<12){ - // errorCode = Success - expect(data.errorCode).assertEqual(0); - // ACQUIRE = 3 - expect(data.tipEvent).assertEqual(3); - - // FACE_AUTH_TIP_TOO_BRIGHT = 1, - // FACE_AUTH_TIP_TOO_DARK = 2, - // FACE_AUTH_TIP_TOO_CLOSE = 3, - // FACE_AUTH_TIP_TOO_FAR = 4, - // FACE_AUTH_TIP_TOO_HIGH = 5, - // FACE_AUTH_TIP_TOO_LOW = 6, - // FACE_AUTH_TIP_TOO_RIGHT = 7, - // FACE_AUTH_TIP_TOO_LEFT = 8, - // FACE_AUTH_TIP_TOO_MUCH_MOTION = 9, - // FACE_AUTH_TIP_POOR_GAZE = 10, - // FACE_AUTH_TIP_NOT_DETECTED = 11, - expect(data.tipCode).assertEqual(tipCodeIndex); - tipCodeIndex = tipCodeIndex + 1; - }else{ - // errorCode = Success - expect(data.errorCode).assertEqual(0); - // result = 1 - expect(data.tipEvent).assertEqual(1); - expect(data.tipCode).assertEqual(0); - } - }); - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0100 auth.execute:" + data); - auth.off("tip", function(data) { - console.log("JSAPI_Function_On_0100 off:" + data); - }); - setTimeout(function() { - done(); - }, 1); - }); - console.log("JSAPI_Function_On_0100 end"); - }) - - /** - * @tc.name on getTips 0200 - * @tc.number JSAPI_Function_On_0200 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_On_0200', 0, function (done) { - console.log("JSAPI_Function_On_0200 start"); - const auth = userAuth.getAuthenticator(); - waitFlag = true; - auth.on("tip", function(data) { - console.log("JSAPI_Function_On_0200 on.errorCode:" + data.errorCode); - console.log("JSAPI_Function_On_0200 on.tipEvent:" + data.tipEvent); - if(data.tipEvent == 1){ - // errorCode= SUCCESS - expect(data.errorCode).assertEqual(0); - // RESULT = 1 - expect(data.tipEvent).assertEqual(1); - } - setTimeout(function() { - done(); - }, 1); - }); - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0200 auth.execute:" + data); - expect(data).assertEqual(0); - auth.off("tip", function(data) { - console.log("JSAPI_Function_On_0200 off:" + data); - }); - setTimeout(function() { - done(); - }, 1); - }); - console.log("JSAPI_Function_On_0200 end"); - }) - - /** - * @tc.name on getTips 0300 - * @tc.number JSAPI_Function_On_0300 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_On_0300', 0, function (done) { - console.log("JSAPI_Function_On_0300 start"); - index.default.fileSave('JSAPI_Function_On_0300','1','18 0 0 0 0 0 0 0 0 0 0'); - const auth = userAuth.getAuthenticator(); - waitFlag = false; - auth.on("tip", function(data) { - console.log("JSAPI_Function_On_0300 on.errorCode:" + data.errorCode); - console.log("JSAPI_Function_On_0300 on.tipEvent:" + data.tipEvent); - // errorCode= Success - expect(data.errorCode).assertEqual(0); - // RESULT = 1 - expect(data.tipEvent).assertEqual(1); - setTimeout(function() { - done(); - }, 1); - }); - - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0300 auth.execute:" + data); - expect(data).assertEqual(1); - auth.off("tip", function(data) { - console.log("JSAPI_Function_On_0300 off:" + data); - }); - setTimeout(function() { - done(); - }, 1); - }); - console.log("JSAPI_Function_On_0300 end"); - }) - - /** - * @tc.name on getTips 0400 - * @tc.number JSAPI_Function_On_0400 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_On_0400', 0, function (done) { - console.log("JSAPI_Function_On_0400 start"); - const auth = userAuth.getAuthenticator(); - waitFlag = true; - auth.on("tip", function(data) { - console.log("JSAPI_Function_On_0400 on.errorCode:" + data.errorCode); - console.log("JSAPI_Function_On_0400 on.tipEvent:" + data.tipEvent); - if(data.tipCode == 5){ - expect(data.tipCode).assertEqual(5); - // errorCode= SUCCESS - expect(data.errorCode).assertEqual(0); - // RESULT = 1 - expect(data.tipEvent).assertEqual(1); - } - }); - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0400 auth.execute:" + data); - }); - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0400 auth.execute:" + data); - auth.off("tip", function(data) { - console.log("JSAPI_Function_On_0400 off:" + data); - }); - setTimeout(function() { - done(); - }, 3000); - }); - - console.log("JSAPI_Function_On_0400 end"); - }) - - /** - * @tc.name on getTips 0500 - * @tc.number JSAPI_Function_On_0500 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Function_On_0500', 0, function (done) { - console.log("JSAPI_Function_On_0500 start"); - const auth = userAuth.getAuthenticator(); - waitFlag = false; - auth.on("tip", function(data) { - console.log("JSAPI_Function_On_0500 on.errorCode:" + data.errorCode); - console.log("JSAPI_Function_On_0500 on.tipEvent:" + data.tipEvent); - // errorCode= SUCCESS - expect(data.errorCode).assertEqual(0); - // CANCEL = 2 - expect(data.tipEvent).assertEqual(2); - setTimeout(function() { - done(); - }, 1); - }); - auth.execute("FACE_ONLY", "S2", function(data) { - console.log("JSAPI_Function_On_0500 auth.execute:" + data); - auth.off("tip", function(data) { - console.log("JSAPI_Function_On_0500 off:" + data); - }); - setTimeout(function() { - done(); - }, 1); - }); - let result = auth.cancel(); - console.log("JSAPI_Function_On_0500 auth.cancel:" + result); - console.log("JSAPI_Function_On_0500 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/cancel.js b/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/cancel.js deleted file mode 100644 index 514f0b704..000000000 --- a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/cancel.js +++ /dev/null @@ -1,60 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -/** - * performance case - */ -describe('userAuthPerformanceTest', function () { - beforeEach(function(){ - }) - afterEach(function(){ - }) - - /** - * @tc.name cancel performance - * @tc.number JSAPI_Performance_Cancel_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Performance_Cancel_0100', 0, function (done) { - console.log("JSAPI_Performance_Cancel_0100 start"); - const auth = userAuth.getAuthenticator(); - let allTime = 0; - let count = 0; - function callback(){ - if(count<=1000){ - console.log("JSAPI_Performance_Cancel_0100 count"+ ++count); - auth.execute("FACE_ONLY", "S2").then(callback) - let startDate = new Date(); - auth.cancel() - let endDate = new Date(); - allTime += (endDate.getTime() - startDate.getTime()); - }else{ - console.log("JSAPI_Performance_Cancel_0100 performance allTime:" + allTime); - console.log("JSAPI_Performance_Cancel_0100 performance avg" + (allTime/1000)); - expect((allTime/1000) < 2).assertTrue(); - console.log("JSAPI_Performance_Cancel_0100 end"); - setTimeout(function() { - done(); - }, 1); - } - } - auth.execute("FACE_ONLY", "S2").then(callback) - auth.cancel() - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/checkAvailability.js b/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/checkAvailability.js deleted file mode 100644 index 8fccc755b..000000000 --- a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/checkAvailability.js +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -/** - * performance case - */ -describe('userAuthPerformanceTest', function () { - beforeEach(function(){ - }) - afterEach(function(){ - }) - - /** - * @tc.name checkAvailability performance - * @tc.number JSAPI_Performance_CheckAvailability_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Performance_CheckAvailability_0100', 0, function () { - console.log("JSAPI_Performance_CheckAvailability_0100 start"); - const auth = userAuth.getAuthenticator(); - let allTime = 0; - for(let i = 0;i<1000;i++){ - console.log("JSAPI_Performance_CheckAvailability_0100 count"+ i); - let startDate = new Date(); - auth.checkAvailability("FACE_ONLY", "S2") - let endDate = new Date(); - allTime += (endDate.getTime() - startDate.getTime()); - } - console.log("JSAPI_Performance_CheckAvailability_0100 performance allTime:" + allTime); - console.log("JSAPI_Performance_CheckAvailability_0100 performance avg" + (allTime/1000)); - expect((allTime/1000) < 2).assertTrue(); - console.log("JSAPI_Performance_CheckAvailability_0100 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/off.js b/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/off.js deleted file mode 100644 index fffd467b1..000000000 --- a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/off.js +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -/** - * performance case - */ -describe('userAuthPerformanceTest', function () { - beforeEach(function(){ - }) - afterEach(function(){ - }) - - /** - * @tc.name off performance - * @tc.number JSAPI_Performance_Off_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Performance_Off_0100', 0, function () { - console.log("JSAPI_Performance_Off_0100 start"); - const auth = userAuth.getAuthenticator(); - let allTime = 0; - for(let i = 0;i<1000;i++){ - console.log("JSAPI_Performance_Off_0100 count"+ i); - auth.on("tip" + i, function (data) {}) - let startDate = new Date(); - auth.off("tip" + i, function (data) {}) - let endDate = new Date(); - allTime += (endDate.getTime() - startDate.getTime()); - } - console.log("JSAPI_Performance_Off_0100 performance allTime:" + allTime); - console.log("JSAPI_Performance_Off_0100 performance avg" + (allTime/1000)); - expect((allTime/1000) < 2).assertTrue(); - console.log("JSAPI_Performance_Off_0100 end"); - }) -}) \ No newline at end of file diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/on.js b/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/on.js deleted file mode 100644 index 7424e804d..000000000 --- a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/on.js +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 userAuth from '@ohos.userIAM.userAuth' -import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' - -/** - * performance case - */ -describe('userAuthPerformanceTest', function () { - beforeEach(function(){ - }) - afterEach(function(){ - }) - - /** - * @tc.name on performance - * @tc.number JSAPI_Performance_On_0100 - * @tc.size MEDIUM - * @tc.type FUNC - * @tc.level Level2 - */ - it('JSAPI_Performance_On_0100', 0, function () { - console.log("JSAPI_Performance_On_0100 start"); - const auth = userAuth.getAuthenticator(); - let allTime = 0; - for(let i = 0;i<1000;i++){ - console.log("JSAPI_Performance_On_0100 count"+ i); - let startDate = new Date(); - auth.on("tip" + i, function (data) {}) - let endDate = new Date(); - auth.off("tip" + i, function (data) {}) - allTime += (endDate.getTime() - startDate.getTime()); - } - console.log("JSAPI_Performance_On_0100 performance allTime:" + allTime); - console.log("JSAPI_Performance_On_0100 performance avg" + (allTime/1000)); - expect((allTime/1000) < 2).assertTrue(); - console.log("JSAPI_Performance_On_0100 end"); - }) -}) \ No newline at end of file diff --git a/test_packages.gni b/test_packages.gni index b1d8096ce..42e85ce56 100644 --- a/test_packages.gni +++ b/test_packages.gni @@ -16,6 +16,7 @@ import("//test/xts/tools/build/suite.gni") _all_test_packages = [ "${ACTS_ROOT}/global:global", "${ACTS_ROOT}/security:security", + "${ACTS_ROOT}/useriam:useriam", "${ACTS_ROOT}/multimedia:multimedia", "${ACTS_ROOT}/appexecfwk:appexecfwk", "${ACTS_ROOT}/account:account", diff --git a/useriam/BUILD.gn b/useriam/BUILD.gn new file mode 100644 index 000000000..44b9e24ee --- /dev/null +++ b/useriam/BUILD.gn @@ -0,0 +1,24 @@ +# 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("//build/ohos_var.gni") +import("//test/xts/tools/build/suite.gni") + +group("useriam") { + testonly = true + if (is_standard_system) { + deps = [ + "face_auth/js_api_test/function_test/userauth:ActsUserauthTest", + "face_auth/js_api_test/performance_test/performance:ActsUserauthPerformanceTest", + ] + } +} diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/BUILD.gn b/useriam/face_auth/js_api_test/function_test/userauth/BUILD.gn similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/BUILD.gn rename to useriam/face_auth/js_api_test/function_test/userauth/BUILD.gn diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/Test.json b/useriam/face_auth/js_api_test/function_test/userauth/Test.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/Test.json rename to useriam/face_auth/js_api_test/function_test/userauth/Test.json diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/config.json diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/app.js diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/en-US.json b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/en-US.json rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/en-US.json diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/zh-CN.json b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/zh-CN.json rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/i18n/zh-CN.json diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.css b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.css rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.css diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.hml b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.hml rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.hml diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/default/pages/index/index.js diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/element/string.json diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/media/icon.png b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/media/icon.png rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/resources/base/media/icon.png diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js similarity index 86% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js index f7844b1fd..55bc72262 100644 --- a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js +++ b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/ListTest.js @@ -14,7 +14,3 @@ */ require('./execute.js') -require('./cancel.js') -require('./checkAvailability.js') -require('./on.js') -require('./off.js') diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js b/useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js rename to useriam/face_auth/js_api_test/function_test/userauth/entry/src/main/js/test/execute.js diff --git a/security/user_iam/face_auth/js_api_test/function_test/userauth/signature/openharmony_sx.p7b b/useriam/face_auth/js_api_test/function_test/userauth/signature/openharmony_sx.p7b similarity index 100% rename from security/user_iam/face_auth/js_api_test/function_test/userauth/signature/openharmony_sx.p7b rename to useriam/face_auth/js_api_test/function_test/userauth/signature/openharmony_sx.p7b diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/BUILD.gn b/useriam/face_auth/js_api_test/performance_test/performance/BUILD.gn similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/BUILD.gn rename to useriam/face_auth/js_api_test/performance_test/performance/BUILD.gn diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/Test.json b/useriam/face_auth/js_api_test/performance_test/performance/Test.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/Test.json rename to useriam/face_auth/js_api_test/performance_test/performance/Test.json diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/config.json b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/config.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/config.json rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/config.json diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/app.js b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/app.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/app.js rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/app.js diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/en-US.json b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/en-US.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/en-US.json rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/en-US.json diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/zh-CN.json b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/zh-CN.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/zh-CN.json rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/i18n/zh-CN.json diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.css b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.css similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.css rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.css diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.hml b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.hml similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.hml rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.hml diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.js b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.js rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/default/pages/index/index.js diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/element/string.json b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/element/string.json similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/element/string.json rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/element/string.json diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/media/icon.png b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/media/icon.png similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/media/icon.png rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/resources/base/media/icon.png diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js similarity index 87% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js index fd379b694..d91ff9e5a 100644 --- a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js +++ b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/ListTest.js @@ -14,7 +14,3 @@ */ require('./getAuthenticator.js') require('./execute.js') -require('./cancel.js') -require('./checkAvailability.js') -require('./on.js') -require('./off.js') diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/execute.js b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/execute.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/execute.js rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/execute.js diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/getAuthenticator.js b/useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/getAuthenticator.js similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/getAuthenticator.js rename to useriam/face_auth/js_api_test/performance_test/performance/entry/src/main/js/test/getAuthenticator.js diff --git a/security/user_iam/face_auth/js_api_test/performance_test/performance/signature/openharmony_sx.p7b b/useriam/face_auth/js_api_test/performance_test/performance/signature/openharmony_sx.p7b similarity index 100% rename from security/user_iam/face_auth/js_api_test/performance_test/performance/signature/openharmony_sx.p7b rename to useriam/face_auth/js_api_test/performance_test/performance/signature/openharmony_sx.p7b -- GitLab