提交 1f2f0d1c 编写于 作者: X xdmal

Signed-off-by: xdmal <1114560882@qq.com>

 On branch OpenHarmony-3.1-Beta
 Your branch is up to date with 'origin/OpenHarmony-3.1-Beta'.
上级 fd566d38
...@@ -16,10 +16,14 @@ group("compileruntime") { ...@@ -16,10 +16,14 @@ group("compileruntime") {
testonly = true testonly = true
if (is_standard_system) { if (is_standard_system) {
deps = [ deps = [
"convertxml_lib_standard:convertxml_js_test",
"process_lib_standard:process_js_test", "process_lib_standard:process_js_test",
"uri_lib_standard:uri_js_test",
"url_lib_standard:url_js_test", "url_lib_standard:url_js_test",
"util_lib_standard:util_js_test", "util_lib_standard:util_js_test",
"worker_lib_standard:worker_js_hap", "xml_lib_standard:xml_js_test",
# "worker_lib_standard:worker_js_hap",
] ]
} }
} }
# 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("convertxml_js_test") {
hap_profile = "./src/main/config.json"
js2abc = true
deps = [
":convertxml_js_assets",
":convertxml_resources",
]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ConvertxmlJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
}
ohos_js_assets("convertxml_js_assets") {
source_dir = "./src/main/js/default"
}
ohos_resources("convertxml_resources") {
sources = [ "./src/main/resources" ]
hap_profile = "./src/main/config.json"
}
{
"description": "Configuration for startup convertxml js api Tests",
"driver": {
"type": "JSUnitTest",
"test-timeout": "60000",
"package": "com.example.convertxml",
"shell-timeout": "60000"
},
"kits": [
{
"test-file-name": [
"ConvertxmlJSApiTest.hap"
],
"type": "AppInstallKit",
"cleanup-apps": true
}
]
}
\ No newline at end of file
{
"app": {
"bundleName": "com.example.convertxml",
"vendor": "example",
"version": {
"code": 1000000,
"name": "1.0.0"
},
"apiVersion": {
"compatible": 4,
"target": 5
}
},
"deviceConfig": {},
"module": {
"package": "com.example.convertxml",
"name": ".MyApplication",
"mainAbility": "com.example.convertxml.MainAbility",
"deviceType": [
"phone"
],
"distro": {
"deliveryWithInstall": true,
"moduleName": "entry",
"moduleType": "entry",
"installationFree": false
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"name": "com.example.convertxml.MainAbility",
"icon": "$media:icon",
"description": "$string:mainability_description",
"label": "$string:entry_MainAbility",
"type": "page",
"launchType": "standard"
}
],
"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. * 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.
*/ */
export default { export default {
onCreate() { onCreate() {
console.info('TestApplication onCreate'); console.info('AceApplication onCreate');
}, },
onDestroy() { onDestroy() {
console.info('TestApplication onDestroy'); console.info('AceApplication onDestroy');
} }
}; };
...@@ -2,7 +2,5 @@ ...@@ -2,7 +2,5 @@
"strings": { "strings": {
"hello": "Hello", "hello": "Hello",
"world": "World" "world": "World"
},
"Files": {
} }
} }
\ No newline at end of file
...@@ -2,7 +2,5 @@ ...@@ -2,7 +2,5 @@
"strings": { "strings": {
"hello": "您好", "hello": "您好",
"world": "世界" "world": "世界"
},
"Files": {
} }
} }
\ No newline at end of file
.container {
flex-direction: column;
justify-content: center;
align-items: center;
}
.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"> <div class="container" onswipe="touchMove">
<text class="title"> <text class="title">
{{ $t('strings.hello') }} {{ title }} {{ $t('strings.hello') }} {{ title }}
</text> </text>
......
...@@ -13,13 +13,26 @@ ...@@ -13,13 +13,26 @@
* limitations under the License. * limitations under the License.
*/ */
import file from '@system.file'
import app from '@system.app' import app from '@system.app'
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index' import device from '@system.device'
import router from '@system.router'
import {Core} from 'deccjsunit/lite'
describe('appInfoTest', function () { export default {
it('app_info_test_001', 0, function () { data: {
var info = app.getInfo() title: ""
expect(info.versionName).assertEqual('1.0') },
expect(info.versionCode).assertEqual('3') onInit() {
}) this.title = this.$t('strings.world');
}) },
\ No newline at end of file onShow() {
console.info('onShow finish')
const core = Core.getInstance()
core.init()
require('../../../test/List.test')
core.execute()
},
onReady() {
},
}
\ No newline at end of file
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
* limitations under the License. * limitations under the License.
*/ */
require('./ExampleJsunit.test.js') require('./convertxml.test.js')
\ No newline at end of file \ No newline at end of file
{ {
"string": [ "string": [
{ {
"name": "app_name", "name": "entry_MainAbility",
"value": "URL" "value": "entry_MainAbility"
}, },
{ {
"name": "mainability_description", "name": "mainability_description",
"value": "hap sample empty page" "value": "JS_Empty Ability"
} }
] ]
} }
\ No newline at end of file
...@@ -12,16 +12,25 @@ ...@@ -12,16 +12,25 @@
# limitations under the License. # limitations under the License.
import("//test/xts/tools/build/suite.gni") import("//test/xts/tools/build/suite.gni")
ohos_js_hap_suite("process_js_test") { ohos_js_hap_suite("process_js_test") {
hap_profile = "./src/main/config.json" hap_profile = "./src/main/config.json"
js2abc = true
deps = [ deps = [
":process_js_assets", ":process_js_assets",
":process_resources", ":process_resources",
] ]
# shared_libraries = [
# "//third_party/giflib:libgif",
# "//third_party/libpng:libpng",
# ]
certificate_profile = "./signature/openharmony_sx.p7b" certificate_profile = "./signature/openharmony_sx.p7b"
hap_name = "ActsProcessJSApiTest" hap_name = "ProcessJSApiTest"
# part_name = "prebuilt_hap"
# subsystem_name = "xts"
} }
ohos_js_assets("process_js_assets") { ohos_js_assets("process_js_assets") {
source_dir = "./src/main/js/default" source_dir = "./src/main/js/default"
} }
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"kits": [ "kits": [
{ {
"test-file-name": [ "test-file-name": [
"ActsProcessJSApiTest.hap" "ProcessJSApiTest.hap"
], ],
"type": "AppInstallKit", "type": "AppInstallKit",
"cleanup-apps": true "cleanup-apps": true
......
...@@ -5,6 +5,10 @@ ...@@ -5,6 +5,10 @@
"version": { "version": {
"code": 1000000, "code": 1000000,
"name": "1.0.0" "name": "1.0.0"
},
"apiVersion": {
"compatible": 4,
"target": 5
} }
}, },
"deviceConfig": {}, "deviceConfig": {},
......
/*
* 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.
*/
package com.example.childprocess;
import ohos.ace.ability.AceAbility;
import ohos.aafwk.content.Intent;
public class MainAbility extends AceAbility {
@Override
public void onStart(Intent intent) {
super.onStart(intent);
}
@Override
public void onStop() {
super.onStop();
}
}
/*
* 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.
*/
package com.example.childprocess;
import ohos.aafwk.ability.AbilityPackage;
public class MyApplication extends AbilityPackage {
@Override
public void onInitialize() {
super.onInitialize();
}
}
...@@ -2,5 +2,4 @@ ...@@ -2,5 +2,4 @@
<text class="title"> <text class="title">
{{ $t('strings.hello') }} {{title}} {{ $t('strings.hello') }} {{title}}
</text> </text>
<input class="btn" type="button" value="{{ $t('strings.next') }}" onclick="onclick"></input>
</div> </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 app from '@system.app'
import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/lite'
describe('appInfoTest', function () {
it('app_info_test_001', 0, function () {
var info = app.getInfo()
expect(info.versionCode).assertEqual('1000000')
})
})
\ No newline at end of file
...@@ -13,5 +13,4 @@ ...@@ -13,5 +13,4 @@
* limitations under the License. * limitations under the License.
*/ */
require('./ExampleJsunit.test.js')
require('./Process.test.js') require('./Process.test.js')
\ No newline at end of file
此差异已折叠。
此差异已折叠。
此差异已折叠。
<div class="container"> <div class="container" onswipe="touchMove">
<text class="title"> <text class="title">
{{ $t('strings.hello') }} {{ title }} {{ $t('strings.hello') }} {{ title }}
</text> </text>
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册