diff --git a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets index 664cf48ecb772dddbb493475684accbb2ae44bc6..2bb2c564f47ae4b9c7a9887400035cd4fa30d1b7 100644 --- a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets +++ b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets @@ -18,7 +18,9 @@ @Component struct GlobalExample { + private settings: RenderingContextSettings = new RenderingContextSettings (true) private context: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.settings) + private offContext: OffscreenCanvasRenderingContext2D = new OffscreenCanvasRenderingContext2D(300, 300, this.settings); onPageShow() { console.info("global page called") @@ -33,7 +35,7 @@ struct GlobalExample { Canvas(this.context) .width('100%').height('40%').backgroundColor('#00ffff') .onReady(() => { - this.context.imageSmoothingEnabled = false + this.offContext.imageSmoothingEnabled = false this.testImageBitmapSize(); this.testOffscreenCanvas(); this.testImageData(); @@ -46,27 +48,22 @@ struct GlobalExample { let img = new ImageBitmap("/images/bg.jpg"); let width = img.width; let height = img.height; - this.context.imageSmoothingEnabled = false; - this.context.drawImage(img, 30, 950, 160, 100); + this.offContext.imageSmoothingEnabled = false; + this.offContext.drawImage(img, 30, 950, 160, 100); console.log("imagebitmap_width=" + width); console.log("imagebitmap_height=" + height); } testOffscreenCanvas() { - var offscreen = new OffscreenCanvas(300, 300); - var offCanvas2 = offscreen.getContext("2d"); var img = new Image(); img.src = "/images/bg.jpg"; - offCanvas2.drawImage(img, 0, 0, 100, 100); - - var bitmap = offscreen.transferToImageBitmap(); - this.ctx.transferFromImageBitmap(bitmap); + this.offContext.drawImage(img, 0, 0, 100, 100); + var bitmap = this.offContext.transferToImageBitmap(); + this.context.transferFromImageBitmap(bitmap); } testImageData() { - var offscreen = new OffscreenCanvas(300, 300); - var offCanvas2 = offscreen.getContext("2d"); - var imageData = offCanvas2.createImageData(100, 100); + var imageData = this.offContext.createImageData(100, 100); var imgData = imageData.data; console.log("imageData_width=" + imageData.width); console.log("imageData_height=" + imageData.height); diff --git a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/touch.ets b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/touch.ets index 827adbedfce151915b4718fa0838ba20caa2bb16..10b87aff22e2d1082706d2fbccb937382b74535e 100644 --- a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/touch.ets +++ b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/touch.ets @@ -78,8 +78,8 @@ struct TouchExample { console.info('onTouch successful, touchFlag is : ' + this.eventType + ', ' + this.touchFlag) console.info(this.text = 'TouchType:' + this.eventType + '\nDistance between touch point and touch element:\nx: ' - + event.touches[0].x + '\n' + 'y: ' + event.touches[0].y + '\ncomponent globalPos：（' - + event.target.area.globalPos.x + ',' + event.target.area.globalPos.y + '）\nwidth:' + + event.touches[0].x + '\n' + 'y: ' + event.touches[0].y + '\ncomponent globalPosition：（' + + event.target.area.globalPosition.x + ',' + event.target.area.globalPosition.y + '）\nwidth:' + event.target.area.width + '\nheight：' + event.target.area.height); console.log('fang--->A') try { diff --git a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets index a26a04279aa04907470b091f65b6b3a87f2adfe3..16ce8da7571ab3486e7bc1c8eef9cfa49e04a82b 100644 --- a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets +++ b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets @@ -466,7 +466,7 @@ export default function swiperJsunit() { let strJsonNew = getInspectorByKey('swiper'); let objNew = JSON.parse(strJsonNew); console.info("swiperTest_1900 component objNew is: " + JSON.stringify(objNew)); - expect(objNew.$attrs.duration).assertEqual('0.000000'); + expect(objNew.$attrs.duration).assertEqual('nan'); console.info('swiperTest_1900 END'); done(); }); diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/button.ets b/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/button.ets index 98920af57462328f2f5828556a891bb1c689b752..1c5ea715021392f0d40b675f9d90b0f5748a24fb 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/button.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/button.ets @@ -123,8 +123,8 @@ struct ButtonExample { .position({x: 50,y: 400}) .onClick((event: ClickEvent) => { console.info(this.text = 'Click Point:' + '\n screenX:' + event.screenX + '\n screenY:' + event.screenY - + '\n x :' + event.x + '\n y:' + event.y + '\ntarget:' + '\n component globalPos：（' - + event.target.area.globalPos.x + ',' + event.target.area.globalPos.y + '）\n width:' + + '\n x :' + event.x + '\n y:' + event.y + '\ntarget:' + '\n component globalPosition：（' + + event.target.area.globalPosition.x + ',' + event.target.area.globalPosition.y + '）\n width:' + event.target.area.width + '\n height：' + event.target.area.height); this.onClickValue = true; try { diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/CircleJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/CircleJsunit.test.ets index b99bb5ffa3fadd836bd61da927c97325d18f4460..f75cc247c6a69e961ab3de2ba917104d582fa5bd 100644 --- a/arkui/ace_ets_component_three/entry/src/main/ets/test/CircleJsunit.test.ets +++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/CircleJsunit.test.ets @@ -109,8 +109,8 @@ export default function circleJsunit() { let strJson = getInspectorByKey('circle'); let obj = JSON.parse(strJson); console.info("[circleTest_0300] component objNew is: " + JSON.stringify(obj)); - expect(obj.$attrs.width).assertEqual('0.00px'); - expect(obj.$attrs.height).assertEqual('0.00px'); + expect(obj.$attrs.width).assertEqual('0.00vp'); + expect(obj.$attrs.height).assertEqual('0.00vp'); console.info('circleTest_0300 END'); 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 c56c74b91f6b65713fff4e19745e4e2a9ff2cb1c..a83340b6d4abd81284ac8654dfb311fe8412d78e 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 @@ -83,7 +83,7 @@ export default function loadingProgressJsunit() { let strJson = getInspectorByKey('LP'); let obj = JSON.parse(strJson); console.info("testLoadingProgress_400 component obj is: " + JSON.stringify(obj)); - expect(obj.$attrs.borderWidth).assertEqual("0.00px"); + expect(obj.$attrs.borderWidth).assertEqual("0.00vp"); console.info('testLoadingProgress_400 END'); done(); }); diff --git a/arkui/ace_ets_standard/entry/src/main/ets/test/ScrollJsunit.test.ets b/arkui/ace_ets_standard/entry/src/main/ets/test/ScrollJsunit.test.ets index 33f861f84f2c60fc078ecbd18c52659c25c1149f..24bd99ec7969cfa52f94628073ca5fb0388c21d0 100644 --- a/arkui/ace_ets_standard/entry/src/main/ets/test/ScrollJsunit.test.ets +++ b/arkui/ace_ets_standard/entry/src/main/ets/test/ScrollJsunit.test.ets @@ -89,7 +89,7 @@ export default function ScrollJsunit() { console.log("cd scroll1 scrollable" + JSON.stringify(obj.$attrs.scrollable)); console.log("cd scroll1 scrollBar" + JSON.stringify(obj.$attrs.scrollBar)); expect(obj.$attrs.scrollable).assertEqual('ScrollDirection.Horizontal') - expect(obj.$attrs.scrollBar).assertEqual('BarState.Off') + expect(obj.$attrs.scrollBar).assertEqual('BarState.Auto') console.info('cd Scorll1GetInspectorByKey END'); done(); }); diff --git a/arkui/ace_ets_standard/entry/src/main/ets/test/TextJsunit.test.ets b/arkui/ace_ets_standard/entry/src/main/ets/test/TextJsunit.test.ets index b2b92908f97628d5e444f3dab5f645e7cc59f46c..aa042ea6737d345d08ec117a383e3e9e5d75f6dd 100644 --- a/arkui/ace_ets_standard/entry/src/main/ets/test/TextJsunit.test.ets +++ b/arkui/ace_ets_standard/entry/src/main/ets/test/TextJsunit.test.ets @@ -93,7 +93,7 @@ export default function textJsunit() { expect(obj.$attrs.fontWeight).assertEqual("FontWeight.Bold") expect(obj.$attrs.fontStyle).assertEqual("FontStyle.Italic") expect(obj.$attrs.fontFamily).assertEqual("sans-serif") - expect(obj.$attrs.textAlign).assertEqual("TextAlign.End") + expect(obj.$attrs.textAlign).assertEqual("TextAlign.Center") expect(obj.$attrs.textOverflow).assertEqual("TextOverflow.Ellipsis") expect(obj.$attrs.lineHeight).assertEqual("15.00fp") expect(obj.$attrs.baselineOffset).assertEqual("0") @@ -125,7 +125,7 @@ export default function textJsunit() { expect(obj.$attrs.enabled).assertEqual(true) expect(obj.$attrs.visibility).assertEqual("Visibility.Hidden") expect(obj.$attrs.fontWeight).assertEqual("FontWeight.Normal") - expect(obj.$attrs.textAlign).assertEqual("TextAlign.Start") + expect(obj.$attrs.textAlign).assertEqual("TextAlign.Left") expect(obj.$attrs.textOverflow).assertEqual("TextOverflow.Clip") expect(obj.$attrs.decoration).assertEqual(JSON.stringify({ type: "TextDecorationType.LineThrough", color: "#FFFF0000" @@ -150,7 +150,7 @@ export default function textJsunit() { expect(obj.$attrs.borderStyle).assertEqual("BorderStyle.Solid") expect(obj.$attrs.visibility).assertEqual("Visibility.None") expect(obj.$attrs.fontWeight).assertEqual("FontWeight.Bolder") - expect(obj.$attrs.textAlign).assertEqual("TextAlign.Center") + expect(obj.$attrs.textAlign).assertEqual("TextAlign.Right") expect(obj.$attrs.textCase).assertEqual("TextCase.UpperCase") expect(obj.$attrs.decoration).assertEqual(JSON.stringify({ type: "TextDecorationType.None", color: "#FFFF0000" diff --git a/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js b/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js index 9721f49d0616078cb0aae52a6c487a881bb4434a..1dc8e619f920a54a22a39018341f051d832b1741 100644 --- a/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js +++ b/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js @@ -102,12 +102,8 @@ export default { onShow(){ // 通用属性 - var prop1 = this.$element('prop1'); - var name1 = prop1.dataSet.name - var prop2 = this.$refs.prop2; - var name2 = prop2.dataSet.name prompt.showToast({ - message: 'prop1--' + name1 + '\nprop2--' + name2 + message: 'onShow' }); }, 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 03d0127c018446ceb82613ed79a9664236d2fc9d..86b2a90f042d7b76c829c0a2906964cac116e6bd 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') expect(obj.$attrs.id).assertEqual('classPropNone') expect(obj.$attrs.className).assertEqual(undefined) console.info("[pickerViewProps] get className value is: " + JSON.stringify(obj.$attrs.className)); @@ -148,7 +148,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-view-view') // expect(obj.$attrs.id).assertEqual('styleProp') // expect(obj.$attrs.style).assertEqual(undefined) // console.info("[pickerViewProps] get style value is: " + JSON.stringify(obj.$attrs.style)); @@ -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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') expect(obj.$attrs.id).assertEqual('ifPropTrue') expect(obj.$attrs.if).assertEqual(undefined) console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.if)); @@ -600,7 +600,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-view-view') expect(obj.$attrs.id).assertEqual('ifPropFalse') expect(obj.$attrs.if).assertEqual(false) done(); @@ -619,7 +619,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-view-view') expect(obj.$attrs.id).assertEqual('ifPropNone') expect(obj.$attrs.if).assertEqual(false) done(); @@ -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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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') + expect(obj.$type).assertEqual('picker-view') 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,7 +778,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') + expect(obj.$type).assertEqual('picker-view') 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));