diff --git a/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets b/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets index 327dc67d0afee4efe64f32dd3a2c9060cec59d52..bfc2c388e2c94f43f3ba1dc3806e9288c34b45f0 100644 --- a/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets +++ b/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets @@ -811,7 +811,7 @@ export default function imageEffectsJsunit() { let strJsonNew = getInspectorByKey('centerRow9'); let objNew = JSON.parse(strJsonNew); console.info("[testImageEffects033] component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.hueRotate).assertEqual(-2147483648); + expect(objNew.$attrs.hueRotate).assertEqual(232); done(); }); @@ -837,7 +837,7 @@ export default function imageEffectsJsunit() { let strJsonNew = getInspectorByKey('centerRow9'); let objNew = JSON.parse(strJsonNew); console.info("[testImageEffects034] component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.hueRotate).assertEqual(2147483648); + expect(objNew.$attrs.hueRotate).assertEqual(128); done(); }); diff --git a/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets b/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets index 517b2a47374a4c589acbacf18ed45796c79f4205..c56c74b91f6b65713fff4e19745e4e2a9ff2cb1c 100644 --- a/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets +++ b/arkui/ace_ets_component_two/entry/src/main/ets/test/LoadingProgressJsunit.test.ets @@ -72,7 +72,7 @@ export default function loadingProgressJsunit() { let strJson = getInspectorByKey('LP'); let obj = JSON.parse(strJson); console.info("testLoadingProgress_300 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.height).assertEqual("50.00px"); + expect(obj.$attrs.height).assertEqual("50.00vp"); console.info('testLoadingProgress_300 END'); done(); }); @@ -110,4 +110,4 @@ export default function loadingProgressJsunit() { done(); }); }) -} \ No newline at end of file +} diff --git a/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js b/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js index f9308a462a6da5bcfd7e08689eeaa1441d9cfddb..03d0127c018446ceb82613ed79a9664236d2fc9d 100644 --- a/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js +++ b/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js @@ -91,7 +91,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('idProp') done(); }); @@ -109,7 +109,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('classProp') expect(obj.$attrs.className).assertEqual('classProp') done(); @@ -128,7 +128,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('classPropNone') expect(obj.$attrs.className).assertEqual(undefined) console.info("[pickerViewProps] get className value is: " + JSON.stringify(obj.$attrs.className)); @@ -174,7 +174,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('refProp') expect(obj.$attrs.ref).assertEqual('refProp') done(); @@ -193,7 +193,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('refPropNone') expect(obj.$attrs.ref).assertEqual(undefined) console.info("[pickerViewProps] get ref value is: " + JSON.stringify(obj.$attrs.ref)); @@ -213,7 +213,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('disabledPropTrue') expect(obj.$attrs.disabled).assertEqual('true') done(); @@ -232,7 +232,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('disabledPropFalse') expect(obj.$attrs.disabled).assertEqual('false') done(); @@ -251,7 +251,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('disabledPropNone') expect(obj.$attrs.disabled).assertEqual('false') done(); @@ -270,7 +270,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('focusablePropTrue') expect(obj.$attrs.focusable).assertEqual('true') done(); @@ -289,7 +289,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('focusablePropFalse') expect(obj.$attrs.focusable).assertEqual('false') done(); @@ -308,7 +308,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('focusablePropNone') expect(obj.$attrs.focusable).assertEqual('false') done(); @@ -327,7 +327,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dataProp') expect(obj.$attrs.datapickerView).assertEqual(undefined); console.info("[pickerViewProps] get datapickerView value is: " + JSON.stringify(obj.$attrs.datapickerView)); @@ -347,7 +347,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dataPropNone') expect(obj.$attrs.datapickerView).assertEqual(undefined) console.info("[pickerViewProps] get datapickerView value is: " + JSON.stringify(obj.$attrs.datapickerView)); @@ -367,7 +367,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('clickEffectPropSmall') expect(obj.$attrs.clickEffect).assertEqual('spring-small') done(); @@ -386,7 +386,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('clickEffectPropMedium') expect(obj.$attrs.clickEffect).assertEqual('spring-medium') done(); @@ -405,7 +405,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('clickEffectPropLarge') expect(obj.$attrs.clickEffect).assertEqual('spring-large') done(); @@ -424,7 +424,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('clickEffectPropNone') expect(obj.$attrs.clickEffect).assertEqual(undefined) console.info("[pickerViewProps] get clickEffect value is: " + JSON.stringify(obj.$attrs.clickEffect)); @@ -444,7 +444,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dirPropRtl') expect(obj.$attrs.dir).assertEqual('rtl') done(); @@ -463,7 +463,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dirPropLtr') expect(obj.$attrs.dir).assertEqual('ltr') done(); @@ -482,7 +482,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dirPropAuto') expect(obj.$attrs.dir).assertEqual('auto') done(); @@ -501,7 +501,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('dirPropNone') expect(obj.$attrs.dir).assertEqual('auto') done(); @@ -520,7 +520,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('forPropNull') expect(obj.$attrs.for).assertEqual(undefined) console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for)); @@ -540,7 +540,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('forPropOne') expect(obj.$attrs.for).assertEqual(undefined) console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for)); @@ -560,7 +560,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('forPropThree') expect(obj.$attrs.for).assertEqual(undefined) console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for)); @@ -580,7 +580,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('ifPropTrue') expect(obj.$attrs.if).assertEqual(undefined) console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.if)); @@ -638,7 +638,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('showPropTrue') expect(obj.$attrs.show).assertEqual('true') console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show)); @@ -658,7 +658,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('showPropFalse') expect(obj.$attrs.show).assertEqual('false') console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show)); @@ -678,7 +678,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('showPropNone') expect(obj.$attrs.show).assertEqual('true') console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show)); @@ -698,7 +698,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('pickerViewText') expect(obj.$attrs.type).assertEqual('text') console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type)); @@ -718,7 +718,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('pickerViewTime') expect(obj.$attrs.type).assertEqual('time') console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type)); @@ -738,7 +738,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('pickerViewDate') expect(obj.$attrs.type).assertEqual('date') console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type)); @@ -758,7 +758,7 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('pickerViewDatetime') expect(obj.$attrs.type).assertEqual('datetime') console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type)); @@ -778,11 +778,10 @@ console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj)); console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs)); - expect(obj.$type).assertEqual('picker-view') + expect(obj.$type).assertEqual('picker') expect(obj.$attrs.id).assertEqual('pickerViewMultiText') expect(obj.$attrs.type).assertEqual('multi-text') console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type)); done(); }); }); - \ No newline at end of file