提交 255ff97f 编写于 作者: H hu-jixiang1

basic update

Signed-off-by: Nhu-jixiang1 <hujixiang1@huawei.com>
Change-Id: I0073ab9dd20b2c14cab4276aa3812ec6d2b3a87d
上级 2aa9679c
......@@ -18,6 +18,7 @@ group("security") {
if (is_standard_system) {
deps = [
"access_token/AccessTokenTest_Normal_js:ActsAccessTokenJSApiTestNormal",
"cipher/datacipher:datacipher",
"huks_standard",
"security_huks_basic",
]
......
......@@ -15,6 +15,6 @@ import("//test/xts/tools/build/suite.gni")
group("datacipher") {
testonly = true
if (is_standard_system) {
deps = [ "cipher:HitsSecurityCipherTest" ]
deps = [ "cipher:ActsSecurityCipherTest" ]
}
}
......@@ -12,14 +12,14 @@
# limitations under the License.
import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("HitsSecurityCipherTest") {
ohos_js_hap_suite("ActsSecurityCipherTest") {
hap_profile = "./entry/src/main/config.json"
deps = [
":huks_js_assets",
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "HitsSecurityCipherTest"
hap_name = "ActsSecurityCipherTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for keystoretest js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "4200000",
"test-timeout": "300000",
"package": "com.huawei.keystoretest",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"HitsSecurityCipherTest.hap"
"ActsSecurityCipherTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface'
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
import cipher from '@system.cipher';
describe('hitscipher.test.js', function () {
describe('cipher1.test.js', function () {
let plainTextRsa;
let cipherTextRsa;
let rsaPublicKey;
......
......@@ -12,9 +12,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/lite/interface'
import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from 'deccjsunit/index'
import cipher from '@system.cipher';
describe('hitscipher.test.js', function () {
describe('cipher2.test.js', function () {
let plainTextRsa;
let cipherTextRsa;
let rsaPublicKey;
......
/*
/*plainTextAes
* 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.
......@@ -19,7 +19,7 @@ describe('hitscipher.test.js', function () {
let cipherTextRsa;
let rsaPublicKey;
let rsaPrivateKey;
let plainTestAes;
let plainTextAes;
let cipherTextAes;
let aesKey;
let cipherResultFail;
......@@ -44,7 +44,7 @@ describe('hitscipher.test.js', function () {
'Zt8MkPdAh87mD8jdlsSzh3v2RxkbJTgzFmRotsd2dCfNdykYtRN5EBmbYM54GhBh\n' +
'dYZlnX92HHBDLRCL8y0CQQDuKZNoBooqVUwcrCFqpeAX/bGYiVmFxcIqyu5vYzVJ\n' +
'Ff5Fpkxm4FLmrjhiGwL1CKIm5RRL9kT6tsv4do6ALylb';
plainTestAes = '%%%%Hello,World! 123 aes key2###(^^^)';
plainTextAes = '%%%%Hello,World! 123 aes key2###(^^^)';
cipherTextAes = 'IclkeCOt6pPODqNyprSZizYdJLBFLwXsEFJo34IJwZp7JmfQJXDbqGpexINBMke4';
aesKey = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjMONTY3ODkwMzI=';
cipherResultFail = false;
......
......@@ -14,3 +14,5 @@
*/
require('./Agree/hitscipher.test.js');
require('./Agree/cipher1.test.js');
require('./Agree/cipher2.test.js');
# 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("//test/xts/tools/build/suite.gni")
group("datacipher2") {
testonly = true
if (is_standard_system) {
deps = [ "cipher:HitsSecurityCipherTest2" ]
}
}
# 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("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("HitsSecurityCipherTest2") {
hap_profile = "./entry/src/main/config.json"
deps = [
":huks_js_assets",
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "HitsSecurityCipherTest2"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
}
ohos_resources("huks_js_resources") {
sources = [ "./entry/src/main/js/resources" ]
hap_profile = "./entry/src/main/config.json"
}
{
"description": "Configuration for keystoretest js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "4200000",
"package": "com.huawei.keystoretest",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"HitsSecurityCipherTest2.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
}
]
}
\ No newline at end of file
{
"app": {
"bundleName": "com.huawei.keystoretest",
"vendor": "huawei",
"version": {
"code": 1,
"name": "1.0.0"
},
"apiVersion": {
"compatible": 6,
"target": 6,
"releaseType": "Beta1"
}
},
"deviceConfig": {},
"module": {
"package": "com.huawei.keystoretest",
"name": ".MyApplication",
"mainAbility": "com.huawei.keystoretest.MainAbility",
"deviceType": [
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "entry",
"moduleType": "entry",
"installationFree": true
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"name": "com.huawei.keystoretest.MainAbility",
"icon": "$media:icon",
"description": "$string:mainability_description",
"label": "$string:entry_MainAbility",
"type": "page",
"launchType": "standard",
"visible": true,
"isVisible": "true"
}
],
"js": [
{
"pages": [
"pages/index/index"
],
"name": "default",
"window": {
"designWidth": 720,
"autoDesignWidth": true
}
}
]
}
}
\ No newline at end of file
/*
* 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('AceApplication onCreate');
},
onDestroy() {
console.info('AceApplication onDestroy');
},
};
{
"strings": {
"hello": "Hello",
"world": "world",
"start": "test start"
}
}
\ No newline at end of file
{
"strings": {
"hello": "您好",
"world": "世界",
"start": "测试开始"
}
}
\ No newline at end of file
.container {
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
.title {
font-size: 40px;
color: #000000;
opacity: 0.9;
}
@media screen and (device-type: tablet) and (orientation: landscape) {
.title {
font-size: 100px;
}
}
@media screen and (device-type: wearable) {
.title {
font-size: 28px;
color: #ffffff;
}
}
@media screen and (device-type: tv) {
.container {
background-image: url('/common/images/Wallpaper.png');
background-size: cover;
background-repeat: no-repeat;
background-position: center;
}
.title {
font-size: 100px;
color: #ffffff;
}
}
@media screen and (device-type: phone) and (orientation: landscape) {
.title {
font-size: 60px;
}
}
<div class="container">
<text class="title" >
{{ $t('strings.hello') }} {{ title }}
</text>
</div>
\ No newline at end of file
/*
* 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 { Core, ExpectExtend } from 'deccjsunit/index';
export default {
data: {
title: '',
},
onInit() {
this.title = this.$t('strings.world');
},
onShow() {
const core = Core.getInstance();
const expectExtend = new ExpectExtend({
id: 'extend',
});
core.addService('expect', expectExtend);
core.init();
const configService = core.getDefaultService('config');
this.timeout = 1500000;
configService.setConfig(this);
console.log('test start');
require('../../../test/List.test');
core.execute();
},
onReady() {},
};
{
"string": [
{
"name": "entry_MainAbility",
"value": "entry_MainAbility"
},
{
"name": "mainability_description",
"value": "JS_Empty Ability"
}
]
}
\ No newline at end of file
/*
* 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.
*/
require('./Agree/cipher1.test.js');
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_callback_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksAgreeBasicCallbackJSApiTest"
hap_name = "ActsHuksAgreeBasicCallbackJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -9,7 +9,7 @@
"kits": [
{
"test-file-name": [
"huksAgreeBasicCallbackJSApiTest.hap"
"ActsHuksAgreeBasicCallbackJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksagree_promise_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksAgreeBasicPromiseJSApiTest"
hap_name = "ActsHuksAgreeBasicPromiseJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksAgreeBasicPromise js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "4200000",
"test-timeout": "180000",
"package": "com.example.huksagreebasicpromise",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksAgreeBasicPromiseJSApiTest.hap"
"ActsHuksAgreeBasicPromiseJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_callback_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksCipherBasicCallbackJSApiTest"
hap_name = "ActsHuksCipherBasicCallbackJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksCipherBasicCallback js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "2700000",
"test-timeout": "180000",
"package": "com.example.hukscipherbasiccallback",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksCipherBasicCallbackJSApiTest.hap"
"ActsHuksCipherBasicCallbackJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukscipher_promise_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksCipherBasicPromiseJSApiTest"
hap_name = "ActsHuksCipherBasicPromiseJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksCipherBasicPromise js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "2700000",
"test-timeout": "180000",
"package": "com.example.hukscipherbasicpromise",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksCipherBasicPromiseJSApiTest.hap"
"ActsHuksCipherBasicPromiseJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_callback_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksDeriveBasicCallbackJSApiTest"
hap_name = "ActsHuksDeriveBasicCallbackJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksDeriveBasicCallback js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "4200000",
"test-timeout": "180000",
"package": "com.example.huksderivebasiccallback",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksDeriveBasicCallbackJSApiTest.hap"
"ActsHuksDeriveBasicCallbackJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("huksderive_promise_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksDeriveBasicPromiseJSApiTest"
hap_name = "ActsHuksDeriveBasicPromiseJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksDeriveBasicPromise js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "4200000",
"test-timeout": "180000",
"package": "com.example.huksderivebasicpromise",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksDeriveBasicPromiseJSApiTest.hap"
"ActsHuksDeriveBasicPromiseJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_callback_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksHmacBasicCallbackJSApiTest"
hap_name = "ActsHuksHmacBasicCallbackJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksHmacBasicCallback js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "600000",
"test-timeout": "180000",
"package": "com.example.huksHmacbasiccallback",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksHmacBasicCallbackJSApiTest.hap"
"ActsHuksHmacBasicCallbackJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukshmac_promise_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksHmacBasicPromiseJSApiTest"
hap_name = "ActsHuksHmacBasicPromiseJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksHmacBasicPromise js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "600000",
"test-timeout": "180000",
"package": "com.example.huksHmacbasicpromise",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksHmacBasicPromiseJSApiTest.hap"
"ActsHuksHmacBasicPromiseJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_callback_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksSignVerifyBasicCallbackJSApiTest"
hap_name = "ActsHuksSignVerifyBasicCallbackJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -9,7 +9,7 @@
"kits": [
{
"test-file-name": [
"huksSignVerifyBasicCallbackJSApiTest.hap"
"ActsHuksSignVerifyBasicCallbackJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
......@@ -19,7 +19,7 @@ ohos_js_hap_suite("hukssignverify_promise_basic_js_test") {
":huks_js_resources",
]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "huksSignVerifyBasicPromiseJSApiTest"
hap_name = "ActsHuksSignVerifyBasicPromiseJSApiTest"
}
ohos_js_assets("huks_js_assets") {
source_dir = "./entry/src/main/js/MainAbility"
......
......@@ -2,14 +2,14 @@
"description": "Configuration for huksSignVerifyBasicPromise js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "12600000",
"test-timeout": "180000",
"package": "com.example.hukssignverifybasicpromise",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"huksSignVerifyBasicPromiseJSApiTest.hap"
"ActsHuksSignVerifyBasicPromiseJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册