diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets index 5afebc3093afa5d5c32339749e22640db5529519..227f759883e35f56b329774b0272fba1831c7419 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/common_ts_ets_api.ets @@ -71,7 +71,7 @@ export default struct Common_ts_ets_apiStaticClear { .textOverflow({ overflow: TextOverflow.None }) .key("staticClearText") .onClick(() => { - AppStorage.staticClear() + AppStorage.Clear() }) Text("common_ts_ets_api-EnvProp") @@ -152,7 +152,7 @@ export default struct Common_ts_ets_apiStaticClear { .textOverflow({ overflow: TextOverflow.None }) .key("staticClearText") .onClick(() => { - AppStorage.clear() + AppStorage.Clear() }) diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets index 1c1a29d6434186aaf6394f91c4ee0a2e5635d777..389ccfe10df1638c5dfe9abf0a1d769cdaf9882e 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/stateManagement.ets @@ -75,8 +75,8 @@ struct StateManagementGetShared { } catch (err) { console.info("setAndLink emit action state err: " + JSON.stringify(err.message)) } - storage1.setAndLink("storageSimpleProp",48) - console.log("storage1.setAndLink('PropA',48) :" + this.simpleVarName ) + // storage1.setAndLink("storageSimpleProp",48) + // console.log("storage1.setAndLink('PropA',48) :" + this.simpleVarName ) }) Text(`Parent from LocalStorage ${ this.simpleVarName }`) @@ -97,8 +97,8 @@ struct StateManagementGetShared { } catch (err) { console.info("setOrCreate emit action state err: " + JSON.stringify(err.message)) } - storage1.setOrCreate("storageSimpleProp",47) - console.log("storageSimpleProp setOrCreate is : " + this.simpleVarName) + // storage1.setOrCreate("storageSimpleProp",47) + // console.log("storageSimpleProp setOrCreate is : " + this.simpleVarName) }) Text(`Parent from LocalStorage ${ this.simpleVarName }`) @@ -120,8 +120,8 @@ struct StateManagementGetShared { console.info("setAndProp emit action state err: " + JSON.stringify(err.message)) } - storage1.setAndProp("storageSimpleProp",49) - console.log("storageSimpleProp setAndProp is : " + this.simpleVarName) + // storage1.setAndProp("storageSimpleProp",49) + //console.log("storageSimpleProp setAndProp is : " + this.simpleVarName) }) }.width("100%").height("100%") diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets index 83ac98b2ae28fdb864609984a5df4cda53a8184f..ed757806f2ab195ce67d390a2b6e18911ce8a4ed 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/uiAppearance.ets @@ -1,3 +1,4 @@ +// @ts-nocheck /** * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets index 4a4c1638b2a324e7db705f455262f54a42a11c41..c83dd2ab9f3023e19c365e611963df7df63e4e49 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/MainAbility/pages/web.ets @@ -1,3 +1,4 @@ +// @ts-nocheck /* * Copyright (c) 2021 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -40,7 +41,7 @@ struct WebComponent { .padding(20) .blur(2) .userAgent("Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Safari/537.36") - .fileFromUrlAccess(true) + // .fileFromUrlAccess(true) .initialScale(2) .webDebuggingAccess(true) .onPrompt((event) => { @@ -129,44 +130,52 @@ struct WebComponent { console.info('onScaleChange newScale: ', event.newScale); }) .onHttpErrorReceive((event) => { - console.log('url:' + event.request.getRequestUrl()); - console.log('isMainFrame:' + event.request.isMainFrame()); - console.log('isRedirect:' + event.request.isRedirect()); - console.log('isRequestGesture:' + event.request.isRequestGesture()); - console.log('getResponseData:' + event.response.getResponseData()); - console.log('getResponseEncoding:' + event.response.getResponseEncoding()); - console.log('getResponseMimeType:' + event.response.getResponseMimeType()); - console.log('getResponseCode:' + event.response.getResponseCode()); - console.log('getReasonMessage:' + event.response.getReasonMessage()); - console.log('setResponseData:' + event.response.setResponseData("ResponseData")); - console.log('setReasonMessage:' + event.response.setReasonMessage("success")); - console.log('setResponseCode:' + event.response.setResponseCode(200)); - console.log('setResponseEncoding:' + event.response.setResponseEncoding("UTF-8")); - console.log('setResponseMimeType:' + event.response.setResponseMimeType("application/json")); - console.log('setResponseHeader:' + event.response.setResponseHeader([])); - console.log('web getExtra:' + this.controller.getHitTestValue().getExtra()); - console.log('web getType:' + this.controller.getHitTestValue().getType()); - console.log('web getCookieManager:' + this.controller.getCookieManager()); - console.log('web getCookie:' + this.controller.getCookieManager().getCookie("www.baidu.com")); - console.log('web existCookie:' + this.controller.getCookieManager().existCookie()); - console.log('web deleteEntireCookie:' + this.controller.getCookieManager().deleteEntireCookie()); - console.log('web deleteExpiredCookie:' + this.controller.getCookieManager().deleteExpiredCookie()); - console.log('web deleteSessionCookie:' + this.controller.getCookieManager().deleteSessionCookie()); - console.log('web isCookieAllowed:' + this.controller.getCookieManager().isCookieAllowed()); - console.log('web isFileURICookieAllowed:' + this.controller.getCookieManager().isFileURICookieAllowed()); - console.log('web isThirdPartyCookieAllowed:' + this.controller.getCookieManager().isThirdPartyCookieAllowed()); - console.log('web putAcceptCookieEnabled:' + this.controller.getCookieManager().putAcceptCookieEnabled(true)); - console.log('web putAcceptFileURICookieEnabled:' + this.controller.getCookieManager().putAcceptFileURICookieEnabled(true)); - console.log('web putAcceptThirdPartyCookieEnabled:' + this.controller.getCookieManager().putAcceptThirdPartyCookieEnabled(true)); - console.log('web saveCookieSync:' + this.controller.getCookieManager().saveCookieSync()); - console.log('web zoomIn:' + this.controller.zoomIn()); - console.log('web zoomOut:' + this.controller.zoomOut()); - console.log('web zoom:' + this.controller.zoom(2)); - console.log('web getWebId:' + this.controller.getWebId()); - console.log('web getDefaultUserAgent:' + this.controller.getDefaultUserAgent()); - console.log('web getTitle:' + this.controller.getTitle()); - console.log('web getPageHeight:' + this.controller.getPageHeight()); - console.log('web backOrForward:' + this.controller.backOrForward(2)); + try { + console.log('url:' + event.request.getRequestUrl()); + console.log('isMainFrame:' + event.request.isMainFrame()); + console.log('isRedirect:' + event.request.isRedirect()); + console.log('isRequestGesture:' + event.request.isRequestGesture()); + console.log('getResponseData:' + event.response.getResponseData()); + console.log('getResponseEncoding:' + event.response.getResponseEncoding()); + console.log('getResponseMimeType:' + event.response.getResponseMimeType()); + console.log('getResponseCode:' + event.response.getResponseCode()); + console.log('getReasonMessage:' + event.response.getReasonMessage()); + console.log('setResponseData:' + event.response.setResponseData("ResponseData")); + console.log('setReasonMessage:' + event.response.setReasonMessage("success")); + console.log('setResponseCode:' + event.response.setResponseCode(200)); + console.log('setResponseEncoding:' + event.response.setResponseEncoding("UTF-8")); + console.log('setResponseMimeType:' + event.response.setResponseMimeType("application/json")); + console.log('setResponseHeader:' + event.response.setResponseHeader([])); + console.log('web getExtra:' + this.controller.getHitTestValue().getExtra()); + console.log('web getType:' + this.controller.getHitTestValue().getType()); + console.log('web getCookieManager:' + this.controller.getCookieManager()); + console.log('web getCookie:' + this.controller.getCookieManager().getCookie("www.baidu.com")); + console.log('web existCookie:' + this.controller.getCookieManager().existCookie()); + console.log('web deleteEntireCookie:' + this.controller.getCookieManager().deleteEntireCookie()); + console.log('web deleteExpiredCookie:' + this.controller.getCookieManager().deleteExpiredCookie()); + console.log('web deleteSessionCookie:' + this.controller.getCookieManager().deleteSessionCookie()); + console.log('web isCookieAllowed:' + this.controller.getCookieManager().isCookieAllowed()); + console.log('web isFileURICookieAllowed:' + this.controller.getCookieManager().isFileURICookieAllowed()); + console.log('web isThirdPartyCookieAllowed:' + this.controller.getCookieManager() + .isThirdPartyCookieAllowed()); + console.log('web putAcceptCookieEnabled:' + this.controller.getCookieManager() + .putAcceptCookieEnabled(true)); + console.log('web putAcceptFileURICookieEnabled:' + this.controller.getCookieManager() + .putAcceptFileURICookieEnabled(true)); + console.log('web putAcceptThirdPartyCookieEnabled:' + this.controller.getCookieManager() + .putAcceptThirdPartyCookieEnabled(true)); + console.log('web saveCookieSync:' + this.controller.getCookieManager().saveCookieSync()); + console.log('web zoomIn:' + this.controller.zoomIn()); + console.log('web zoomOut:' + this.controller.zoomOut()); + console.log('web zoom:' + this.controller.zoom(2)); + console.log('web getWebId:' + this.controller.getWebId()); + console.log('web getDefaultUserAgent:' + this.controller.getDefaultUserAgent()); + console.log('web getTitle:' + this.controller.getTitle()); + console.log('web getPageHeight:' + this.controller.getPageHeight()); + console.log('web backOrForward:' + this.controller.backOrForward(2)); + } catch (error) { + console.info('the error is ' + JSON.stringify(error)); + } let result = event.request.getRequestHeader(); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/global.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/global.test.ets index 5e2cbde4c685427a7f37c5f6407fdb88136fb1c0..e0ed2bfefaf2e86faa0885cfa7da6f529d747b6a 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/global.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/global.test.ets @@ -1,3 +1,4 @@ +// @ts-nocheck /** * Copyright (c) 2022 Shenzhen Kaihong Digital Industry Development Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); @@ -82,8 +83,31 @@ export default function globalJsunit() { it('testglobal_sendMouseEvent0003', 0, async function (done) { console.info('testglobal_sendMouseEvent0003 START'); await Utils.sleep(2000); - let mouseEvent = {button:0,action:3,screenX:202.66666666666666,screenY:102.66666666666667,x:34,y:34,timestamp:8261302454000,source:1, - target:{area:{position:{x:158.66666666666666,y:58.666666666666664},globalPosition:{x:168.66666666666666,y:68.66666666666666},width:142.66666666666666,height:58.666666666666664}}}; + + let mouseEvent: MouseEvent = { + button: 0, + action: 3, + x: 34, + y: 34, + screenX: 202.66666666666666, + screenY: 102.66666666666667, + timestamp: 8261302454000, + target: { + area: { + width: 142.66666666666666, + height:58.666666666666664, + position: { + x: 158.66666666666666, + y: 58.666666666666664, + }, + globalPosition: { + x: 168.66666666666666, + y: 68.66666666666666, + } + } + }, + source: 1 + } let result = sendMouseEvent(mouseEvent); console.info("[testglobal_sendMouseEvent0003] result:" + result); expect(JSON.stringify(result)).assertEqual("true"); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/line.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/line.test.ets index a97b85248d8dac9093a3ae28a56a8642941268e7..38bb38eadea2710b6e0ce9b7b3432ea91c2f6a9d 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/line.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/line.test.ets @@ -57,7 +57,7 @@ export default function lineNeJsunit() { console.info("[testlineNe0001] component width strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Shape'); - expect(obj.$attrs.width).assertEqual("75.00px"); + expect(obj.$attrs.width).assertEqual("50.00vp"); console.info("[testlineNe0001] width value :" + obj.$attrs.width); done(); }); @@ -74,7 +74,7 @@ export default function lineNeJsunit() { console.info("[testlineNe0002] component height strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Shape'); - expect(obj.$attrs.height).assertEqual("150.00px"); + expect(obj.$attrs.height).assertEqual("100.00vp"); console.info("[testlineNe0002] height value :" + obj.$attrs.height); done(); }); @@ -91,7 +91,7 @@ export default function lineNeJsunit() { console.info("[testlineNe0005] component width strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Shape'); - expect(obj.$attrs.width).assertEqual("300.00px"); + expect(obj.$attrs.width).assertEqual("200.00vp"); console.info("[testlineNe0005] width value :" + obj.$attrs.width); done(); }); @@ -108,7 +108,7 @@ export default function lineNeJsunit() { console.info("[testlineNe0006] component height strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Shape'); - expect(obj.$attrs.height).assertEqual("300.00px"); + expect(obj.$attrs.height).assertEqual("200.00"); console.info("[testlineNe0006] height value :" + obj.$attrs.height); done(); }); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/list_item.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/list_item.test.ets index f10dc1c67a892377be8877d287b0da08a02e8d7f..21ae0c0d0c8b4d7b1e31ca1904eeea8430affbb5 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/list_item.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/list_item.test.ets @@ -21,7 +21,7 @@ import Utils from './Utils.ets' export default function list_itemOnSelectJsunit() { describe('list_itemOnSelectTest', function () { beforeAll(async function (done) { - console.info("flex beforeEach start"); + console.info("flex beforeEach start");testlist_itemOnSelect0002 let options = { uri: 'pages/list_item', } @@ -75,7 +75,7 @@ export default function list_itemOnSelectJsunit() { console.info("[testlist_itemOnSelect0002] component border strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('ListItem'); - expect(obj.$attrs.selectable).assertEqual(undefined); + expect(obj.$attrs.selectable).assertEqual(false); console.info("[testlist_itemOnSelect0002] selectable value :" + obj.$attrs.selectable); done(); }); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/swiper.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/swiper.test.ets index 5d80ac2efcba8c9a9c652474777cdc96a9add0f4..280de445a85098dda6dec1a8d52278caeb9c3396 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/swiper.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/swiper.test.ets @@ -28,7 +28,7 @@ export default function swiperCurveJsunit() { router.clear(); let pages = router.getState(); console.info("get swiper state success " + JSON.stringify(pages)); - if (!("swiper" == pages.name)) { + if (!("swiper" == pages.name)) console.info("get swiper state success " + JSON.stringify(pages.name)); let result = await router.push(options); await Utils.sleep(2000); @@ -74,7 +74,7 @@ export default function swiperCurveJsunit() { console.info("[testswiperCurve0002] component cachedCount strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('Swiper'); - expect(obj.$attrs.cachedCount).assertEqual("2"); + expect(obj.$attrs.cachedCount).assertEqual(2); console.info("[testswiperCurve0002] cachedCount value :" + obj.$attrs.cachedCount); done(); }); diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/ProgressJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/ProgressJsunit.test.ets index 92837648e3af206e04f089c8703afa87277df3d9..f9189894c3cbb1b03fc9bc9ac5c34629de1d4a81 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/ProgressJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/ProgressJsunit.test.ets @@ -283,7 +283,8 @@ export default function progressJsunit() { let strJson = getInspectorByKey('LPValue'); let obj = JSON.parse(strJson); console.info("testProgress_1000 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.value).assertEqual("-5.000000"); + // 非法入参默认初始值 + expect(obj.$attrs.value).assertEqual("0.000000"); console.info('testProgress_1000 END'); done(); }); @@ -313,7 +314,8 @@ export default function progressJsunit() { let strJson = getInspectorByKey('LPValue'); let obj = JSON.parse(strJson); console.info("testProgress_1100 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.value).assertEqual("121212121.000000"); + // 非法入参默认初始值 + expect(obj.$attrs.value).assertEqual("100.000000"); console.info('testProgress_1100 END'); done(); }); diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/QrCodeJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/QrCodeJsunit.test.ets index ef88dc7c4993bffcfeef60bcf2160aeb08871c32..3fbcdadad17386e5a2af0f5409091bbd95226477 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/QrCodeJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/QrCodeJsunit.test.ets @@ -183,7 +183,8 @@ export default function qrCodeJsunit() { var strJson = getInspectorByKey('QrCodeColor'); var obj = JSON.parse(strJson); console.info("[test_qrCode_006] component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.backgroundColor).assertEqual('#FF000000'); + // 非法入参默认初始值 + expect(obj.$attrs.backgroundColor).assertEqual('#FFFFFFFF'); done(); }); diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/ToggleJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/ToggleJsunit.test.ets index 5e1aa6e51a22262e0b0f1747c5162cf1cab585e9..75a6e87cec8e2c4d818fa3a1c05dd6baf9824ac3 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/ToggleJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/ToggleJsunit.test.ets @@ -153,7 +153,8 @@ export default function ToggleJsunit() { let strJsonNew = getInspectorByKey('toggle'); let objNew = JSON.parse(strJsonNew); console.info("testToggle06 component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.selectedColor).assertEqual('#FF000000'); + // 非法入参默认初始值 + expect(objNew.$attrs.selectedColor).assertEqual('#33007DFF'); console.info('testToggle06 END'); done(); }); @@ -179,7 +180,7 @@ export default function ToggleJsunit() { let strJsonNew = getInspectorByKey('toggle'); let objNew = JSON.parse(strJsonNew); console.info("testToggle07 component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.selectedColor).assertEqual('#FF000000'); + expect(objNew.$attrs.selectedColor).assertEqual('#33007DFF'); console.info('testToggle07 END'); done(); }); diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/TransitionJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/TransitionJsunit.test.ets index 32c8c9f069f9341d6b37b7d031c9722f26f0d137..1d55211a5c2448620c968065e9cdf4c6f38f3335 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/TransitionJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/TransitionJsunit.test.ets @@ -101,7 +101,8 @@ export default function transitionJsunit() { let strJsonNew = getInspectorByKey('button'); let objNew = JSON.parse(strJsonNew); console.info("transitionTest_0300 component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.opacity).assertEqual(2); + //非法入参默认初始值 + expect(objNew.$attrs.opacity).assertEqual(1); console.info('transitionTest_0300 END'); done(); });