From 9393445ce7a689fd31e14829eb6d4ba26b797cda Mon Sep 17 00:00:00 2001 From: pavelpozdeev Date: Wed, 14 May 2025 16:54:22 +0300 Subject: [PATCH] done --- subset/arkoala/arkui/src/main.ts | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/subset/arkoala/arkui/src/main.ts b/subset/arkoala/arkui/src/main.ts index 7eb279a8e8..82b0044848 100644 --- a/subset/arkoala/arkui/src/main.ts +++ b/subset/arkoala/arkui/src/main.ts @@ -251,7 +251,7 @@ function checkCallbackWithReturn() { }, ) - assertEquals("Sync Callback 1 with return type read&called immediately", "CALLED, value1=true value2=false", callResult1) + assertEquals("Sync Callback 1 with return type read&called immediately", "CALLED, value1=true value2=true", callResult1) } function checkTwoSidesCallbackSync() { @@ -396,9 +396,9 @@ function checkButton() { ResourceHolder.instance().release(lastResourceId) checkResult("width", () => peer.width0Attribute("42%"), - `width({.selector=0, .value0={.chars="42%", .length=3}})`) - checkResult("height", () => peer.height0Attribute({ id: 43, bundleName: "MyApp", moduleName: "MyApp" }), - `height({.selector=2, .value2={.bundleName={.chars="MyApp", .length=5}, .moduleName={.chars="MyApp", .length=5}, .id={.tag=102, .i32=43}, .params={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .type={.tag=INTEROP_TAG_UNDEFINED, .value={}}}})`) + `width({.tag=INTEROP_TAG_OBJECT, .value={.selector=0, .value0={.chars="42%", .length=3}}})`) + checkResult("height", () => peer.height0Attribute(132), + `height({.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=102, .i32=132}}})`) console.warn("There is an uncontrolled variance between enums.Alignment (@internal/component/ets/enums.d.ts) and common.Alignment (tests/subset/ets/common.d.ts), so, the test 'background' is not stable more") // checkResult("background", () => peer.backgroundAttribute(() => {}, {align: 4}), @@ -408,9 +408,15 @@ function checkButton() { //checkResult("type", () => peer.typeAttribute(1), "type(Ark_button_ButtonType(1))") checkResult("labelStyle", () => peer.labelStyleAttribute({ maxLines: 3 }), +<<<<<<< Updated upstream "labelStyle({.overflow={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxLines={.tag=INTEROP_TAG_OBJECT, .value={.tag=102, .i32=3}}, .minFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .heightAdaptivePolicy={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .font={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .selectedColor={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .unselectedColor={.tag=INTEROP_TAG_UNDEFINED, .value={}}})") checkResult("labelStyle2", () => peer.labelStyleAttribute({}), "labelStyle({.overflow={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxLines={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .minFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .heightAdaptivePolicy={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .font={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .selectedColor={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .unselectedColor={.tag=INTEROP_TAG_UNDEFINED, .value={}}})") +======= + `labelStyle({.tag=INTEROP_TAG_OBJECT, .value={.overflow={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxLines={.tag=INTEROP_TAG_OBJECT, .value={.tag=102, .i32=3}}, .minFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .heightAdaptivePolicy={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .font={.tag=INTEROP_TAG_UNDEFINED, .value={}}}})`) + checkResult("labelStyle2", () => peer.labelStyleAttribute({}), + `labelStyle({.tag=INTEROP_TAG_OBJECT, .value={.overflow={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxLines={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .minFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .maxFontSize={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .heightAdaptivePolicy={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .font={.tag=INTEROP_TAG_UNDEFINED, .value={}}}})`) +>>>>>>> Stashed changes //nativeModule()._MeausureLayoutAndDraw(peer.peer.ptr) assertTrue("ButtonPeer finalizer", peer!.peer!.finalizer != nullptr) @@ -422,10 +428,17 @@ function checkCalendar() { let peer = ArkCalendarPickerPeer.create() checkResult("setCalendarOptions: hintRadius", () => peer.setCalendarPickerOptionsAttribute({ hintRadius: 79 }), +<<<<<<< Updated upstream `setCalendarPickerOptions({.tag=INTEROP_TAG_OBJECT, .value={.hintRadius={.tag=INTEROP_TAG_OBJECT, .value={.selector=0, .value0={.tag=102, .i32=79}}}, .selected={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .start={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .end={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .disabledDateRange={.tag=INTEROP_TAG_UNDEFINED, .value={}}}})`) const date = new Date(Date.UTC(2025, 4, 16)) checkResult("setCalendarOptions: selected", () => peer.setCalendarPickerOptionsAttribute({ selected: date }), `setCalendarPickerOptions({.tag=INTEROP_TAG_OBJECT, .value={.hintRadius={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .selected={.tag=INTEROP_TAG_OBJECT, .value=1747353600000}, .start={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .end={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .disabledDateRange={.tag=INTEROP_TAG_UNDEFINED, .value={}}}})`) +======= + `setCalendarPickerOptions({.hintRadius={.tag=INTEROP_TAG_OBJECT, .value={.selector=0, .value0={.tag=102, .i32=79}}}, .selected={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .start={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .end={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .disabledDateRange={.tag=INTEROP_TAG_UNDEFINED, .value={}}})`) + const date = new Date(Date.UTC(2025, 4, 16)) + checkResult("setCalendarOptions: selected", () => peer.setCalendarPickerOptionsAttribute({ selected: date }), + `setCalendarPickerOptions({.hintRadius={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .selected={.tag=INTEROP_TAG_OBJECT, .value=1747353600000}, .start={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .end={.tag=INTEROP_TAG_UNDEFINED, .value={}}, .disabledDateRange={.tag=INTEROP_TAG_UNDEFINED, .value={}}})`) +>>>>>>> Stashed changes stopNativeTest(CALL_GROUP_LOG) } @@ -434,11 +447,11 @@ function checkFormComponent() { let peer = ArkFormComponentPeer.create() checkResult("size int", () => peer.sizeAttribute({ width: 5, height: 6 }), - `size({.width={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=102, .i32=5}}}, .height={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=102, .i32=6}}}})`) + `size({.tag=INTEROP_TAG_OBJECT, .value={.width={.tag=102, .i32=5}, .height={.tag=102, .i32=6}}})`) checkResult("size float", () => peer.sizeAttribute({ width: 5.5, height: 6.789 }), - `size({.width={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=103, .f32=5.5}}}, .height={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=103, .f32=6.789}}}})`) + `size({.tag=INTEROP_TAG_OBJECT, .value={.width={.tag=103, .f32=5.5}, .height={.tag=103, .f32=6.789}}})`) checkResult("size zero", () => peer.sizeAttribute({ width: 0.0, height: 0.0 }), - `size({.width={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=102, .i32=0}}}, .height={.tag=INTEROP_TAG_OBJECT, .value={.selector=1, .value1={.tag=102, .i32=0}}}})`) + `size({.tag=INTEROP_TAG_OBJECT, .value={.width={.tag=102, .i32=0}, .height={.tag=102, .i32=0}}})`) stopNativeTest(CALL_GROUP_LOG) } @@ -538,8 +551,13 @@ function checkCanvasRenderingContext2D() { let canvasRenderingContext2D: CanvasRenderingContext2D | undefined = undefined checkResult("new CanvasRenderingContext2D()", +<<<<<<< Updated upstream () => canvasRenderingContext2D = unsafeCast(new CanvasRenderingContext2D()), `new CanvasPath()[return (Ark_CanvasPath) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]new CanvasRenderer()[return (Ark_CanvasRenderer) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]new CanvasRenderingContext2D({.tag=INTEROP_TAG_UNDEFINED, .value={}})[return (Ark_CanvasRenderingContext2D) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]` +======= + () => canvasRenderingContext2D = new CanvasRenderingContext2D(), + `new CanvasPath()[return (Ark_CanvasPath) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]new CanvasRenderer()[return (Ark_CanvasRenderer) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]new CanvasRenderingContext2D({.tag=INTEROP_TAG_UNDEFINED, .value={}}, {.tag=INTEROP_TAG_UNDEFINED, .value={}})[return (Ark_CanvasRenderingContext2D) 100]getFinalizer()[return fnPtr(dummyClassFinalizer)]` +>>>>>>> Stashed changes ) checkResult("CanvasRenderingContext2D width", -- Gitee