diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets index 575433d1d9e90de28bedc4971d4a9bc6ce39e69f..4800de25388a351d61c2c92a74e2ed62eeb5a8e5 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets +++ b/validator/acts_validator/src/main/ets/pages/ArkUI/ArkUI_index.ets @@ -116,7 +116,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'Pass'){ + if (this.result === 'true'){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -130,7 +130,7 @@ struct IndexPage { fileio.writeSync(Fd,Report); filewrite(name1,results,titles); } - else if (this.result === 'Fail'){ + else if (this.result === 'false'){ this.ColorObject[this.current] = '#ffff0000'; let Log = (titles+';'+'#ffff0000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -274,20 +274,20 @@ struct IndexPage { title[i] = str1[i*2]; result[i] = str1[i*2+1]; } - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while (FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -342,7 +342,8 @@ function filewrite(name1,results,titles){ console.info("RRRRRRRRRRd"+RD); let report = String.fromCharCode.apply(null,new Uint8Array(buf)); let WriteTitle = (titles).toString(); - let number = WriteTitle.length + 6; + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; let Index = report.indexOf(WriteTitle); let Log = (titles+";"+results+";").toString(); if (Index == -1){ diff --git a/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets b/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets index 8ea9abf1c0c9eff78de3d19edd614dfe2a8c7115..4c7d25aac05fc54d5601d9b6339bdeaa85b4a5cd 100644 --- a/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets +++ b/validator/acts_validator/src/main/ets/pages/ArkUI/TouchMoveTest.ets @@ -50,7 +50,7 @@ struct CustomContainer1 { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -68,7 +68,7 @@ struct CustomContainer1 { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets b/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets index d4386a42abf280838f576b328d01d00f2f7c7094..b4f6f55fc08e569bd5d7f3d7914f80ebc6dc2299 100644 --- a/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Audio/Audio_index.ets @@ -99,7 +99,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'Pass'){ + if (this.result === 'true'){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -113,7 +113,7 @@ struct IndexPage { fileio.writeSync(Fd,Report); filewrite(name1,results,titles) } - else if (this.result === 'Fail'){ + else if (this.result === 'false'){ this.ColorObject[this.current] = '#ffff0000'; let Log = (titles+';'+'#ffff0000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -257,20 +257,20 @@ struct IndexPage { title[i] = str1[i*2]; result[i] = str1[i*2+1]; } - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while (FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -325,7 +325,8 @@ function filewrite(name1,results,titles){ console.info("RRRRRRRRRRd"+RD); let report = String.fromCharCode.apply(null,new Uint8Array(buf)); let WriteTitle = (titles).toString(); - let number = WriteTitle.length + 6; + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; let Index = report.indexOf(WriteTitle); let Log = (titles+";"+results+";").toString(); if (Index == -1){ diff --git a/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets b/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets index 7d2247d5ced2fff39e285be3f5c662daac342101..072465388929cd555a43764d5b70658c1a7c47d6 100644 --- a/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Camera/Camera_index.ets @@ -100,7 +100,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'Pass'){ + if (this.result === 'true'){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -114,7 +114,7 @@ struct IndexPage { fileio.writeSync(Fd,Report); filewrite(name1,results,titles) } - else if (this.result === 'Fail'){ + else if (this.result === 'false'){ this.ColorObject[this.current] = '#ffff0000'; let Log = (titles+';'+'#ffff0000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -258,20 +258,20 @@ struct IndexPage { title[i] = str1[i*2]; result[i] = str1[i*2+1]; } - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while (FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -326,7 +326,8 @@ function filewrite(name1,results,titles){ console.info("RRRRRRRRRRd"+RD); let report = String.fromCharCode.apply(null,new Uint8Array(buf)); let WriteTitle = (titles).toString(); - let number = WriteTitle.length + 6; + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; let Index = report.indexOf(WriteTitle); let Log = (titles+";"+results+";").toString(); if (Index == -1){ diff --git a/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets b/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets index d82bb825a6b0a0058f46d148c247d5bae0a45f0d..0dc154171080a85fd9b730d4997ffe6499da4ac9 100644 --- a/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Experience/Experience_index.ets @@ -112,7 +112,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'Pass'){ + if (this.result === 'true'){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -126,7 +126,7 @@ struct IndexPage { fileio.writeSync(Fd,Report); filewrite(name1,results,titles) } - else if (this.result === 'Fail'){ + else if (this.result === 'false'){ this.ColorObject[this.current] = '#ffff0000'; let Log = (titles+';'+'#ffff0000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -270,20 +270,20 @@ struct IndexPage { title[i] = str1[i*2]; result[i] = str1[i*2+1]; } - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while (FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -338,7 +338,8 @@ function filewrite(name1,results,titles){ console.info("RRRRRRRRRRd"+RD); let report = String.fromCharCode.apply(null,new Uint8Array(buf)); let WriteTitle = (titles).toString(); - let number = WriteTitle.length + 6; + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; let Index = report.indexOf(WriteTitle); let Log = (titles+";"+results+";").toString(); if (Index == -1){ diff --git a/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets b/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets index 2e917f84333145c802db7f3ce34b0a5bb1ecd908..45620202bcc4da1d4c837f8403c5482916f3bb7b 100644 --- a/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets +++ b/validator/acts_validator/src/main/ets/pages/Player/Player_index.ets @@ -96,7 +96,7 @@ struct IndexPage { let number = WriteTitle.length + 11; let Index = ColorBack.indexOf(WriteTitle); - if (this.result === 'Pass'){ + if (this.result === 'true'){ this.ColorObject[this.current] = '#ff008000'; let Log = (titles+';'+'#ff008000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -110,7 +110,7 @@ struct IndexPage { fileio.writeSync(Fd,Report); filewrite(name1,results,titles) } - else if (this.result === 'Fail'){ + else if (this.result === 'false'){ this.ColorObject[this.current] = '#ffff0000'; let Log = (titles+';'+'#ffff0000'+';'); let key = ColorBack.substring(Index,Index+number); @@ -254,20 +254,20 @@ struct IndexPage { title[i] = str1[i*2]; result[i] = str1[i*2+1]; } - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while (FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while (PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); @@ -322,7 +322,8 @@ function filewrite(name1,results,titles){ console.info("RRRRRRRRRRd"+RD); let report = String.fromCharCode.apply(null,new Uint8Array(buf)); let WriteTitle = (titles).toString(); - let number = WriteTitle.length + 6; + let WriteResult = (results).toString(); + let number = WriteTitle.length + WriteResult.length + 2; let Index = report.indexOf(WriteTitle); let Log = (titles+";"+results+";").toString(); if (Index == -1){ diff --git a/validator/acts_validator/src/main/ets/pages/common/AudioContainer.ets b/validator/acts_validator/src/main/ets/pages/common/AudioContainer.ets index 79ba68f357a549282906b25cfd3eb1bc10d03b47..2c72543f8e790796b3e0c9d94d628214d01a6c95 100644 --- a/validator/acts_validator/src/main/ets/pages/common/AudioContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/AudioContainer.ets @@ -47,7 +47,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -65,7 +65,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets index 86379e8944d225ed4d2f4b178e2cd3e31db96e8b..004da7410028643126566c3743ae5576f2b7753a 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraFlashContainer.ets @@ -55,7 +55,7 @@ export struct CustomContainer { .onClick(() => { router.back({ url: this.Url, - params: { result: 'Pass', title: this.name, + params: { result: 'true', title: this.name, } }) this.getScreen(isFullScreen); @@ -74,7 +74,7 @@ export struct CustomContainer { .onClick(() => { router.back({ url: this.Url, - params: { result: 'Fail', title: this.name, + params: { result: 'false', title: this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets index 04959ca42b1b9a59fe9225b0450c7c93998e409a..4e3a77ae1003d7c255914e8cec2d2bffde7ddb34 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraOrientationContainer.ets @@ -55,7 +55,7 @@ export struct CustomContainer { if (this.clickFrequency === this.testingFrequency){ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) } @@ -74,7 +74,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets index 31fa6024953fa0a3b9b5e5babd4d7301650f5670..2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraPhotoContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets index 31fa6024953fa0a3b9b5e5babd4d7301650f5670..2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraPreviewFormatContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets index 31fa6024953fa0a3b9b5e5babd4d7301650f5670..2d52d5bdfa9e427e3b8177824a95c5ee6ee002bf 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CameraVideoContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets index 595f17aae05a98c6d15036c591fa4200a2913170..fc007fada4001fdf3f94a35ae2da29235123bd6e 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer1.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -68,7 +68,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets index 320074bf1565941c4ca261d644f89ec12a97cf0f..88eb1fda51835b04427496456c9883b5b506d6ba 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CanvasCustomContainer2.ets @@ -52,7 +52,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -70,7 +70,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets index 9299f2bc2458eec14de50fd79c99cdfe5835dcbc..0fa282de80e5e491de0f4c7eb83c43889a6737b9 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets index f4c462cb9909e476390b1b4ed515162c67bddfa9..6e3ef3bb345f04e039a1009d6493880c8b5b3312 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer2.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets index ad04ea0b5014b6acb655501a6db7ee4d65e865fb..92f8aa8627946bab07475edd6a2cc316671e2653 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer3.ets @@ -49,7 +49,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -67,7 +67,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets index 02abcfff6498fd61c80f152be135b49f936ad50f..4ddcc144074da6e655906722ce6bf0c8fcf29c96 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer4.ets @@ -48,7 +48,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -66,7 +66,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets b/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets index 3ae81395e4c4027acc6853f3b68f7a53b7c1d8ca..c3c0b5e6cdf7e46ad2c92e663e8af34b135f736e 100644 --- a/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets +++ b/validator/acts_validator/src/main/ets/pages/common/CustomContainer5.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -68,7 +68,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets index b9eca1d48e01ec66b348543cc24b2def8f87c16c..b2cdf49b00b05da66c7e2658f23b46ad205b9dd8 100644 --- a/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/ExperienceCustomContainer.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -68,7 +68,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets index 46a89a3eeb9b1d44ec00a49a6f40bf969880ab8c..6474a29261d31312802ed38b754cb69757712863 100644 --- a/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/StartExperienceCustomContainer.ets @@ -55,7 +55,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -73,7 +73,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets b/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets index 6d4ba891ed31bfca2dc3a6fe360b72b71b92a75e..f8d045024ad6212bafa5c03d11ef6b4868147307 100644 --- a/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets +++ b/validator/acts_validator/src/main/ets/pages/common/TimeExperienceCustomContainer.ets @@ -50,7 +50,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Pass', title : this.name, + params: {result : 'true', title : this.name, } }) this.getScreen(isFullScreen); @@ -68,7 +68,7 @@ export struct CustomContainer { .onClick(()=>{ router.back({ url:this.Url, - params: {result : 'Fail',title : this.name, + params: {result : 'false',title : this.name, } }) this.getScreen(isFullScreen); diff --git a/validator/acts_validator/src/main/ets/pages/index.ets b/validator/acts_validator/src/main/ets/pages/index.ets index 556d32c87b70aa8fe581fdf3184411e6a3baf001..45e239f3fd2ea5a424321cd5dbfc62b8ba4eef02 100644 --- a/validator/acts_validator/src/main/ets/pages/index.ets +++ b/validator/acts_validator/src/main/ets/pages/index.ets @@ -306,120 +306,120 @@ struct IndexPage { } let report = ArkUIReport + AudioReport + CameraReport + PlayerReport + ExperienceReport; - let FailIndex = report.indexOf('Fail'); + let FailIndex = report.indexOf('false'); let FailNum = 0; while(FailIndex != -1) { console.log(FailIndex); FailNum++; - FailIndex = report.indexOf('Fail',FailIndex + 1); + FailIndex = report.indexOf('false',FailIndex + 1); } let failNum = (FailNum).toString(); - let PassIndex = report.indexOf('Pass'); + let PassIndex = report.indexOf('true'); let PassNum = 0; while(PassIndex != -1) { console.log(PassIndex); PassNum++; - PassIndex = report.indexOf('Pass',PassIndex + 1); + PassIndex = report.indexOf('true',PassIndex + 1); } let TestNum = FailNum + PassNum; let testNum = (TestNum).toString(); /* * ArkUI */ - let ArkUIFailIndex = ArkUIReport.indexOf('Fail'); + let ArkUIFailIndex = ArkUIReport.indexOf('false'); let ArkUIFailNum = 0; while (ArkUIFailIndex != -1) { console.log(ArkUIFailIndex); ArkUIFailNum++; - ArkUIFailIndex = ArkUIReport.indexOf('Fail',ArkUIFailIndex + 1); + ArkUIFailIndex = ArkUIReport.indexOf('false',ArkUIFailIndex + 1); } let ArkuiFailNum = (ArkUIFailNum).toString(); - let ArkUIPassIndex = ArkUIReport.indexOf('Pass'); + let ArkUIPassIndex = ArkUIReport.indexOf('true'); let ArkUIPassNum = 0; while (ArkUIPassIndex != -1) { console.log(ArkUIPassIndex); ArkUIPassNum++; - ArkUIPassIndex = ArkUIReport.indexOf('Pass',ArkUIPassIndex + 1); + ArkUIPassIndex = ArkUIReport.indexOf('true',ArkUIPassIndex + 1); } let ArkUITestNum = ArkUIFailNum + ArkUIPassNum; let ArkuiTestNum = (ArkUITestNum).toString(); /* * Audio */ - let AudioFailIndex = AudioReport.indexOf('Fail'); + let AudioFailIndex = AudioReport.indexOf('false'); let AudioFailNum = 0; while (AudioFailIndex != -1) { console.log(AudioFailIndex); AudioFailNum++; - AudioFailIndex = AudioReport.indexOf('Fail',AudioFailIndex + 1); + AudioFailIndex = AudioReport.indexOf('false',AudioFailIndex + 1); } let audioFailNum = (AudioFailNum).toString(); - let AudioPassIndex = AudioReport.indexOf('Pass'); + let AudioPassIndex = AudioReport.indexOf('true'); let AudioPassNum = 0; while (AudioPassIndex != -1) { console.log(AudioPassIndex); AudioPassNum++; - AudioPassIndex = AudioReport.indexOf('Pass',AudioPassIndex + 1); + AudioPassIndex = AudioReport.indexOf('true',AudioPassIndex + 1); } let AudioTestNum = AudioFailNum + AudioPassNum; let audioTestNum = (AudioTestNum).toString(); /* * Camera */ - let CameraFailIndex = CameraReport.indexOf('Fail'); + let CameraFailIndex = CameraReport.indexOf('false'); let CameraFailNum = 0; while (CameraFailIndex != -1) { console.log(CameraFailIndex); CameraFailNum++; - CameraFailIndex = CameraReport.indexOf('Fail',CameraFailIndex + 1); + CameraFailIndex = CameraReport.indexOf('false',CameraFailIndex + 1); } let cameraFailNum = (CameraFailNum).toString(); - let CameraPassIndex = CameraReport.indexOf('Pass'); + let CameraPassIndex = CameraReport.indexOf('true'); let CameraPassNum = 0; while (CameraPassIndex != -1) { console.log(CameraPassIndex); CameraPassNum++; - CameraPassIndex = CameraReport.indexOf('Pass',CameraPassIndex + 1); + CameraPassIndex = CameraReport.indexOf('true',CameraPassIndex + 1); } let CameraTestNum = CameraFailNum + CameraPassNum; let cameraTestNum = (CameraTestNum).toString(); /* * Player */ - let PlayerFailIndex = PlayerReport.indexOf('Fail'); + let PlayerFailIndex = PlayerReport.indexOf('false'); let PlayerFailNum = 0; while (PlayerFailIndex != -1) { console.log(PlayerFailIndex); PlayerFailNum++; - PlayerFailIndex = PlayerReport.indexOf('Fail',PlayerFailIndex + 1); + PlayerFailIndex = PlayerReport.indexOf('false',PlayerFailIndex + 1); } let playerFailNum = (PlayerFailNum).toString(); - let PlayerPassIndex = PlayerReport.indexOf('Pass'); + let PlayerPassIndex = PlayerReport.indexOf('true'); let PlayerPassNum = 0; while (PlayerPassIndex != -1) { console.log(PlayerPassIndex); PlayerPassNum++; - PlayerPassIndex = PlayerReport.indexOf('Pass',PlayerPassIndex + 1); + PlayerPassIndex = PlayerReport.indexOf('true',PlayerPassIndex + 1); } let PlayerTestNum = PlayerFailNum + PlayerPassNum; let playerTestNum = (PlayerTestNum).toString(); /* * Experience */ - let ExperienceFailIndex = ExperienceReport.indexOf('Fail'); + let ExperienceFailIndex = ExperienceReport.indexOf('false'); let ExperienceFailNum = 0; while (ExperienceFailIndex != -1) { console.log(ExperienceFailIndex); ExperienceFailNum++; - ExperienceFailIndex = ExperienceReport.indexOf('Fail',ExperienceFailIndex + 1); + ExperienceFailIndex = ExperienceReport.indexOf('false',ExperienceFailIndex + 1); } let experienceFailNum = (ExperienceFailNum).toString(); - let ExperiencePassIndex = ExperienceReport.indexOf('Pass'); + let ExperiencePassIndex = ExperienceReport.indexOf('true'); let ExperiencePassNum = 0; while (ExperiencePassIndex != -1) { console.log(ExperiencePassIndex); ExperiencePassNum++; - ExperiencePassIndex = ExperienceReport.indexOf('Pass',ExperiencePassIndex + 1); + ExperiencePassIndex = ExperienceReport.indexOf('true',ExperiencePassIndex + 1); } let ExperienceTestNum = ExperienceFailNum + ExperiencePassNum; let experienceTestNum = (ExperienceTestNum).toString(); diff --git a/validator/acts_validator/src/main/resources/base/profile/main_pages.json b/validator/acts_validator/src/main/resources/base/profile/main_pages.json index c235d7f8d9d950c9c820547a5552024a5f74774b..a228b7c75d86000a064e531780a8563d5a2747f8 100644 --- a/validator/acts_validator/src/main/resources/base/profile/main_pages.json +++ b/validator/acts_validator/src/main/resources/base/profile/main_pages.json @@ -44,8 +44,15 @@ "pages/Experience/Experience_index", "pages/Experience/PhotoFps", "pages/Experience/DeskFps", - "pages/Experience/ColdStartTest", - "pages/Experience/HotStartTest", + "pages/Experience/ContactsColdStartTest", + "pages/Experience/ContactsHotStartTest", + "pages/Experience/MmsColdStartTest", + "pages/Experience/MmsHotStartTest", + "pages/Experience/PhotosColdStartTest", + "pages/Experience/PhotosHotStartTest", + "pages/Experience/SettingsColdStartTest", + "pages/Experience/SettingsHotStartTest", + "pages/Experience/CameraColdStartTest", "pages/Experience/ViewPhotoTest", "pages/Experience/KeyboardDisplayTest", "pages/Experience/StartTaskManager",