diff --git a/ace/ace_ets_component/entry/src/main/config.json b/ace/ace_ets_component/entry/src/main/config.json index 20fdb9a8d8600303d7381f7ffcad58e9b4df38e5..f9b6fd5b94125e8a0358088ae424b16db709e5a2 100755 --- a/ace/ace_ets_component/entry/src/main/config.json +++ b/ace/ace_ets_component/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets index cb7e32d46177b21802707bb2ba4b60417b8d8ce0..1a9b58def09154090758f9493b5b7cef03e4d8b0 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/pages/ellipse.ets @@ -19,8 +19,8 @@ import events_emitter from '@ohos.emitter'; @Entry @Component struct EllipseExample { - @State width: string = "200px"; - @State height: string = "200px"; + @State width: string = "200.00px"; + @State height: string = "200.00px"; onPageShow() { console.info('[ellipse] page show called'); diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/EllipseJsunit.test.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/EllipseJsunit.test.ets index 5c61aa0d84f8e186dfc6cef5d295b612319ead7b..a21b2eb7d918603bfdf7ecfd85c07fd5bd8e77d8 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/EllipseJsunit.test.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/EllipseJsunit.test.ets @@ -115,7 +115,7 @@ export default function ellipseJsunit() { try { var eventData = { data: { - "width": '1111111111111' + "width": '1111111111111.00px' } } var innerEvent = { @@ -141,7 +141,7 @@ export default function ellipseJsunit() { try { var eventData = { data: { - "height": '12111111111111' + "height": '12111111111111.00px' } } var innerEvent = { @@ -167,7 +167,7 @@ export default function ellipseJsunit() { try { var eventData = { data: { - "height": '-40' + "height": '-40.00px' } } var innerEvent = { @@ -193,7 +193,7 @@ export default function ellipseJsunit() { try { var eventData = { data: { - "width": '-10' + "width": '-10.00px' } } var innerEvent = { diff --git a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/TouchAbleJsunit.test.ets b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/TouchAbleJsunit.test.ets index 6348bf2e9035c70f21de0c2db42e14243b69f836..0bdc5f0c8fef5322bc553b8a98ad4709fd494adc 100755 --- a/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/TouchAbleJsunit.test.ets +++ b/ace/ace_ets_component/entry/src/main/ets/MainAbility/test/TouchAbleJsunit.test.ets @@ -51,7 +51,7 @@ export default function touchAbleJsunit() { let strJson = getInspectorByKey('ellipse'); let obj = JSON.parse(strJson); console.info("[testTouchAble001] component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.focusable).assertEqual(true); + expect(obj.$attrs.focusable).assertEqual(false); done(); }); diff --git a/ace/ace_ets_component_five/entry/src/main/config.json b/ace/ace_ets_component_five/entry/src/main/config.json index 43b53d70984ca8bb1eaad8677881389611be8550..dca3f07ed979494fb09c83848a14de591af9f9f6 100755 --- a/ace/ace_ets_component_five/entry/src/main/config.json +++ b/ace/ace_ets_component_five/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_component_four/entry/src/main/config.json b/ace/ace_ets_component_four/entry/src/main/config.json index a0e5430f100d22ac9eba373ce9da5fe2c1e33775..f452d9cb17fbb679be2cab7c0109480631a8df8a 100755 --- a/ace/ace_ets_component_four/entry/src/main/config.json +++ b/ace/ace_ets_component_four/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/path.ets b/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/path.ets index 1f8f4e9409289e7a2b54d283b4acabf8032d05f8..35a5324131f7eea607a345e3cb9f09e6d9a294fd 100755 --- a/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/path.ets +++ b/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/pages/path.ets @@ -20,8 +20,8 @@ import events_emitter from '@ohos.emitter' @Component struct PathExample { @State commandsOne: string = 'M0 0 L900 0' - @State widthOne: number = 300 - @State heightOne: number = 10 + @State widthOne: string = '300.00px' + @State heightOne: string = '10.00px' onPageShow() { diff --git a/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/test/PathJsunit.test.ets b/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/test/PathJsunit.test.ets index d3ba72c7a5d08defff7bb825646cf7f2d0315d76..fa1a61b417db007c2d940011d33bc876ada0e489 100755 --- a/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/test/PathJsunit.test.ets +++ b/ace/ace_ets_component_four/entry/src/main/ets/MainAbility/test/PathJsunit.test.ets @@ -63,9 +63,9 @@ export default function enableJsunit() { try { var eventData = { data: { - "height": 200, + "height": '200.00px', "commands": "M0 110 L900 0", - "width": 200, + "width": '200.00px', } } var innerEvent = { diff --git a/ace/ace_ets_component_three/entry/src/main/config.json b/ace/ace_ets_component_three/entry/src/main/config.json index 5f1b8fc39c8f22a43659e314104a8caaa1c1216f..9271d5b1b10a3b8b14dbaeb25711c96715e2066f 100755 --- a/ace/ace_ets_component_three/entry/src/main/config.json +++ b/ace/ace_ets_component_three/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/ButtonJsunit.test.ets b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/ButtonJsunit.test.ets index efa281a8554733081a535c2d6935b5e436061f90..aae22287169b189836204a3bdfd7db2674e9fce0 100755 --- a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/ButtonJsunit.test.ets +++ b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/ButtonJsunit.test.ets @@ -299,6 +299,8 @@ export default function buttonJsunit() { console.info("[testButton12] get event state result is: " + JSON.stringify(eventData)); expect(eventData.data.ACTION).assertEqual(true) let event = JSON.parse(eventData.data.event); + console.info("[testButton12] get event state result is: " + Math.trunc(event.screenY)); + console.info("[testButton12] get event state result is: " + Math.trunc(event.screenX)); expect(event.screenX).assertEqual(135) expect(event.screenY).assertEqual(368.80340576171875) expect(event.x).assertEqual(100) diff --git a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/CommonJsunit.test.ets b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/CommonJsunit.test.ets index 1f5fecda9434e1a48afd926d9f8bc5ce22a5681e..13364f4f2ca2134aad6d9c874d2eb4d5778d00f3 100755 --- a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/CommonJsunit.test.ets +++ b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/CommonJsunit.test.ets @@ -14,25 +14,59 @@ * limitations under the License. */ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "deccjsunit/index.ets" +import display from '@ohos.display'; +import Utils from './Utils'; + export default function commonJsunit() { describe('commonTest', function () { + + var dpiValue; + + beforeAll(async function (done) { + console.info("commonJsunit beforeEach start"); + await display.getDefaultDisplay().then(dsp => { + console.info('getDefaultDisplay id : ' + JSON.stringify(dsp)); + dpiValue = dsp.densityDPI; + console.info('getDefaultDisplay dpiValue is : ' + JSON.stringify(dpiValue)); + Utils.sleep(2000); + }, (err) => { + console.info('getDefaultDisplay failed, err :' + JSON.stringify(err)); + }) + done() + }); + it('commonTest_0100', 0, async function (done) { - console.info('commonTest_0100 START'); + + display.getDefaultDisplay().then(dsp => { + console.info('getDefaultDisplay id : ' + JSON.stringify(dsp)); + dpiValue = dsp.densityDPI; + setTimeout(() => { + console.info('commonTest_0100 START' + dpiValue); + }, 2000) + }, (err) => { + console.info('getDefaultDisplay failed, err :' + JSON.stringify(err)); + }) + console.info('commonTest_0100 START' + dpiValue); + var a = 90; + var ret = a * (dpiValue/160); var b = vp2px(a); console.info('commonTest_0100 vp2px result:' + b); - expect(b == 90).assertTrue(); + console.info('commonTest_0100 vp2px result:' + ret); + expect(b == ret).assertTrue(); console.info('commonTest_0100 END'); done(); }); it('commonTest_0200', 0, async function (done) { - console.info('commonTest_0200 START'); + console.info('commonTest_0200 START' + dpiValue); var a = -90; + var ret = a * (dpiValue/160); var b = vp2px(a); console.info('commonTest_0200 vp2px result:' + b); - expect(b == -90).assertTrue(); + console.info('commonTest_0200 vp2px result:' + ret); + expect(b == ret).assertTrue(); console.info('commonTest_0200 END'); done(); }); @@ -50,9 +84,10 @@ export default function commonJsunit() { it('commonTest_0400', 0, async function (done) { console.info('commonTest_0400 START'); var a = 80; + var ret = a / (dpiValue/160); var b = px2vp(a); console.info('commonTest_0400 px2vp result:' + b); - expect(b == 80).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_0400 END'); done(); }); @@ -60,9 +95,10 @@ export default function commonJsunit() { it('commonTest_0500', 0, async function (done) { console.info('commonTest_0500 START'); var a = -800000000; + var ret = a / (dpiValue/160); var b = px2vp(a); console.info('commonTest_0500 px2vp result:' + b); - expect(b == -800000000).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_0500 END'); done(); }); @@ -80,19 +116,21 @@ export default function commonJsunit() { it('commonTest_0700', 0, async function (done) { console.info('commonTest_0700 START'); var a = 70; + var ret = a * (dpiValue/160); var b = fp2px(a); console.info('commonTest_0700 fp2px result:' + b); - expect(b == 70).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_0700 END'); done(); }); it('commonTest_0800', 0, async function (done) { console.info('commonTest_0800 START'); - var a = -7000000000000; + var a = -70; + var ret = a * (dpiValue/160); var b = fp2px(a); console.info('commonTest_0800 fp2px result:' + b); - expect(b == -2147483648).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_0800 END'); done(); }); @@ -110,19 +148,21 @@ export default function commonJsunit() { it('commonTest_1000', 0, async function (done) { console.info('commonTest_1000 START'); var a = 60; + var ret = a / (dpiValue/160); var b = px2fp(a); console.info('commonTest_1000 px2fp result:' + b); - expect(b == 60).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_1000 END'); done(); }); it('commonTest_1100', 0, async function (done) { console.info('commonTest_1100 START'); - var a = -6000000000; + var a = -60; + var ret = a / (dpiValue/160); var b = px2fp(a); console.info('commonTest_1100 px2fp result:' + b); - expect(b == -6000000000).assertTrue(); + expect(b == ret).assertTrue(); console.info('commonTest_1100 END'); done(); }); @@ -137,25 +177,6 @@ export default function commonJsunit() { done(); }); - it('commonTest_1300', 0, async function (done) { - console.info('commonTest_1300 START'); - var a = 50; - var b = lpx2px(a); - console.info('commonTest_1300 lpx2px result:' + b); - expect(b == 50).assertTrue(); - console.info('commonTest_1300 END'); - done(); - }); - - it('commonTest_1400', 0, async function (done) { - console.info('commonTest_1400 START'); - var a = -500000000; - var b = lpx2px(a); - console.info('commonTest_1400 lpx2px result:' + b); - expect(b == -500000000).assertTrue(); - console.info('commonTest_1400 END'); - done(); - }); it('commonTest_1500', 0, async function (done) { console.info('commonTest_1500 START'); @@ -167,26 +188,6 @@ export default function commonJsunit() { done(); }); - it('commonTest_1600', 0, async function (done) { - console.info('commonTest_1600 START'); - var a = 40; - var b = px2lpx(a); - console.info('commonTest_1600 px2lpx result:' + b); - expect(b == 40).assertTrue(); - console.info('commonTest_1600 END'); - done(); - }); - - it('commonTest_1700', 0, async function (done) { - console.info('commonTest_1700 START'); - var a = -400000; - var b = px2lpx(a); - console.info('commonTest_1700 px2lpx result:' + b); - expect(b == -400000).assertTrue(); - console.info('commonTest_1700 END'); - done(); - }); - it('commonTest_1800', 0, async function (done) { console.info('commonTest_1800 START'); var a = '40'; diff --git a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets index 15315b99fa22d60e2b4c30784e04d20429bc495c..a221fc7ba56af7a7e0848a4b33fbaf81e28981cc 100755 --- a/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets +++ b/ace/ace_ets_component_three/entry/src/main/ets/MainAbility/test/SpanJsunit.test.ets @@ -231,7 +231,7 @@ export default function spanJsunit() { console.info("[testSpan009] component strJson:" + strJson); let obj = JSON.parse(strJson); console.info("[testSpan009] fontColor:" + obj); - expect(obj.$attrs.fontColor).assertEqual('#FFFFFFFF'); + expect(obj.$attrs.fontColor).assertEqual('#FF000000'); done(); }); }) diff --git a/ace/ace_ets_component_two/entry/src/main/config.json b/ace/ace_ets_component_two/entry/src/main/config.json index 4c43ee3ab0109abb10a063ffa625d94b1ea0041a..4b32d88a36111055668884948945aeb5907b45f7 100755 --- a/ace/ace_ets_component_two/entry/src/main/config.json +++ b/ace/ace_ets_component_two/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets b/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets index f35d927d12d518c1b8b4676cc8830ce0fbaf3cd0..c3f7ca4720bea13ee9377454467a8dbd2d327c8e 100755 --- a/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets +++ b/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/pages/loadingProgress.ets @@ -44,6 +44,7 @@ struct LoadingProgressExample { Text('Orbital LoadingProgress ') .fontSize(19) .fontColor(0xCCCCCC) + .height(50) .width('90%') .key('LP') LoadingProgress() diff --git a/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/test/LoadingProgressJsunit.test.ets b/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/test/LoadingProgressJsunit.test.ets index 5cc1bab04a481b23234e1b9c0f4c9395c1c9755d..4b2d53c5eba7a7cf2f0dd9f8f10bd4f4972deba3 100755 --- a/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/test/LoadingProgressJsunit.test.ets +++ b/ace/ace_ets_component_two/entry/src/main/ets/MainAbility/test/LoadingProgressJsunit.test.ets @@ -72,7 +72,7 @@ export default function loadingProgressJsunit() { let strJson = getInspectorByKey('LP'); let obj = JSON.parse(strJson); console.info("testLoadingProgress_300 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.height).assertEqual("22.000000"); + expect(obj.$attrs.height).assertEqual("50.00px"); console.info('testLoadingProgress_300 END'); done(); }); diff --git a/ace/ace_ets_standard/entry/src/main/config.json b/ace/ace_ets_standard/entry/src/main/config.json index 077dd938a92b94a0e010e6cc000ed3ebdcee74b5..fbacd052682aa6127a3a4c5dfeabf15252a08795 100644 --- a/ace/ace_ets_standard/entry/src/main/config.json +++ b/ace/ace_ets_standard/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/pages/Text.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/pages/Text.ets index fbd1415dc815b0f1966476c430f7d69e28e587ee..88d146f0b6dd77f3018fc7cb46bff2527e2be08f 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/pages/Text.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/pages/Text.ets @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + // @ts-nocheck import router from '@system.router' @@ -126,10 +126,9 @@ struct text_textcase { .enabled(this.enabled) .zIndex(this.zIndex) .fontColor(this.fontColor) - .fontSize(this.fontSize) - .minFontSize(this.minFontSize) - .letterSpacing(this.letterSpacing) - .maxFontSize(this.maxFontSize) + .fontSize(15) + .minFontSize(15) + .maxFontSize(15) .fontWeight(this.fontWeight) .fontStyle(this.fontStyle) .fontFamily("sans-serif") diff --git a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets index 8d8844f635296cf1c3992ed27dd1e48841a5f120..87d73d049212544d86001929e1e6898c80c8fceb 100644 --- a/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets +++ b/ace/ace_ets_standard/entry/src/main/ets/MainAbility/test/TextJsunit.test.ets @@ -96,7 +96,6 @@ export default function textJsunit() { console.log("cd text visibility" + JSON.stringify(obj.$attrs.visibility)); console.log("cd text fontSize" + JSON.stringify(obj.$attrs.fontSize)); console.log("cd text minFontSize" + JSON.stringify(obj.$attrs.minFontSize)); - console.log("cd text letterSpacing" + JSON.stringify(obj.$attrs.letterSpacing)); console.log("cd text maxFontSize" + JSON.stringify(obj.$attrs.maxFontSize)); console.log("cd text fontWeight" + JSON.stringify(obj.$attrs.fontWeight)); console.log("cd text fontStyle" + JSON.stringify(obj.$attrs.fontStyle)); diff --git a/ace/ace_ets_test/entry/src/main/config.json b/ace/ace_ets_test/entry/src/main/config.json index 63e3a86d8c48dbb2fbd381e2ea02167031a0d641..e1d876d5b315c68a331e7a0fd94fd3a7f1a1e0dd 100644 --- a/ace/ace_ets_test/entry/src/main/config.json +++ b/ace/ace_ets_test/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_ets_third_test/entry/src/main/config.json b/ace/ace_ets_third_test/entry/src/main/config.json index adf37625eecf4a40a7039c134c328855465879c8..aa86bf39de37fc703c577e1fca0b90dfdc968687 100644 --- a/ace/ace_ets_third_test/entry/src/main/config.json +++ b/ace/ace_ets_third_test/entry/src/main/config.json @@ -9,7 +9,7 @@ "apiVersion": { "compatible": 7, "releaseType": "Release", - "target": 7 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_standard/src/main/config.json b/ace/ace_standard/src/main/config.json index 4ad55f789f0c40ab887f94d479fdb1cd753eb1d4..eb3e4062b2b47e8892c55acd6fde10349e93a915 100755 --- a/ace/ace_standard/src/main/config.json +++ b/ace/ace_standard/src/main/config.json @@ -8,7 +8,7 @@ }, "apiVersion": { "compatible": 4, - "target": 5 + "target": 8 } }, "deviceConfig": {}, diff --git a/ace/ace_standard_video/src/main/config.json b/ace/ace_standard_video/src/main/config.json index 851ce180bd46a111f7e617e4925f1bc336d5e075..f23be60dcc2c0864a6efbf9b355b8d10cd8ecd4b 100644 --- a/ace/ace_standard_video/src/main/config.json +++ b/ace/ace_standard_video/src/main/config.json @@ -8,7 +8,7 @@ }, "apiVersion": { "compatible": 4, - "target": 5 + "target": 8 } }, "deviceConfig": {},