From 74f38647569bf8c3bb3a3b825cae243db1012dfe Mon Sep 17 00:00:00 2001 From: guoenquan Date: Mon, 31 Oct 2022 18:14:42 +0800 Subject: [PATCH] Modify test case Signed-off-by: guoenquan --- .../ets/MainAbility/pages/checkBoxGroup.ets | 6 ++---- .../src/main/ets/MainAbility/pages/common.ets | 19 +++++++++---------- .../src/main/ets/MainAbility/pages/router.ets | 7 ++++--- .../src/main/ets/MainAbility/pages/web.ets | 3 +-- .../main/ets/test/loadingProgress.test.ets | 6 +++--- .../entry/src/main/ets/test/router.test.ets | 3 ++- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets index 142c33f03..59c3785e2 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/checkBoxGroup.ets @@ -22,7 +22,7 @@ const TAG = 'ets_apiLack_add'; @Component export default struct CheckBoxGroupPart { - @State SelectStatus: SelectStatus = SelectStatus.Part + aboutToAppear() { Log.showInfo(TAG, `aboutToAppear CheckBoxGroupPart start`) } @@ -84,11 +84,9 @@ struct CheckBoxGroupPart { console.info("Part emit action state err: " + JSON.stringify(err.message)) } Utils.sleep(1000); - if(itemName.status === SelectStatus.Part){ console.info("CheckboxGroup SelectStatus.Part") - } - + } }) Text('select all').fontSize(20) Checkbox({name: 'checkbox1', group: 'checkboxGroup'}) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets index fb7bcb499..da9660274 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/common.ets @@ -134,7 +134,7 @@ export default struct CommonColorMode { path: '' } }) -// + Text("common-Middle") .width(320) .height(40) @@ -151,7 +151,7 @@ export default struct CommonColorMode { .alignRules({ middle: { anchor: 'string', align: HorizontalAlign.Center } }) -// + Text("common-Area") .width(320) .height(40) @@ -187,7 +187,6 @@ export default struct CommonColorMode { console.info("areaValue emit action state err: " + JSON.stringify(err.message)) } }) -// Text("common-Repeat") .width(320) .height(40) @@ -211,7 +210,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Repeat, fill: false }); -// + Text("common-Space") .width(320) .height(40) @@ -235,7 +234,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Space, fill: false }); -// + Text("common-Thin") .width(320) .height(40) @@ -250,7 +249,7 @@ export default struct CommonColorMode { .textOverflow({ overflow: TextOverflow.None }) .key("ThinText") .backgroundBlurStyle(BlurStyle.Thin) -// + Text("common-Thick") .width(320) .height(40) @@ -265,7 +264,7 @@ export default struct CommonColorMode { .textOverflow({ overflow: TextOverflow.None }) .key("ThickText") .backgroundBlurStyle(BlurStyle.Thick) -// + Text("common-Slice") .width(320) .height(40) @@ -289,7 +288,7 @@ export default struct CommonColorMode { repeat: RepeatMode.Stretch, fill: false }); -// + Text("common-Outset") .width(320) .height(40) @@ -315,7 +314,7 @@ export default struct CommonColorMode { outset: 2 }); -// + Text("common-Touches") .width(320) .height(40) @@ -351,7 +350,7 @@ export default struct CommonColorMode { console.info("touchesValue emit action state err: " + JSON.stringify(err.message)) } }) -// + Text("common-ChangedTouches") .width(320) .height(40) diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets index be3f1e34b..197fe4887 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/router.ets @@ -13,9 +13,8 @@ * limitations under the License. */ - import router from '@ohos.router' -import uiAppearance from '@ohos.uiAppearance'; +// import uiAppearance from '@ohos.uiAppearance'; import Log from '../common/Log.ets'; @@ -27,7 +26,7 @@ export default struct RouterStandard { - async routePage() { + async routePage() { let options = { url: 'pages/page1', params: { @@ -106,6 +105,7 @@ struct RouterStandard { .onClick(() => { this.routeSinglePage() }) + Text('这是第一页') .fontSize(50) .fontWeight(FontWeight.Bold) @@ -123,3 +123,4 @@ struct RouterStandard { }.width("100%").height("100%") } } + diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets index d9182d4cf..4bdbd6489 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/MainAbility/pages/web.ets @@ -38,8 +38,7 @@ struct WebEditText { .height(500) .padding(20) .blur(2) - //修改 - //.fileFromUrlAccess(true) + // .fileFromUrlAccess(true) .initialScale(2) .webDebuggingAccess(true) .onRenderExited((event) => { diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets index 2d8fd4537..dfd9fe6c1 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/loadingProgress.test.ets @@ -60,9 +60,9 @@ export default function loadingProgressCircularJsunit() { expect(obj.$attrs.color).assertEqual(undefined); expect(obj.$attrs.width).assertEqual('100.00vp'); expect(obj.$attrs.margin).assertEqual('5.00vp'); - console.info("[gwxtestloadingProgressCircular0011] color value :" + obj.$attrs.color); - console.info("[gwxtestloadingProgressCircular0011] width value :" + obj.$attrs.width); - console.info("[gwxtestloadingProgressCircular0011] margin value :" + obj.$attrs.margin); + console.info("[testloadingProgressCircular0011] color value :" + obj.$attrs.color); + console.info("[testloadingProgressCircular0011] width value :" + obj.$attrs.width); + console.info("[testloadingProgressCircular0011] margin value :" + obj.$attrs.margin); done(); }); diff --git a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets index e3b8504d1..955c82893 100644 --- a/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets +++ b/arkui/ace_ets_component_attrlack/entry/src/main/ets/test/router.test.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + import router from '@system.router'; import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "hypium/index" import Utils from './Utils.ets' @@ -91,4 +92,4 @@ export default function routerStandardJsunit() { console.info('testrouterSingle_0001 END'); }); }) -} \ No newline at end of file +} -- GitLab