From 19bd1b160c55843afffb907e4d421d1070dd697a Mon Sep 17 00:00:00 2001 From: zhangjing Date: Thu, 5 Jan 2023 20:31:01 +0800 Subject: [PATCH] =?UTF-8?q?web=E7=BB=84=E4=BB=B6=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=9B=B8=E5=85=B3=E7=94=A8=E4=BE=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangjing --- .../src/main/ets/MainAbility/pages/web.ets | 58 +++++++++---------- .../entry/src/main/ets/test/Utils.ets | 16 +++++ .../src/main/ets/test/WebJsunit.test.ets | 10 ++-- .../src/main/resources/rawfile/index.html | 4 +- 4 files changed, 52 insertions(+), 36 deletions(-) diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets index 51f4fed9c..3a3c01fec 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/MainAbility/pages/web.ets @@ -269,7 +269,7 @@ struct Index { break; } case "emitOnResourceLoad":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/second.html"}) + this.controller.loadUrl({url:"resource://rawfile/second.html"}); setTimeout(()=>{ Utils.emitEvent(this.loadedResource,108) },3000) @@ -284,7 +284,7 @@ struct Index { break; } case "emitRunJavaScript":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"testRunJavaScript()",callback:(res)=>{ Utils.emitEvent(res,112) @@ -299,7 +299,7 @@ struct Index { break; } case "emitOnRefreshAccessedHistory":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/second.html"}) + this.controller.loadUrl({url:"resource://rawfile/second.html"}); setTimeout(()=>{ Utils.emitEvent(this.newUrl,116) },3000) @@ -316,7 +316,7 @@ struct Index { break; } case "emitGetTitle":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); setTimeout(()=>{ let webTitle=this.controller.getTitle() Utils.emitEvent(webTitle,122) @@ -324,7 +324,7 @@ struct Index { break; } case "emitGetPageHeight":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); let webPageHeight=this.controller.getPageHeight()+"" setTimeout(()=>{ this.controller.runJavaScript({script:"getPageHeight()",callback:(res)=>{ @@ -335,7 +335,7 @@ struct Index { break; } case "emitGetRequestFocus":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/second.html"}) + this.controller.loadUrl({url:"resource://rawfile/second.html"}); await Utils.sleep(2000) sendEventByKey('textInput',10,'') break; @@ -382,7 +382,7 @@ struct Index { case "emitGeolocationAccessFalse":{ this.geolocationAccess=false await Utils.sleep(2000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/geo.html"}) + this.controller.loadUrl({url:"resource://rawfile/geo.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getGeoResult()",callback:(res)=>{ console.info("getGeoResult==>"+res) @@ -394,7 +394,7 @@ struct Index { case "emitInitialScale":{ this.initialScale=120 await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/second.html"}) + this.controller.loadUrl({url:"resource://rawfile/second.html"}); this.enterPageEnd=true break; } @@ -409,13 +409,13 @@ struct Index { this.geolocationAccess=true this.geoShow=true await Utils.sleep(2000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/geo.html"}) + this.controller.loadUrl({url:"resource://rawfile/geo.html"}); break; } case "emitDomStorageAccessFalse":{ this.domStorageAccess=false await Utils.sleep(2000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/domApi.html"}) + this.controller.loadUrl({url:"resource://rawfile/domApi.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getDomResult()",callback:(res)=>{ console.info("getDomResult==>"+res) @@ -427,7 +427,7 @@ struct Index { case "emitDomStorageAccessTrue":{ this.domStorageAccess=true await Utils.sleep(2000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/domApi.html"}) + this.controller.loadUrl({url:"resource://rawfile/domApi.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getDomResult()",callback:(res)=>{ console.info("getDomResult==>"+res) @@ -439,7 +439,7 @@ struct Index { case "emitImageAccessFalse":{ this.imageAccess=false await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getImgResult()",callback:(res)=>{ console.info("getImgResult==>"+res) @@ -451,7 +451,7 @@ struct Index { case "emitImageAccessTrue":{ this.imageAccess=true await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getImgResult()",callback:(res)=>{ console.info("getImgResult==>"+res) @@ -463,7 +463,7 @@ struct Index { case "emitOnlineImageAccessFalse":{ this.onlineImageAccess=false await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/onlineImageAccess.html"}) + this.controller.loadUrl({url:"resource://rawfile/onlineImageAccess.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getImageLoadResult()",callback:(res)=>{ console.info("getImageLoadResult==>"+res) @@ -475,7 +475,7 @@ struct Index { case "emitOnlineImageAccessTrue":{ this.onlineImageAccess=true await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/onlineImageAccess.html"}) + this.controller.loadUrl({url:"resource://rawfile/onlineImageAccess.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getImageLoadResult()",callback:(res)=>{ console.info("getImageLoadResult==>"+res) @@ -487,7 +487,7 @@ struct Index { case "emitDatabaseAccessTrue":{ this.databaseAccess=true await Utils.sleep(2000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/databaseAccess.html"}) + this.controller.loadUrl({url:"resource://rawfile/databaseAccess.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getDataResult()",callback:(res)=>{ console.info("getDataResult==>"+res) @@ -499,7 +499,7 @@ struct Index { case "emitOverviewModeAccessFalse":{ this.overviewModeAccess=false await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/overview.html"}) + this.controller.loadUrl({url:"resource://rawfile/overview.html"}); setTimeout(()=>{ let webPageHeight=this.controller.getPageHeight() this.controller.runJavaScript({script:"getViewResult()",callback:(res)=>{ @@ -513,7 +513,7 @@ struct Index { case "emitOverviewModeAccessTrue":{ this.overviewModeAccess=true await Utils.sleep(1000) - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/overview.html"}) + this.controller.loadUrl({url:"resource://rawfile/overview.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"getViewResult()",callback:(res)=>{ console.info("getViewResult==>"+res) @@ -523,7 +523,7 @@ struct Index { break; } case "emitOnPrompt":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); setTimeout(()=>{ this.controller.runJavaScript({script:"toPrompt()"}) },3000) @@ -562,7 +562,7 @@ struct Index { } case "emitFileAccessTrue":{ this.fileAccess=true - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) + this.controller.loadUrl({url:"resource://rawfile/index.html"}); this.controller.runJavaScript({script:"openRawFile()"}) setTimeout(()=>{ let webTitle=this.controller.getTitle() @@ -615,10 +615,10 @@ struct Index { this.controller.loadUrl({url:'https://example1.com/path/does/not/exist/index.jsp'}) break; } - case "emitOnTitleReceive":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) - setTimeout(()=>{ - Utils.emitEvent(this.titleReceive,67) + case "emitOnTitleReceive":{ + this.controller.loadUrl({url:"resource://rawfile/index.html"}); + setTimeout(()=>{ + Utils.emitEvent(this.titleReceive,67) },3000) break; } @@ -644,9 +644,9 @@ struct Index { },3000) break; } - case "emitZoom":{ - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) - setTimeout(()=>{ + case "emitZoom":{ + this.controller.loadUrl({url:"resource://rawfile/index.html"}); + setTimeout(()=>{ this.controller.zoom(2) setTimeout(() => { if(this.controller.getPageHeight() > 1400){ @@ -728,8 +728,8 @@ struct Index { } case "emitOnActive":{ this.controller.onActive() - this.controller.loadUrl({url:"file:///data/storage/el1/bundle/phone/resources/rawfile/index.html"}) - setTimeout(()=>{ + this.controller.loadUrl({url:"resource://rawfile/index.html"}); + setTimeout(()=>{ let onActiveCalled = this.pageBegin Utils.emitEvent(onActiveCalled,85) },5000) diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets index d8e0944a8..0a226ceec 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/test/Utils.ets @@ -29,9 +29,13 @@ export default class Utils { console.info(`[${testCaseName}] START`); try{ let callBack=(backData)=>{ + try{ console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); expect(backData.data.ACTION).assertEqual(expectedValue); console.info(`[${testCaseName}] END`); + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } done() } let innerEvent = { @@ -64,10 +68,14 @@ export default class Utils { console.info(`[${testCaseName}] START`); try{ let callBack=(backData)=>{ + try{ console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); expect(backData.data.actualValue).assertLarger(backData.data.expectedValue-100); expect(backData.data.actualValue).assertLess(backData.data.expectedValue-(-100)); console.info(`[${testCaseName}] END`); + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } done() } let innerEvent = { @@ -101,9 +109,13 @@ export default class Utils { console.info(`[${testCaseName}] START`); try{ let callBack=(backData)=>{ + try{ console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); expect(backData.data.ACTION).assertContain(expectedValue); console.info(`[${testCaseName}] END`); + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } done() } let innerEvent = { @@ -136,9 +148,13 @@ export default class Utils { console.info(`[${testCaseName}] START`); try{ let callBack=(backData)=>{ + try{ console.info(`${testCaseName} get result is:`+JSON.stringify(backData)); expect(backData.data.actualValue).assertLarger(backData.data.expectedValue); console.info(`[${testCaseName}] END`); + }catch(err){ + console.info(`[${testCaseName}] err:`+JSON.stringify(err)); + } done() } let innerEvent = { diff --git a/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets b/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets index adca0442c..b26b3e4bf 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets +++ b/arkui/ace_ets_web_dev/entry/src/main/ets/test/WebJsunit.test.ets @@ -91,7 +91,7 @@ export default function webJsunit() { */ it('onResourceLoad',0,async function(done){ emitKey="emitLoadUrl"; - Utils.registerEvent("onResourceLoad","file:///data/storage/el1/bundle/phone/resources/rawfile/second.html",108,done); + Utils.registerContainEvent("onResourceLoad","second.html",108,done); sendEventByKey('webcomponent',10,''); }) /* @@ -129,7 +129,7 @@ export default function webJsunit() { */ it('onRefreshAccessedHistory',0,async function(done){ emitKey="emitGetHitTest"; - Utils.registerEvent("onRefreshAccessedHistory","file:///data/storage/el1/bundle/phone/resources/rawfile/second.html",116,done); + Utils.registerContainEvent("onRefreshAccessedHistory","second.html",116,done); sendEventByKey('webcomponent',10,''); }) /* @@ -439,7 +439,7 @@ export default function webJsunit() { */ it('onPageBegin',0,async function(done){ emitKey="emitOnPageEnd"; - Utils.registerEvent("onPageBegin","file:///data/storage/el1/bundle/phone/resources/rawfile/index.html",59,done); + Utils.registerContainEvent("onPageBegin","index.html",59,done); sendEventByKey('webcomponent',10,''); }) /* @@ -449,7 +449,7 @@ export default function webJsunit() { */ it('onPageEnd',0,async function(done){ emitKey="emitOnConsole"; - Utils.registerEvent("onPageEnd","file:///data/storage/el1/bundle/phone/resources/rawfile/index.html",60,done); + Utils.registerContainEvent("onPageEnd","index.html",60,done); sendEventByKey('webcomponent',10,''); }) /* @@ -629,7 +629,7 @@ export default function webJsunit() { */ it('onActive',0,async function(done){ emitKey="emitRegisterJavaScriptProxy"; - Utils.registerEvent("onActive","file:///data/storage/el1/bundle/phone/resources/rawfile/index.html",85,done); + Utils.registerContainEvent("onActive","index.html",85,done); sendEventByKey('webcomponent',10,''); }) /* diff --git a/arkui/ace_ets_web_dev/entry/src/main/resources/rawfile/index.html b/arkui/ace_ets_web_dev/entry/src/main/resources/rawfile/index.html index bd56a8209..08a5080ec 100644 --- a/arkui/ace_ets_web_dev/entry/src/main/resources/rawfile/index.html +++ b/arkui/ace_ets_web_dev/entry/src/main/resources/rawfile/index.html @@ -14,8 +14,8 @@
首页
- 打开rawfile文件 - icon + 打开rawfile文件 + icon