diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets index a567aa4731613fac5633bf1f07ccbd27e5512cbe..02cf227ab0869b78b04f0e70798d62859db7fbc6 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/MainAbility/pages/web.ets @@ -32,7 +32,7 @@ struct Index { host: string = "www.spincast.org" realm: string = "protected example" username_password: string[] - origin: string="file:///" + origin: string="resource://rawfile/" onPageShow(){ let valueChangeEvent={ eventId:10, @@ -84,8 +84,12 @@ struct Index { }) break; } - case "emitAllowGeolocation":{ - web_webview.GeolocationPermissions.allowGeolocation("file:///") + case "emitAllowGeolocation":{ + try { + web_webview.GeolocationPermissions.allowGeolocation("resource://rawfile/"); + } catch (error) { + console.error(`ErrorCode: ${error.code}, Message: ${error.message}`); + } web_webview.GeolocationPermissions.getAccessibleGeolocation(this.origin, (error, result) => { if (error) { console.log('error:' + JSON.stringify(error)); @@ -98,7 +102,7 @@ struct Index { break; } case "emitDeleteGeolocation":{ - web_webview.GeolocationPermissions.deleteGeolocation("file:///") + web_webview.GeolocationPermissions.deleteGeolocation("resource://rawfile/") web_webview.GeolocationPermissions.getStoredGeolocation((error,origins) => { if (error) { console.log('error:' + JSON.stringify(error)); @@ -111,7 +115,7 @@ struct Index { break; } case "emitDeleteAllGeolocation":{ - web_webview.GeolocationPermissions.allowGeolocation("file:///") + web_webview.GeolocationPermissions.allowGeolocation("resource://rawfile/") web_webview.GeolocationPermissions.deleteAllGeolocation() web_webview.GeolocationPermissions.getStoredGeolocation((error,origins) => { if (error) { @@ -160,7 +164,7 @@ struct Index { break; } case "emitLoaData":{ - 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.loadData({ data: "index", diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/Utils.ets b/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/Utils.ets index 1a90ba6aedd9cd4c5662f10bd0f033f6136cb61a..9896396f70e8c45a502f4e3f26182dc800a1cb2d 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/Utils.ets +++ b/arkui/ace_ets_web_dev_two/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 = { diff --git a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets b/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets index 6b9a620b156b2b28573337777e1f3fb5eabffb9a..eeffac7a099275ebb89b70c2027b195a683ad7b7 100644 --- a/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets +++ b/arkui/ace_ets_web_dev_two/entry/src/main/ets/test/WebJsunit.test.ets @@ -61,7 +61,7 @@ export default function webJsunit() { */ it('allowGeolocation',0,async function(done){ emitKey="emitDeleteGeolocation"; - Utils.registerEvent("allowGeolocation","file:///, result: true",402,done); + Utils.registerEvent("allowGeolocation","resource://rawfile/, result: true",402,done); sendEventByKey('webcomponent',10,''); }) /* @@ -69,19 +69,19 @@ export default function webJsunit() { *tc.name deleteGeolocation *tc.desic delete specific restored geolocation */ - it('deletGeolocation',0,async function(done){ + it('deleteGeolocation',0,async function(done){ emitKey="emitDeleteAllGeolocation"; - Utils.registerEvent("deletGeolocation","",404,done); + Utils.registerEvent("deleteGeolocation","",404,done); sendEventByKey('webcomponent',10,''); }) /* *tc.number SUB_ACE_BASIC_ETS_API_069 - *tc.name deletAllGeolocation + *tc.name deleteAllGeolocation *tc.desic delete all restored geolocation */ - it('deletAllGeolocation',0,async function(done){ + it('deleteAllGeolocation',0,async function(done){ emitKey="emitIsCookieAllowed"; - Utils.registerEvent("deletAllGeolocation","",406,done); + Utils.registerEvent("deleteAllGeolocation","",406,done); sendEventByKey('webcomponent',10,''); }) /* @@ -141,7 +141,7 @@ export default function webJsunit() { */ it('getSourceId',0,async function(done){ emitKey="emitLoaData"; - Utils.registerEvent("getSourceId","file:///data/storage/el1/bundle/phone/resources/rawfile/index.html",422,done); + Utils.registerEvent("getSourceId","resource://rawfile/index.html",422,done); sendEventByKey('webcomponent',10,''); }) /*