提交 12e4eb04 编写于 作者: E e

修改用例

Signed-off-by: Ne <qianwangdq@isoftstone.com>
上级 3889057d
...@@ -35,7 +35,6 @@ struct AlignEnd_AddAllSpace { ...@@ -35,7 +35,6 @@ struct AlignEnd_AddAllSpace {
@State justifyContent: FlexAlign = FlexAlign.End @State justifyContent: FlexAlign = FlexAlign.End
build() { build() {
Column() { Column() {
Text('justifyContent:FlexAlign.End').fontSize(9).fontColor(0xCCCCCC).width('90%')
Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) { Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) {
Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("End_AddAllSpace_011") Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("End_AddAllSpace_011")
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddAllSpace_012") Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddAllSpace_012")
......
...@@ -17,7 +17,9 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; ...@@ -17,7 +17,9 @@ import {MessageManager,Callback} from './../../../../common/MessageManager';
@Entry @Entry
@Component @Component
struct AlignEnd_AddLayoutWeight { struct AlignEnd_AddLayoutWeight {
@State OneLayoutWeight: number = 2 @State OneLayoutWeight1: number = 1;
@State OneLayoutWeight2: number = 1;
@State OneLayoutWeight3: number = 1;
messageManager:MessageManager = new MessageManager() messageManager:MessageManager = new MessageManager()
onPageShow() { onPageShow() {
console.info('AlignSpaceEvenly_AddLayoutWeight onPageShow'); console.info('AlignSpaceEvenly_AddLayoutWeight onPageShow');
...@@ -26,9 +28,16 @@ struct AlignEnd_AddLayoutWeight { ...@@ -26,9 +28,16 @@ struct AlignEnd_AddLayoutWeight {
} }
let callback:Callback = (message:any) => { let callback:Callback = (message:any) => {
console.error('message = ' + message.name + "--" + message.value); console.error('message = ' + message.name + "--" + message.value);
if (message.name == 'OneLayoutWeight') { if (message.name == 'OneLayoutWeight1') {
this.OneLayoutWeight = message.value; this.OneLayoutWeight1 = message.value;
} }
if (message.name == 'OneLayoutWeight2') {
this.OneLayoutWeight2 = message.value;
}
if (message.name == 'OneLayoutWeight3') {
this.OneLayoutWeight3 = message.value;
}
} }
this.messageManager.registerCallback(callback); this.messageManager.registerCallback(callback);
} }
...@@ -42,14 +51,31 @@ struct AlignEnd_AddLayoutWeight { ...@@ -42,14 +51,31 @@ struct AlignEnd_AddLayoutWeight {
.height(50) .height(50)
.backgroundColor(0xF5DEB3) .backgroundColor(0xF5DEB3)
.key("End_AddLayoutWeight_011") .key("End_AddLayoutWeight_011")
.layoutWeight( this.OneLayoutWeight) .layoutWeight( this.OneLayoutWeight1)
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddLayoutWeight_012") Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddLayoutWeight_012")
.layoutWeight( this.OneLayoutWeight2)
Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("End_AddLayoutWeight_013") Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("End_AddLayoutWeight_013")
.layoutWeight( this.OneLayoutWeight3)
} }
.key("End_AddLayoutWeight_01") .key("End_AddLayoutWeight_01")
.width(500) .width(500)
.height(200) .height(200)
.backgroundColor(0xAFEEEE) .backgroundColor(0xAFEEEE)
Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) {
Text('1')
.width(150)
.height(50)
.backgroundColor(0xF5DEB3)
.key("End_AddLayoutWeight_021")
.layoutWeight( this.OneLayoutWeight1)
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddLayoutWeight_022")
.layoutWeight( this.OneLayoutWeight2)
Text('3').width(150).height(150).backgroundColor(0xF5DEB3).key("End_AddLayoutWeight_023")
}
.key("End_AddLayoutWeight_02")
.width(500)
.height(200)
.backgroundColor(0xAFEEEE)
} }
} }
} }
...@@ -35,7 +35,6 @@ struct AlignEnd_AddMargin { ...@@ -35,7 +35,6 @@ struct AlignEnd_AddMargin {
@State justifyContent: FlexAlign = FlexAlign.End @State justifyContent: FlexAlign = FlexAlign.End
build() { build() {
Column() { Column() {
Text('justifyContent:FlexAlign.End').fontSize(9).fontColor(0xCCCCCC).width('90%')
Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) { Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) {
Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("End_AddMargin_011") Text('1').width(150).height(50).backgroundColor(0xF5DEB3).key("End_AddMargin_011")
Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddMargin_012") Text('2').width(150).height(100).backgroundColor(0xD2B48C).key("End_AddMargin_012")
......
...@@ -35,7 +35,6 @@ struct AlignEnd_AddOneMargin { ...@@ -35,7 +35,6 @@ struct AlignEnd_AddOneMargin {
@State justifyContent: FlexAlign = FlexAlign.End @State justifyContent: FlexAlign = FlexAlign.End
build() { build() {
Column() { Column() {
Text('justifyContent:FlexAlign.End').fontSize(9).fontColor(0xCCCCCC).width('90%')
Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) { Flex({ justifyContent: this.justifyContent, direction: FlexDirection.Row }) {
Text('1') Text('1')
.width(150) .width(150)
......
...@@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager'; ...@@ -17,7 +17,7 @@ import {MessageManager,Callback} from './../../../../common/MessageManager';
@Entry @Entry
@Component @Component
struct AlignEnd_AddVisibility { struct AlignEnd_AddVisibility {
@State OneVisibility: number = Visibility.None @State OneVisibility: number = Visibility.Visible;
messageManager:MessageManager = new MessageManager() messageManager:MessageManager = new MessageManager()
onPageShow() { onPageShow() {
console.info('AlignSpaceEvenly_AddVisibility onPageShow'); console.info('AlignSpaceEvenly_AddVisibility onPageShow');
......
...@@ -48,7 +48,7 @@ export default function AlignEnd_AddAlign() { ...@@ -48,7 +48,7 @@ export default function AlignEnd_AddAlign() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800
* @tc.name Align_End_Row_AddAlign * @tc.name Align_End_Row_AddAlign
* @tc.desc aceFlexAlignEndTest * @tc.desc Setting generic properties does not take effect, and owned properties take precedence
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0800] START');
......
...@@ -47,7 +47,8 @@ export default function AlignEnd_AddAllSpace() { ...@@ -47,7 +47,8 @@ export default function AlignEnd_AddAllSpace() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600
* @tc.name Align_End_Row_AddAllSpace * @tc.name Align_End_Row_AddAllSpace
* @tc.desc aceFlexAlignEndTest * @tc.desc After setting margin, after subtracting the padding from the layout space of the parent component,
* the interface display of the spindle layout that does not meet the sub-component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0600] START');
...@@ -70,6 +71,7 @@ export default function AlignEnd_AddAllSpace() { ...@@ -70,6 +71,7 @@ export default function AlignEnd_AddAllSpace() {
expect(End_AddAllSpace_011.left - End_AddAllSpace_01.left).assertEqual(vp2px(30)); expect(End_AddAllSpace_011.left - End_AddAllSpace_01.left).assertEqual(vp2px(30));
expect(End_AddAllSpace_01.right - End_AddAllSpace_013.right).assertEqual(vp2px(30)); expect(End_AddAllSpace_01.right - End_AddAllSpace_013.right).assertEqual(vp2px(30));
expect(End_AddAllSpace_011.top - End_AddAllSpace_01.top).assertEqual(vp2px(30)); expect(End_AddAllSpace_011.top - End_AddAllSpace_01.top).assertEqual(vp2px(30));
expect(End_AddAllSpace_01.left - End_AddAllSpace_01_Box.left).assertEqual(vp2px(10));
expect(End_AddAllSpace_01.top - End_AddAllSpace_01_Box.top).assertEqual(vp2px(10)); expect(End_AddAllSpace_01.top - End_AddAllSpace_01_Box.top).assertEqual(vp2px(10));
expect(End_AddAllSpace_011.bottom - End_AddAllSpace_011.top).assertEqual(vp2px(50)); expect(End_AddAllSpace_011.bottom - End_AddAllSpace_011.top).assertEqual(vp2px(50));
expect(End_AddAllSpace_012.bottom - End_AddAllSpace_012.top).assertEqual(vp2px(100)); expect(End_AddAllSpace_012.bottom - End_AddAllSpace_012.top).assertEqual(vp2px(100));
...@@ -83,7 +85,8 @@ export default function AlignEnd_AddAllSpace() { ...@@ -83,7 +85,8 @@ export default function AlignEnd_AddAllSpace() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700
* @tc.name Align_End_Row_AddAllSpace * @tc.name Align_End_Row_AddAllSpace
* @tc.desc aceFlexAlignEndTest * @tc.desc After setting margin, the interface that satisfies the spindle layout of the child component is
* displayed after subtracting the padding from the layout space of the parent component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0700] START');
...@@ -106,6 +109,7 @@ export default function AlignEnd_AddAllSpace() { ...@@ -106,6 +109,7 @@ export default function AlignEnd_AddAllSpace() {
expect(End_AddAllSpace_011.left - End_AddAllSpace_01.left).assertEqual(vp2px(30)); expect(End_AddAllSpace_011.left - End_AddAllSpace_01.left).assertEqual(vp2px(30));
expect(End_AddAllSpace_01.right - End_AddAllSpace_013.right).assertEqual(vp2px(20)); expect(End_AddAllSpace_01.right - End_AddAllSpace_013.right).assertEqual(vp2px(20));
expect(End_AddAllSpace_011.top - End_AddAllSpace_01.top).assertEqual(vp2px(20)); expect(End_AddAllSpace_011.top - End_AddAllSpace_01.top).assertEqual(vp2px(20));
expect(End_AddAllSpace_01.left - End_AddAllSpace_01_Box.left).assertEqual(vp2px(10));
expect(End_AddAllSpace_01.top - End_AddAllSpace_01_Box.top).assertEqual(vp2px(10)); expect(End_AddAllSpace_01.top - End_AddAllSpace_01_Box.top).assertEqual(vp2px(10));
expect(End_AddAllSpace_011.right - End_AddAllSpace_011.left).assertEqual(vp2px(150)); expect(End_AddAllSpace_011.right - End_AddAllSpace_011.left).assertEqual(vp2px(150));
expect(End_AddAllSpace_012.right - End_AddAllSpace_012.left).assertEqual(vp2px(150)); expect(End_AddAllSpace_012.right - End_AddAllSpace_012.left).assertEqual(vp2px(150));
......
...@@ -48,11 +48,13 @@ export default function AlignEnd_AddLayoutWeight() { ...@@ -48,11 +48,13 @@ export default function AlignEnd_AddLayoutWeight() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200
* @tc.name Align_End_Row_AddLayoutWeight * @tc.name Align_End_Row_AddLayoutWeight
* @tc.desc aceFlexAlignEndTest * @tc.desc The interface displays all subcomponents that set different layoutWeight properties
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200] START');
globalThis.value.message.notify({name:'OneLayoutWeight', value:1}) globalThis.value.message.notify({name:'OneLayoutWeight1', value:1});
globalThis.value.message.notify({name:'OneLayoutWeight2', value:2})
globalThis.value.message.notify({name:'OneLayoutWeight3', value:2})
await CommonFunc.sleep(3000); await CommonFunc.sleep(3000);
let strJson = getInspectorByKey('End_AddLayoutWeight_01'); let strJson = getInspectorByKey('End_AddLayoutWeight_01');
let obj = JSON.parse(strJson); let obj = JSON.parse(strJson);
...@@ -70,14 +72,52 @@ export default function AlignEnd_AddLayoutWeight() { ...@@ -70,14 +72,52 @@ export default function AlignEnd_AddLayoutWeight() {
expect(End_AddLayoutWeight_012.right).assertEqual(End_AddLayoutWeight_013.left); expect(End_AddLayoutWeight_012.right).assertEqual(End_AddLayoutWeight_013.left);
expect(End_AddLayoutWeight_011.left).assertEqual(End_AddLayoutWeight_01.left); expect(End_AddLayoutWeight_011.left).assertEqual(End_AddLayoutWeight_01.left);
expect(End_AddLayoutWeight_013.right).assertEqual(End_AddLayoutWeight_01.right); expect(End_AddLayoutWeight_013.right).assertEqual(End_AddLayoutWeight_01.right);
expect(End_AddLayoutWeight_011.right - End_AddLayoutWeight_011.left).assertEqual(vp2px(200)); expect(End_AddLayoutWeight_011.right - End_AddLayoutWeight_011.left).assertEqual(vp2px(100));
expect(End_AddLayoutWeight_012.right - End_AddLayoutWeight_012.left).assertEqual(vp2px(150)); expect(End_AddLayoutWeight_012.right - End_AddLayoutWeight_012.left).assertEqual(vp2px(200));
expect(End_AddLayoutWeight_013.right - End_AddLayoutWeight_013.left).assertEqual(vp2px(150)); expect(End_AddLayoutWeight_013.right - End_AddLayoutWeight_013.left).assertEqual(vp2px(200));
expect(End_AddLayoutWeight_011.bottom - End_AddLayoutWeight_011.top).assertEqual(vp2px(50)); expect(End_AddLayoutWeight_011.bottom - End_AddLayoutWeight_011.top).assertEqual(vp2px(50));
expect(End_AddLayoutWeight_012.bottom - End_AddLayoutWeight_012.top).assertEqual(vp2px(100)); expect(End_AddLayoutWeight_012.bottom - End_AddLayoutWeight_012.top).assertEqual(vp2px(100));
expect(End_AddLayoutWeight_013.bottom - End_AddLayoutWeight_013.top).assertEqual(vp2px(150)); expect(End_AddLayoutWeight_013.bottom - End_AddLayoutWeight_013.top).assertEqual(vp2px(150));
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200] END'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1200] END');
done(); done();
}); });
/**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1600
* @tc.name Align_End_Row_AddLayoutWeight
* @tc.desc Some subcomponents are displayed with different layoutWeight properties
*/
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1600', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1600] START');
globalThis.value.message.notify({name:'OneLayoutWeight1', value:1});
globalThis.value.message.notify({name:'OneLayoutWeight2', value:2})
globalThis.value.message.notify({name:'OneLayoutWeight3', value:2})
await CommonFunc.sleep(3000);
let strJson = getInspectorByKey('End_AddLayoutWeight_01');
let obj = JSON.parse(strJson);
expect(obj.$type).assertEqual('Flex');
expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.Row');
expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.End');
let End_AddLayoutWeight_011 = CommonFunc.getComponentRect('End_AddLayoutWeight_021');
let End_AddLayoutWeight_012 = CommonFunc.getComponentRect('End_AddLayoutWeight_022');
let End_AddLayoutWeight_013 = CommonFunc.getComponentRect('End_AddLayoutWeight_023');
let End_AddLayoutWeight_01 = CommonFunc.getComponentRect('End_AddLayoutWeight_02');
expect(End_AddLayoutWeight_011.top).assertEqual(End_AddLayoutWeight_01.top);
expect(End_AddLayoutWeight_011.top).assertEqual(End_AddLayoutWeight_012.top);
expect(End_AddLayoutWeight_013.top).assertEqual(End_AddLayoutWeight_012.top);
expect(End_AddLayoutWeight_011.right).assertEqual(End_AddLayoutWeight_012.left);
expect(End_AddLayoutWeight_012.right).assertEqual(End_AddLayoutWeight_013.left);
expect(End_AddLayoutWeight_011.left).assertEqual(End_AddLayoutWeight_01.left);
expect(End_AddLayoutWeight_013.right).assertEqual(End_AddLayoutWeight_01.right);
let oneWidth = End_AddLayoutWeight_011.right - End_AddLayoutWeight_011.left;
let twoWidth = End_AddLayoutWeight_012.right - End_AddLayoutWeight_012.left;
expect(twoWidth / oneWidth).assertEqual(2);
expect(twoWidth + oneWidth).assertEqual(vp2px(350));
expect(End_AddLayoutWeight_013.right - End_AddLayoutWeight_013.left).assertEqual(vp2px(150));
expect(End_AddLayoutWeight_011.bottom - End_AddLayoutWeight_011.top).assertEqual(vp2px(50));
expect(End_AddLayoutWeight_012.bottom - End_AddLayoutWeight_012.top).assertEqual(vp2px(100));
expect(End_AddLayoutWeight_013.bottom - End_AddLayoutWeight_013.top).assertEqual(vp2px(150));
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1600] END');
done();
});
}) })
} }
...@@ -48,7 +48,8 @@ export default function AlignEnd_AddMargin() { ...@@ -48,7 +48,8 @@ export default function AlignEnd_AddMargin() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500
* @tc.name Align_End_Row_AddMargin * @tc.name Align_End_Row_AddMargin
* @tc.desc aceFlexAlignEndTest * @tc.desc The interface display where the child component is offset by the margin setting of the parent
* component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0500] START');
...@@ -69,6 +70,7 @@ export default function AlignEnd_AddMargin() { ...@@ -69,6 +70,7 @@ export default function AlignEnd_AddMargin() {
expect(End_AddMargin_012.left).assertEqual(End_AddMargin_011.right); expect(End_AddMargin_012.left).assertEqual(End_AddMargin_011.right);
expect(End_AddMargin_013.left).assertEqual(End_AddMargin_012.right); expect(End_AddMargin_013.left).assertEqual(End_AddMargin_012.right);
expect(End_AddMargin_013.right).assertEqual(End_AddMargin_01.right); expect(End_AddMargin_013.right).assertEqual(End_AddMargin_01.right);
expect(End_AddMargin_01.left - End_AddMargin_01_Box.left).assertEqual(vp2px(20));
expect(End_AddMargin_01.top - End_AddMargin_01_Box.top).assertEqual(vp2px(20)); expect(End_AddMargin_01.top - End_AddMargin_01_Box.top).assertEqual(vp2px(20));
expect(End_AddMargin_011.left - End_AddMargin_01.left).assertEqual(vp2px(50)); expect(End_AddMargin_011.left - End_AddMargin_01.left).assertEqual(vp2px(50));
expect(End_AddMargin_011.bottom - End_AddMargin_011.top).assertEqual(vp2px(50)); expect(End_AddMargin_011.bottom - End_AddMargin_011.top).assertEqual(vp2px(50));
......
...@@ -48,7 +48,7 @@ export default function AlignEnd_AddOffset() { ...@@ -48,7 +48,7 @@ export default function AlignEnd_AddOffset() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900
* @tc.name Align_End_Row_AddOffset * @tc.name Align_End_Row_AddOffset
* @tc.desc aceFlexAlignEndTest * @tc.desc The interface display of the component that sets the offset position when drawing
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0900] START');
......
...@@ -48,7 +48,8 @@ export default function AlignEnd_AddOneMargin() { ...@@ -48,7 +48,8 @@ export default function AlignEnd_AddOneMargin() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400
* @tc.name Align_End_Row_AddOneMargin * @tc.name Align_End_Row_AddOneMargin
* @tc.desc aceFlexAlignEndTest * @tc.desc After setting margin for the first subcomponent, the layout of the parent component's spindle
* meets the interface display of the subcomponent's layout
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1400] START');
...@@ -82,7 +83,8 @@ export default function AlignEnd_AddOneMargin() { ...@@ -82,7 +83,8 @@ export default function AlignEnd_AddOneMargin() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500
* @tc.name Align_End_Row_AddOneMargin * @tc.name Align_End_Row_AddOneMargin
* @tc.desc aceFlexAlignEndTest * @tc.desc After setting margin for the first subcomponent, the layout of the parent component's spindle does
* not meet the interface display of the subcomponent's layout
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1500] START');
......
...@@ -48,7 +48,7 @@ export default function AlignEnd_AddOneWidth() { ...@@ -48,7 +48,7 @@ export default function AlignEnd_AddOneWidth() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300
* @tc.name Align_End_Row_ChangeOneWidth * @tc.name Align_End_Row_ChangeOneWidth
* @tc.desc aceFlexAlignEndTest * @tc.desc The interface is displayed when you change the spindle length (width) of the first subassembly
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1300] START');
......
...@@ -48,7 +48,8 @@ export default function AlignEnd_AddPadding() { ...@@ -48,7 +48,8 @@ export default function AlignEnd_AddPadding() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300
* @tc.name Align_End_Row_AddPadding * @tc.name Align_End_Row_AddPadding
* @tc.desc aceFlexAlignEndTest * @tc.desc After subtracting the padding from the parent component layout space, the interface
* display that does not meet the spindle layout of the child component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0300] START');
...@@ -82,7 +83,8 @@ export default function AlignEnd_AddPadding() { ...@@ -82,7 +83,8 @@ export default function AlignEnd_AddPadding() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400
* @tc.name Align_End_Row_AddPadding * @tc.name Align_End_Row_AddPadding
* @tc.desc aceFlexAlignEndTest * @tc.desc After subtracting the padding from the parent component layout space, the interface that
* satisfies the spindle layout of the child component is displayed
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0400] START');
......
...@@ -48,7 +48,7 @@ export default function AlignEnd_AddVisibility() { ...@@ -48,7 +48,7 @@ export default function AlignEnd_AddVisibility() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000
* @tc.name Align_End_Row_AddVisibility * @tc.name Align_End_Row_AddVisibility
* @tc.desc aceFlexAlignEndTest * @tc.desc The subcomponent sets the visibility. None, the child components are hidden in the interface display
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1000] START');
...@@ -80,7 +80,8 @@ export default function AlignEnd_AddVisibility() { ...@@ -80,7 +80,8 @@ export default function AlignEnd_AddVisibility() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100
* @tc.name Align_End_Row_AddVisibility * @tc.name Align_End_Row_AddVisibility
* @tc.desc aceFlexAlignEndTest * @tc.desc When the subcomponent sets visibility.hidden, the interface of the subcomponent does not occupy the
* position
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100] START');
...@@ -114,5 +115,43 @@ export default function AlignEnd_AddVisibility() { ...@@ -114,5 +115,43 @@ export default function AlignEnd_AddVisibility() {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100] END'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1100] END');
done(); done();
}); });
/**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1700
* @tc.name Align_End_Row_AddVisibility
* @tc.desc The subcomponent sets the visibility. Visible, the subcomponent does not occupy a position in the
* interface display
*/
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1700', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1700] START');
globalThis.value.message.notify({name:'OneVisibility',value:Visibility.Visible})
await CommonFunc.sleep(3000);
let strJson = getInspectorByKey('End_AddVisibility_01');
let obj = JSON.parse(strJson);
let strJson2 = getInspectorByKey('End_AddVisibility_011');
let obj2 = JSON.parse(strJson2);
expect(obj.$type).assertEqual('Flex');
expect(obj.$attrs.constructor.direction).assertEqual('FlexDirection.Row');
expect(obj.$attrs.constructor.justifyContent).assertEqual('FlexAlign.End');
expect(obj2.$attrs.visibility).assertEqual("Visibility.Visible");
let End_AddVisibility_011 = CommonFunc.getComponentRect('End_AddVisibility_011');
let End_AddVisibility_012 = CommonFunc.getComponentRect('End_AddVisibility_012');
let End_AddVisibility_013 = CommonFunc.getComponentRect('End_AddVisibility_013');
let End_AddVisibility_01 = CommonFunc.getComponentRect('End_AddVisibility_01');
expect(End_AddVisibility_011.top).assertEqual(End_AddVisibility_012.top);
expect(End_AddVisibility_012.top).assertEqual(End_AddVisibility_013.top);
expect(End_AddVisibility_012.top).assertEqual(End_AddVisibility_01.top);
expect(End_AddVisibility_011.right).assertEqual(End_AddVisibility_012.left);
expect(End_AddVisibility_013.right).assertEqual(End_AddVisibility_01.right);
expect(End_AddVisibility_013.left).assertEqual(End_AddVisibility_012.right);
expect(End_AddVisibility_011.left - End_AddVisibility_01.left).assertEqual(vp2px(50));
expect(End_AddVisibility_011.right - End_AddVisibility_011.left).assertEqual(vp2px(150));
expect(End_AddVisibility_012.right - End_AddVisibility_012.left).assertEqual(vp2px(150));
expect(End_AddVisibility_013.right - End_AddVisibility_013.left).assertEqual(vp2px(150));
expect(End_AddVisibility_011.bottom - End_AddVisibility_011.top).assertEqual(vp2px(50));
expect(End_AddVisibility_012.bottom - End_AddVisibility_012.top).assertEqual(vp2px(100));
expect(End_AddVisibility_013.bottom - End_AddVisibility_013.top).assertEqual(vp2px(150));
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_1700] END');
done();
});
}) })
} }
...@@ -48,7 +48,8 @@ export default function AlignEnd_NoSpace() { ...@@ -48,7 +48,8 @@ export default function AlignEnd_NoSpace() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100
* @tc.name Align_End_Row_ChangeWidth * @tc.name Align_End_Row_ChangeWidth
* @tc.desc aceFlexAlignEndTest * @tc.desc The parent component layout space does not meet the interface display of the spindle layout of
* the child component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0100] START');
...@@ -82,7 +83,8 @@ export default function AlignEnd_NoSpace() { ...@@ -82,7 +83,8 @@ export default function AlignEnd_NoSpace() {
/** /**
* @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200 * @tc.number SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200
* @tc.name Align_End_Row_ChangeWidth * @tc.name Align_End_Row_ChangeWidth
* @tc.desc aceFlexAlignEndTest * @tc.desc The interface display where the parent component layout space satisfies the spindle layout of
* the child component
*/ */
it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200', 0, async function (done) { it('SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200', 0, async function (done) {
console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200] START'); console.info('[SUB_ACE_FLEX_JUSTIFYCONTENT_FLEXALIGN_END_TEST_0200] START');
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册