未验证 提交 36a866e6 编写于 作者: O openharmony_ci 提交者: Gitee

!4509 Adapt to the new framework_part25

Merge pull request !4509 from jiyong/local-20220723-0001
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
# distributed under the License is distributed on an "AS IS" BASIS, # distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and # 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") import("//test/xts/tools/build/suite.gni")
...@@ -23,7 +23,9 @@ ohos_js_hap_suite("image_js_hap") { ...@@ -23,7 +23,9 @@ ohos_js_hap_suite("image_js_hap") {
hap_name = "ActsImageJsTest" hap_name = "ActsImageJsTest"
} }
ohos_js_assets("image_js_assets") { ohos_js_assets("image_js_assets") {
source_dir = "./src/main/js/default" js2abc = true
hap_profile = "./src/main/config.json"
source_dir = "./src/main/js"
} }
ohos_resources("image_resources") { ohos_resources("image_resources") {
sources = [ "./src/main/resources" ] sources = [ "./src/main/resources" ]
......
{ {
"description": "Configuration for Image Tests", "description": "Configuration for Image Tests",
"driver": { "driver": {
"type": "JSUnitTest", "type": "OHJSUnitTest",
"test-timeout": "300000", "test-timeout": "300000",
"package": "ohos.acts.multimedia.image", "shell-timeout": "300000",
"shell-timeout": "120000" "bundle-name": "ohos.acts.multimedia.image",
}, "package-name": "ohos.acts.multimedia.image",
"kits": [ "testcase-timeout": 60000
{ },
"test-file-name": [ "kits": [
"ActsImageJsTest.hap" {
], "test-file-name": [
"type": "AppInstallKit", "ActsImageJsTest.hap"
"cleanup-apps": true ],
}, "type": "AppInstallKit",
{ "cleanup-apps": true
"type": "ShellKit", },
"run-command": [ {
"mkdir /data/app/el2/100/base/ohos.acts.multimedia.image/files", "type": "ShellKit",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files" "run-command": [
] "mkdir /data/app/el2/100/base/ohos.acts.multimedia.image/files",
}, "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files"
{ ]
"type": "PushKit", },
"pre-push": [ {
], "type": "PushKit",
"push": [ "pre-push": [],
"./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image/files", "push": [
"./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image/files", "./resource/image/test.bmp ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
"./resource/image/test.123 ->/data/app/el2/100/base/ohos.acts.multimedia.image/files", "./resource/image/test.png ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
"./resource/image/test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files", "./resource/image/test.123 ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
"./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image/files", "./resource/image/test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
"./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files" "./resource/image/test.jpg ->/data/app/el2/100/base/ohos.acts.multimedia.image/files",
] "./resource/image/moving_test.gif ->/data/app/el2/100/base/ohos.acts.multimedia.image/files"
}, ]
},
{ {
"type": "ShellKit", "type": "ShellKit",
"run-command": [ "run-command": [
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.bmp", "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.bmp",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.png", "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.png",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.123", "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.123",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.gif", "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.gif",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.jpg", "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/test.jpg",
"chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/moving_test.gif" "chmod 777 /data/app/el2/100/base/ohos.acts.multimedia.image/files/moving_test.gif"
],
], "teardown-command": []
"teardown-command":[ }
]
] }
} \ No newline at end of file
]
}
{ {
"app": { "app": {
"apiVersion": { "apiVersion": {
"compatible": 6, "compatible": 6,
"releaseType": "Beta1", "releaseType": "Beta1",
"target": 7 "target": 7
}, },
"vendor": "acts", "vendor": "acts",
"bundleName": "ohos.acts.multimedia.image", "bundleName": "ohos.acts.multimedia.image",
"version": { "version": {
"code": 1000000, "code": 1000000,
"name": "1.0.0" "name": "1.0.0"
} }
}, },
"deviceConfig": { "deviceConfig": {
"default": { "default": {
"debug": true "debug": true
} }
}, },
"module": { "module": {
"abilities": [ "abilities": [
{ {
"iconId": 16777218, "skills": [
"skills": [ {
{ "entities": [
"entities": [ "entity.system.home"
"entity.system.home" ],
], "actions": [
"actions": [ "action.system.home"
"action.system.home" ]
] }
} ],
], "orientation": "unspecified",
"descriptionId": 16777217, "formsEnabled": false,
"visible": true, "name": ".MainAbility",
"labelId": 16777216, "srcLanguage": "js",
"icon": "$media:icon", "srcPath": "MainAbility",
"name": "ohos.acts.multimedia.image.MainAbility", "icon": "$media:icon",
"description": "$string:mainability_description", "description": "$string:MainAbility_desc",
"label": "$string:entry_MainAbility", "label": "$string:MainAbility_label",
"type": "page", "type": "page",
"homeAbility": true, "visible": true,
"launchType": "standard" "launchType": "standard"
} },
], {
"deviceType": [ "orientation": "unspecified",
"phone", "formsEnabled": false,
"tablet", "name": ".TestAbility",
"tv", "srcLanguage": "js",
"wearable" "srcPath": "TestAbility",
], "icon": "$media:icon",
"mainAbility": "ohos.acts.multimedia.image.MainAbility", "description": "$string:TestAbility_desc",
"distro": { "label": "$string:TestAbility_label",
"moduleType": "entry", "type": "page",
"installationFree": false, "visible": true,
"deliveryWithInstall": true, "launchType": "standard"
"moduleName": "entry" }
}, ],
"reqPermissions": [ "deviceType": [
{ "phone",
"name": "ohos.permission.GET_BUNDLE_INFO", "tablet",
"reason": "use ohos.permission.GET_BUNDLE_INFO" "tv",
}, "wearable"
{ ],
"name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED", "mainAbility": ".MainAbility",
"reason":"use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED" "distro": {
}, "moduleType": "entry",
{ "installationFree": false,
"name" : "ohos.permission.GRANT_SENSITIVE_PERMISSIONS", "deliveryWithInstall": true,
"reason" : "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS" "moduleName": "entry"
}, },
{ "reqPermissions": [
"name" : "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS", {
"reason" : "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS" "name": "ohos.permission.GET_BUNDLE_INFO",
}, "reason": "use ohos.permission.GET_BUNDLE_INFO"
{ },
"name": "ohos.permission.MEDIA_LOCATION", {
"reason":"use ohos.permission.MEDIA_LOCATION" "name": "ohos.permission.GET_BUNDLE_INFO_PRIVILEGED",
}, "reason": "use ohos.permission.GET_BUNDLE_INFO_PRIVILEGED"
{ },
"name": "ohos.permission.READ_MEDIA", {
"reason":"use ohos.permission.READ_MEDIA" "name": "ohos.permission.GRANT_SENSITIVE_PERMISSIONS",
}, "reason": "use ohos.permission.GRANT_SENSITIVE_PERMISSIONS"
{ },
"name": "ohos.permission.WRITE_MEDIA", {
"reason":"use ohos.permission.WRITE_MEDIA" "name": "ohos.permission.REVOKE_SENSITIVE_PERMISSIONS",
} "reason": "use ohos.permission.REVOKE_SENSITIVE_PERMISSIONS"
], },
"package": "ohos.acts.multimedia.image", {
"name": ".MyApplication", "name": "ohos.permission.MEDIA_LOCATION",
"js": [ "reason": "use ohos.permission.MEDIA_LOCATION"
{ },
"pages": [ {
"pages/index/index" "name": "ohos.permission.READ_MEDIA",
], "reason": "use ohos.permission.READ_MEDIA"
"name": "default", },
"window": { {
"designWidth": 720, "name": "ohos.permission.WRITE_MEDIA",
"autoDesignWidth": true "reason": "use ohos.permission.WRITE_MEDIA"
} }
} ],
] "package": "ohos.acts.multimedia.image",
} "name": ".entry",
"js": [
{
"pages": [
"pages/index/index"
],
"name": "default",
"window": {
"designWidth": 720,
"autoDesignWidth": true
}
},
{
"pages": [
"pages/index/index"
],
"name": ".TestAbility",
"window": {
"designWidth": 720,
"autoDesignWidth": false
}
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
},
"srcPath": ""
}
} }
\ 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 AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
import { Hypium } from '@ohos/hypium'
import testsuite from '../test/List.test'
export default {
onCreate() {
console.info('TestApplication onCreate')
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
console.info('start run testcase!!!')
Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite)
},
onDestroy() {
console.info("TestApplication onDestroy");
}
};
{ {
"strings": { "strings": {
"hello": "Hello", "hello": "Hello",
"world": "World" "world": "World"
} }
} }
\ No newline at end of file
{ {
"strings": { "strings": {
"hello": "您好", "hello": "您好",
"world": "世界" "world": "世界"
} }
} }
\ No newline at end of file
.container { .container {
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.title { .title {
font-size: 40px; font-size: 40px;
color: #000000; color: #000000;
opacity: 0.9; opacity: 0.9;
} }
@media screen and (device-type: tablet) and (orientation: landscape) { @media screen and (device-type: tablet) and (orientation: landscape) {
.title { .title {
font-size: 100px; font-size: 100px;
} }
} }
@media screen and (device-type: wearable) { @media screen and (device-type: wearable) {
.title { .title {
font-size: 28px; font-size: 28px;
color: #FFFFFF; color: #FFFFFF;
} }
} }
@media screen and (device-type: tv) { @media screen and (device-type: tv) {
.container { .container {
background-image: url("/common/images/Wallpaper.png"); background-image: url("/common/images/Wallpaper.png");
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
} }
.title { .title {
font-size: 100px; font-size: 100px;
color: #FFFFFF; color: #FFFFFF;
} }
} }
@media screen and (device-type: phone) and (orientation: landscape) { @media screen and (device-type: phone) and (orientation: landscape) {
.title { .title {
font-size: 60px; font-size: 60px;
} }
} }
<div class="container"> <div class="container">
<text class="title"> <text class="title">
{{ $t('strings.hello') }} {{ title }} {{ $t('strings.hello') }} {{ title }}
</text> </text>
</div> </div>
/* /*
* Copyright (C) 2021 Huawei Device Co., Ltd. * Copyright (C) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import {Core, ExpectExtend} from 'deccjsunit/index'
export default {
export default { data: {
data: { title: ""
title: "" },
}, onInit() {
onInit() { this.title = this.$t('strings.world');
this.title = this.$t('strings.world'); },
}, onShow() {
onShow() { console.info('onShow finish')
console.info('onShow finish') },
const core = Core.getInstance() onReady() {
const expectExtend = new ExpectExtend({ },
'id': 'extend'
})
core.addService('expect', expectExtend)
core.init()
const configService = core.getDefaultService('config')
this.timeout = 60000
configService.setConfig(this)
require('../../../test/List.test')
core.execute()
},
onReady() {
},
} }
\ No newline at end of file
/* /*
* Copyright (C) 2021 Huawei Device Co., Ltd. * Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
export default { export default {
onCreate() { onCreate() {
console.info('AceApplication onCreate'); console.info('AceApplication onCreate');
}, },
onDestroy() { onDestroy() {
console.info('AceApplication onDestroy'); console.info('AceApplication onDestroy');
} }
}; };
\ No newline at end of file
{
"strings": {
"hello": "Hello",
"world": "World"
},
"Files": {
}
}
\ No newline at end of file
{
"strings": {
"hello": "您好",
"world": "世界"
},
"Files": {
}
}
\ No newline at end of file
.container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
left: 0px;
top: 0px;
width: 100%;
height: 100%;
}
.title {
font-size: 60px;
text-align: center;
width: 100%;
height: 40%;
margin: 10px;
}
@media screen and (device-type: phone) and (orientation: landscape) {
.title {
font-size: 60px;
}
}
@media screen and (device-type: tablet) and (orientation: landscape) {
.title {
font-size: 100px;
}
}
\ No newline at end of file
<div class="container">
<text class="title">
{{ $t('strings.hello') }} {{ title }}
</text>
</div>
/*
* 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.
*/
export default {
data: {
title: ""
},
onInit() {
this.title = this.$t('strings.world');
}
}
/*
* Copyright (c) 2022 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry'
function translateParamsToString(parameters) {
const keySet = new Set([
'-s class', '-s notClass', '-s suite', '-s itName',
'-s level', '-s testType', '-s size', '-s timeout',
'-s package', '-s dryRun'
])
let targetParams = '';
for (const key in parameters) {
if (keySet.has(key)) {
targetParams += ' ' + key + ' ' + parameters[key]
}
}
return targetParams.trim()
}
export default {
onPrepare() {
console.info('OpenHarmonyTestRunner OnPrepare')
},
onRun() {
console.log('OpenHarmonyTestRunner onRun run')
var abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments()
var abilityDelegator = AbilityDelegatorRegistry.getAbilityDelegator()
var testAbilityName = abilityDelegatorArguments.parameters['-p'] + '.MainAbility'
var cmd = 'aa start -d 0 -a ' + testAbilityName + ' -b ' + abilityDelegatorArguments.bundleName
cmd += ' ' + translateParamsToString(abilityDelegatorArguments.parameters)
var debug = abilityDelegatorArguments.parameters["-D"]
console.info('debug value : '+debug)
if (debug == 'true')
{
cmd += ' -D'
}
console.info('cmd : '+cmd)
abilityDelegator.executeShellCommand(cmd, (err, data) => {
console.info('executeShellCommand : err : ' + JSON.stringify(err));
console.info('executeShellCommand : data : ' + data.stdResult);
console.info('executeShellCommand : data : ' + data.exitCode);
})
}
};
/* /*
* Copyright (C) 2021 Huawei Device Co., Ltd. * Copyright (C) 2021 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
require('./image.test.js') import Image_test from './image.test.js'
\ No newline at end of file export default function testsuite() {
Image_test()
}
{ {
"string": [ "string": [
{ {
"name": "entry_MainAbility", "name": "entry_MainAbility",
"value": "ImageJSTestMain" "value": "ImageJSTestMain"
}, },
{ {
"name": "mainability_description", "name": "mainability_description",
"value": "ImageJSTestMain Ability" "value": "ImageJSTestMain Ability"
} },
] {
"name": "MainAbility_desc",
"value": "description"
},
{
"name": "MainAbility_label",
"value": "label"
},
{
"name": "TestAbility_desc",
"value": "description"
},
{
"name": "TestAbility_label",
"value": "label"
}
]
} }
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册