diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2019-11-12 15:52:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-12 15:52:35 +0200 |
| commit | 4bfdc5c0067780b0732af77ad0805a78832a7816 (patch) | |
| tree | b936206d6d03d03eb0cbc00e89871caa10c5b1de | |
| parent | 80146a1a643ee8e111e19136f6cdaf613088137d (diff) | |
| download | vaadin-framework-4bfdc5c0067780b0732af77ad0805a78832a7816.tar.gz vaadin-framework-4bfdc5c0067780b0732af77ad0805a78832a7816.zip | |
Tweaked layouttester tests to be more informative. (#11800)
120 files changed, 496 insertions, 45 deletions
diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png Binary files differindex 876d8cc467..99e287e451 100755 --- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png +++ b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png Binary files differindex 1397c71a91..051910e15b 100755 --- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png Binary files differindex 13786ad674..049103f260 100755 --- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png +++ b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png Binary files differindex 275ee57125..b7e887f800 100755 --- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png +++ b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png diff --git a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png Binary files differindex 89b1a7df37..31727ab5fb 100755 --- a/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png +++ b/uitest/reference-screenshots/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png diff --git a/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png Binary files differindex 487685788c..152b63d06e 100755 --- a/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png +++ b/uitest/reference-screenshots/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png diff --git a/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png b/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png Binary files differindex ae7e507a6d..a3faa6fd82 100755 --- a/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png +++ b/uitest/reference-screenshots/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png Binary files differindex d0586e2696..065588dc76 100755 --- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png Binary files differindex dfa56917b8..4287701321 100755 --- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png Binary files differindex bcb9a03e89..c8c6f50b96 100755 --- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png +++ b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png Binary files differindex 6085226f88..8aeb0dbdd1 100755 --- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png Binary files differindex 13a8c5223d..5fb40dfbc7 100755 --- a/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/reference-screenshots/GridIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/GridIconTest-LayoutIcon_ANY_Chrome__icon.png Binary files differindex 43680796e9..9fc27797a3 100755 --- a/uitest/reference-screenshots/GridIconTest-LayoutIcon_ANY_Chrome__icon.png +++ b/uitest/reference-screenshots/GridIconTest-LayoutIcon_ANY_Chrome__icon.png diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png Binary files differindex b1c048151c..1342c2c57a 100755 --- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png +++ b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png Binary files differindex 968bbec686..cfa391874b 100755 --- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png +++ b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png Binary files differindex c42dd36ae2..1ef52060e7 100755 --- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png +++ b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png diff --git a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png Binary files differindex 64ca21f213..886534c214 100755 --- a/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png Binary files differindex 9ff966eb0f..55e0994837 100755 --- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png Binary files differnew file mode 100644 index 0000000000..57d3ce747c --- /dev/null +++ b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png Binary files differindex 1141788026..e27e41ae53 100755 --- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png +++ b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png Binary files differnew file mode 100644 index 0000000000..6153d28baf --- /dev/null +++ b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png diff --git a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png Binary files differdeleted file mode 100755 index 17029ed376..0000000000 --- a/uitest/reference-screenshots/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png +++ /dev/null diff --git a/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png b/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png Binary files differnew file mode 100644 index 0000000000..d8fc04f0dd --- /dev/null +++ b/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png diff --git a/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png Binary files differindex 58be1b4c78..48d7459a76 100755 --- a/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png +++ b/uitest/reference-screenshots/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png Binary files differindex d0586e2696..e5f6fef8f7 100755 --- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png Binary files differindex dfa56917b8..d9f4873bc6 100755 --- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png Binary files differdeleted file mode 100755 index 4962ab5875..0000000000 --- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png +++ /dev/null diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png Binary files differnew file mode 100644 index 0000000000..1fadc3b973 --- /dev/null +++ b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png Binary files differindex 244582e7a6..0d49fe084b 100755 --- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png Binary files differindex b408abe7e9..d545cb2c3d 100755 --- a/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png Binary files differindex aba227cf9f..6618ca39bd 100755 --- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png +++ b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png Binary files differindex e09a68c16d..b2d42c7c8f 100755 --- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png Binary files differindex 9ccbf14690..6639e74b50 100755 --- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png +++ b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png Binary files differindex 2a1310c36f..ff1e4e4c8f 100755 --- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png +++ b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png diff --git a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png Binary files differindex 634c2711de..fd6e0c8178 100755 --- a/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png +++ b/uitest/reference-screenshots/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png diff --git a/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png Binary files differindex 708a3177ce..b0bf3054bb 100755 --- a/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png +++ b/uitest/reference-screenshots/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png diff --git a/uitest/reference-screenshots/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png b/uitest/reference-screenshots/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png Binary files differindex 72e70b91ad..8aba1d52d5 100755 --- a/uitest/reference-screenshots/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png +++ b/uitest/reference-screenshots/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png Binary files differindex 12bc690466..9d99e0b2e3 100755 --- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png Binary files differindex dff4d574b5..365878113b 100755 --- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png Binary files differindex e3ffe054aa..407d4b5b7a 100755 --- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png +++ b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png Binary files differindex d6b9c51219..a0bd9cc868 100755 --- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png Binary files differindex e6dacf6664..9f266e3edb 100755 --- a/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png b/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png Binary files differnew file mode 100644 index 0000000000..e2ee3b21d5 --- /dev/null +++ b/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png diff --git a/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon.png Binary files differindex dfa3f0aa60..f805fec919 100755 --- a/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon.png +++ b/uitest/reference-screenshots/HIconTest-LayoutIcon_ANY_Chrome__icon.png diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png Binary files differindex 81a0037d7f..3fed295bfe 100755 --- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png +++ b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png Binary files differindex b0c6ab60c2..f801bf05d2 100755 --- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png +++ b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png Binary files differindex a57644d3ea..d6c1c2df55 100755 --- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png +++ b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png diff --git a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png Binary files differindex 3b32bcec39..55d98e1dbf 100755 --- a/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png Binary files differindex 2585f163e9..13061814a2 100755 --- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png Binary files differnew file mode 100644 index 0000000000..1a4beb8580 --- /dev/null +++ b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png Binary files differindex 1da3fb397f..5cc8272623 100755 --- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png +++ b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png Binary files differnew file mode 100644 index 0000000000..30bd92228d --- /dev/null +++ b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png diff --git a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png Binary files differdeleted file mode 100755 index 4fe1f5d1a9..0000000000 --- a/uitest/reference-screenshots/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png +++ /dev/null diff --git a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png Binary files differnew file mode 100644 index 0000000000..7890264eab --- /dev/null +++ b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png diff --git a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png Binary files differnew file mode 100644 index 0000000000..aec7bb9b59 --- /dev/null +++ b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png diff --git a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png Binary files differindex 94826b487a..73e61502f4 100755 --- a/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png +++ b/uitest/reference-screenshots/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png Binary files differindex 12bc690466..9d99e0b2e3 100755 --- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png Binary files differindex dff4d574b5..562eb6e269 100755 --- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png Binary files differindex e3ffe054aa..efe19ea55f 100755 --- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png +++ b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png Binary files differindex d6b9c51219..e02e28f309 100755 --- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png Binary files differindex e6dacf6664..2f34a2b88b 100755 --- a/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png b/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png Binary files differnew file mode 100644 index 0000000000..841d2e1ead --- /dev/null +++ b/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png diff --git a/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png Binary files differindex 609d847c61..f4793e0f70 100755 --- a/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png +++ b/uitest/reference-screenshots/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png Binary files differindex e386e49c0b..8ab31b71aa 100755 --- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png Binary files differnew file mode 100644 index 0000000000..8ab31b71aa --- /dev/null +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png Binary files differindex bdd704f5c8..8483cc4282 100755 --- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png Binary files differindex 768dfbb320..9ad4c64cd7 100755 --- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png Binary files differindex 34921202db..fa317dc8f4 100755 --- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png Binary files differindex 5edcb46bed..85dfedf6f9 100755 --- a/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/reference-screenshots/VIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/VIconTest-LayoutIcon_ANY_Chrome__icon.png Binary files differindex 8ab3456863..c35aa48a91 100755 --- a/uitest/reference-screenshots/VIconTest-LayoutIcon_ANY_Chrome__icon.png +++ b/uitest/reference-screenshots/VIconTest-LayoutIcon_ANY_Chrome__icon.png diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png Binary files differindex 1f0dfba22a..1a7a61ebe9 100755 --- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png +++ b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png Binary files differindex 7d8ec7f8bd..1ba9c22b97 100755 --- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png +++ b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png Binary files differindex 0795cce17c..894c926f2a 100755 --- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png +++ b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png diff --git a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png Binary files differindex 59c4f95401..e153773bb3 100755 --- a/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png Binary files differindex 391202dc57..a990cf08e4 100755 --- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png Binary files differnew file mode 100644 index 0000000000..df7882e33f --- /dev/null +++ b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png Binary files differindex 91c1a7dfe3..ba76ccd675 100755 --- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png +++ b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png Binary files differnew file mode 100644 index 0000000000..9e785ecb98 --- /dev/null +++ b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png diff --git a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png Binary files differdeleted file mode 100755 index d84c300f00..0000000000 --- a/uitest/reference-screenshots/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png +++ /dev/null diff --git a/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png b/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png Binary files differnew file mode 100644 index 0000000000..f6759bcc10 --- /dev/null +++ b/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png diff --git a/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png Binary files differindex 61e4108f21..9a8b8d2a4f 100755 --- a/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png +++ b/uitest/reference-screenshots/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png Binary files differindex e386e49c0b..02e9ad22c8 100755 --- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png +++ b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png Binary files differindex bdd704f5c8..14fc721316 100755 --- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png +++ b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png Binary files differindex 768dfbb320..4c512558d7 100755 --- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png +++ b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png Binary files differindex 34921202db..8b7f4d2237 100755 --- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png +++ b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png diff --git a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png Binary files differindex 5edcb46bed..81739b964f 100755 --- a/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png +++ b/uitest/reference-screenshots/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java index 7a2faebac5..776b862064 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAlignment.java @@ -53,7 +53,7 @@ abstract public class BaseAlignment extends BaseLayoutTestUI { // TODO Auto-generated catch block e.printStackTrace(); } - layout.setHeight("300px"); + layout.setHeight("100px"); layout.setWidth("200px"); layout.addComponent(components[i]); layout.setComponentAlignment(components[i], alignments[i]); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java index 68bf1622a3..75945c7c25 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutExpand.java @@ -65,8 +65,6 @@ public class BaseLayoutExpand extends BaseLayoutTestUI { } Table t1 = getTestTable(); Table t2 = getTestTable(); - t1.setSizeFull(); - t2.setSizeFull(); l2.addComponent(t1); l2.addComponent(t2); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java index 78be5f66d9..97d962107d 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java @@ -48,8 +48,6 @@ public class BaseLayoutForSpacingMargin extends BaseLayoutTestUI { private void buildLayout() { Table t1 = getTestTable(); Table t2 = getTestTable(); - t1.setSizeFull(); - t2.setSizeFull(); l2.addComponent(t1); l2.setMargin(false); l2.setSpacing(false); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java index 2e58550be5..2d7f8b7e31 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java @@ -45,11 +45,11 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { protected static final String CALENDAR_32_PNG = "../runo/icons/16/calendar.png"; protected static final String LOCK_16_PNG = "../runo/icons/16/lock.png"; protected static final String GLOBE_16_PNG = "../runo/icons/16/globe.png"; - public Alignment[] alignments = new Alignment[] { Alignment.TOP_CENTER, - Alignment.TOP_LEFT, Alignment.TOP_RIGHT, Alignment.BOTTOM_CENTER, - Alignment.BOTTOM_LEFT, Alignment.BOTTOM_RIGHT, - Alignment.MIDDLE_CENTER, Alignment.MIDDLE_LEFT, - Alignment.MIDDLE_RIGHT }; + public Alignment[] alignments = new Alignment[] { Alignment.TOP_LEFT, + Alignment.TOP_CENTER, Alignment.TOP_RIGHT, Alignment.MIDDLE_LEFT, + Alignment.MIDDLE_CENTER, Alignment.MIDDLE_RIGHT, + Alignment.BOTTOM_LEFT, Alignment.BOTTOM_CENTER, + Alignment.BOTTOM_RIGHT }; public final String[] CAPTIONS = new String[] { "", "VeryLongOneWordCaption", @@ -93,7 +93,8 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { private void fillComponents() { for (int i = 0; i < components.length; i++) { String name = "Field" + i; - TextField field = new TextField(); + TextField field = new TextField(alignments[i].getVerticalAlignment() + + " " + alignments[i].getHorizontalAlignment()); field.setValue(name); components[i] = field; } @@ -110,9 +111,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { l2.setMargin(false); final AbstractComponent c1 = getTestTable(); - c1.setSizeFull(); final AbstractComponent c2 = getTestTable(); - c2.setSizeFull(); class SetSizeButton extends Button { SetSizeButton(final String size) { @@ -128,6 +127,7 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { } else if (compType == "component") { c2.setHeight(size); c2.setWidth(size); + c2.setCaption("Configured width"); } else { } @@ -163,11 +163,13 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { } }); + btn2.setCaption(btn2.getCaption() + " + add Label"); } protected Table getTestTable() { Table t = new Table(); - t.setPageLength(5); + t.setSizeFull(); + t.setCaption("100% default width"); t.addContainerProperty("test", String.class, null); t.addItem(new Object[] { "qwertyuiop asdfghjköäxccvbnm,m,." }, 1); t.addItem(new Object[] { "YGVYTCTCTRXRXRXRX" }, 2); @@ -235,6 +237,12 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { */ @Override protected void setup(VaadinRequest request) { + mainLayout.setSizeUndefined(); + getLayout().setSizeUndefined(); + if (getLayout().getParent() instanceof VerticalLayout) { + ((VerticalLayout) getLayout().getParent()).setSizeUndefined(); + } + mainLayout.addComponent(l1); mainLayout.addComponent(l2); addComponent(mainLayout); @@ -254,8 +262,8 @@ public abstract class BaseLayoutTestUI extends AbstractTestUI { AbstractOrderedLayout l2, String w, String h) { l1.setWidth(w); l1.setHeight(h); - l2.setWidth(h); - l2.setHeight(w); + l2.setWidth(w); + l2.setHeight(h); } protected void setDefaultForVertical(AbstractOrderedLayout l1, diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java index 1c3e706d48..3b0a536b79 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAlignment.java @@ -23,6 +23,7 @@ public class GridAlignment extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { buildLayout(); super.setup(request); + layout.setSizeFull(); } /** @@ -31,8 +32,6 @@ public class GridAlignment extends GridBaseLayoutTestUI { private void buildLayout() { layout.setColumns(3); layout.setRows(3); - // layout.setHeight("600px"); - // layout.setWidth("900px"); for (int i = 0; i < components.length; i++) { layout.addComponent(components[i]); layout.setComponentAlignment(components[i], alignments[i]); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java index e9f9bd76b3..5fe7fd84f2 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java @@ -43,8 +43,7 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI { @Override protected void setup(VaadinRequest request) { - layout.setMargin(true); - layout.setSizeFull(); + layout.setSizeUndefined(); getUI().setContent(layout); } @@ -55,9 +54,7 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI { layout.setMargin(false); final AbstractComponent c1 = getTestTable(); - c1.setSizeFull(); final AbstractComponent c2 = getTestTable(); - c2.setSizeFull(); class SetSizeButton extends Button { SetSizeButton(final String size) { @@ -73,6 +70,7 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI { } else if (compType == "component") { c2.setHeight(size); c2.setWidth(size); + c2.setCaption("Configured width"); } else { } @@ -81,7 +79,7 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI { } } - Button btn1 = new SetSizeButton("550px"); + Button btn1 = new SetSizeButton("350px"); Button btn2 = new SetSizeButton("-1px"); Button btn3 = new SetSizeButton("75%"); Button btn4 = new SetSizeButton("100%"); @@ -104,5 +102,6 @@ public abstract class GridBaseLayoutTestUI extends BaseLayoutTestUI { layout.addComponent(newLabel); } }); + btn2.setCaption(btn2.getCaption() + " + add Label"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java index 52d8b3db2e..4e6a4638e2 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridComponentSizing.java @@ -28,5 +28,6 @@ public class GridComponentSizing extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { getLayoutForLayoutSizing("component"); super.setup(request); + layout.setSizeFull(); } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java index 1ed8695aa3..119c825587 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridIcon.java @@ -16,6 +16,7 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Label; @@ -39,4 +40,13 @@ public class GridIcon extends GridBaseLayoutTestUI { layout.addComponent(createLabelsFields(TabSheet.class, true, "")); super.setup(request); } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "400px", "-1px"); + l1.setSpacing(true); + l2.setSpacing(true); + mainLayout.setSpacing(true); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java index b939b825e7..0e11c15505 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutExpand.java @@ -30,6 +30,7 @@ public class GridLayoutExpand extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { buildLayout(); super.setup(request); + layout.setSizeFull(); } private void buildLayout() { @@ -50,8 +51,6 @@ public class GridLayoutExpand extends GridBaseLayoutTestUI { } Table t1 = getTestTable(); Table t2 = getTestTable(); - t1.setSizeFull(); - t2.setSizeFull(); layout.setColumns(4); layout.setRows(4); layout.addComponent(new ExpandButton(1, 2, 1.0f, 0.0f), 0, 0); diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java index dce4bd576e..5f338e0ed0 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java @@ -39,8 +39,8 @@ public class GridLayoutMarginSpacing extends GridBaseLayoutTestUI { private void buildLayout() { Table t1 = getTestTable(); Table t2 = getTestTable(); - t1.setSizeFull(); - t2.setSizeFull(); + t1.setSizeUndefined(); + t2.setSizeUndefined(); final Button btn1 = new Button("Toggle margin on/off"); btn1.addClickListener(new ClickListener() { diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java index c536171f38..514a4384c5 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegError.java @@ -16,6 +16,7 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; @@ -51,4 +52,10 @@ public class GridLayoutRegError extends GridBaseLayoutTestUI { layout.addComponent(createLabelsFields(CheckBox.class, true, "")); } + + @Override + protected void setDefaultForVertical(AbstractOrderedLayout l1, + AbstractOrderedLayout l2) { + setLayoutMeasures(l1, l2, "800px", "800px"); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java index f3c486813b..f1116a1ee2 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizing.java @@ -16,6 +16,12 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; +import com.vaadin.shared.ui.label.ContentMode; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Label; /** * @@ -28,5 +34,63 @@ public class GridLayoutSizing extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { getLayoutForLayoutSizing("layout"); super.setup(request); + layout.setSizeFull(); + } + + @Override + protected void getLayoutForLayoutSizing(final String compType) { + + layout.setSpacing(false); + layout.setMargin(false); + + final AbstractComponent c1 = getTestTable(); + final AbstractComponent c2 = getTestTable(); + + class SetSizeButton extends Button { + SetSizeButton(final String size) { + super(); + setCaption("Set size " + size); + addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + if (compType == "layout") { + layout.setHeight(size); + layout.setWidth(size); + } else if (compType == "component") { + c2.setHeight(size); + c2.setWidth(size); + } else { + } + + } + }); + } + + } + Button btn1 = new SetSizeButton("600px"); + Button btn2 = new SetSizeButton("-1px"); + Button btn3 = new SetSizeButton("75%"); + Button btn4 = new SetSizeButton("100%"); + + layout.addComponent(btn1); + layout.addComponent(btn2); + layout.addComponent(btn3); + layout.addComponent(btn4); + layout.addComponent(c1); + layout.addComponent(new Label( + "<div style='height: 1px'></div><hr /><div style='height: 1px'></div>", + ContentMode.HTML)); + layout.addComponent(c2); + btn2.addClickListener(new ClickListener() { + + @Override + public void buttonClick(ClickEvent event) { + Label newLabel = new Label("--- NEW LABEL ---"); + newLabel.setSizeUndefined(); + layout.addComponent(newLabel); + } + }); + btn2.setCaption(btn2.getCaption() + " + add Label"); } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java index e738cfb92b..b0babf7147 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAddReplaceMove.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; public class HAddReplaceMove extends BaseAddReplaceMove { @@ -28,4 +28,10 @@ public class HAddReplaceMove extends BaseAddReplaceMove { super(HorizontalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "1200px", h); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java index 73067ea26a..b9641c4d81 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HAlignment.java @@ -16,6 +16,7 @@ package com.vaadin.tests.layouts.layouttester.HLayout; import com.vaadin.tests.layouts.layouttester.BaseAlignment; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; public class HAlignment extends BaseAlignment { @@ -24,4 +25,10 @@ public class HAlignment extends BaseAlignment { super(HorizontalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "1000px", "200px"); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java index 2471a122eb..00d93e11cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HComponentSizing.java @@ -15,9 +15,14 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; +import java.util.Iterator; + +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import com.vaadin.ui.AbstractOrderedLayout; +import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; /** * @@ -33,4 +38,23 @@ public class HComponentSizing extends BaseComponentSizing { public HComponentSizing() { super(HorizontalLayout.class); } + + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator<Component> iterator = l2.iterator(); + while (iterator.hasNext()) { + Component component = iterator.next(); + if (component instanceof Label) { + component.setWidth("30px"); + } + } + } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "900px", h); + l1.setSizeUndefined(); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java index 64cdbccc64..6f86b2ab5d 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HIcon.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseIcon; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; /** @@ -34,4 +34,10 @@ public class HIcon extends BaseIcon { super(HorizontalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "2900px", "200px"); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java index 1a5ac319ea..bc5f347b10 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutMarginSpacing.java @@ -15,9 +15,15 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; +import java.util.Iterator; + +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.layouts.layouttester.BaseLayoutForSpacingMargin; +import com.vaadin.ui.AbstractOrderedLayout; +import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; /** * @@ -34,4 +40,24 @@ public class HLayoutMarginSpacing extends BaseLayoutForSpacingMargin { super(HorizontalLayout.class); } + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator<Component> iterator = l2.iterator(); + while (iterator.hasNext()) { + Component component = iterator.next(); + if (component instanceof Table) { + component.setSizeUndefined(); + } else if (component instanceof Label) { + component.setWidth("30px"); + } + } + } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + l1.setSizeUndefined(); + l2.setSizeUndefined(); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java index 70126a6dba..6a470e328e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegError.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseRegError; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; /** @@ -33,4 +33,10 @@ public class HLayoutRegError extends BaseRegError { public HLayoutRegError() { super(HorizontalLayout.class); } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "3200px", "200px"); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java index d4deece144..c8115c4ddc 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutSizing.java @@ -15,9 +15,16 @@ */ package com.vaadin.tests.layouts.layouttester.HLayout; -import com.vaadin.annotations.Theme; -import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import java.util.Iterator; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.layouts.layouttester.BaseLayoutSizing; +import com.vaadin.ui.AbstractOrderedLayout; +import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; +import com.vaadin.ui.VerticalLayout; /** * @@ -25,7 +32,7 @@ import com.vaadin.ui.HorizontalLayout; * @author Vaadin Ltd */ -public class HLayoutSizing extends BaseComponentSizing { +public class HLayoutSizing extends BaseLayoutSizing { /** * @param layoutClass @@ -33,4 +40,29 @@ public class HLayoutSizing extends BaseComponentSizing { public HLayoutSizing() { super(HorizontalLayout.class); } + + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator<Component> iterator = l2.iterator(); + while (iterator.hasNext()) { + Component component = iterator.next(); + if (component instanceof Label) { + component.setWidth("30px"); + } + } + mainLayout.setSizeFull(); + getLayout().setSizeFull(); + if (getLayout().getParent() instanceof VerticalLayout) { + ((VerticalLayout) getLayout().getParent()).setSizeFull(); + } + mainLayout.setExpandRatio(l2, 2); + } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "900px", h); + l1.setSizeUndefined(); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java index 5a0c6e8f78..1f40ab89be 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignment.java @@ -16,10 +16,17 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseAlignment; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; public class VAlignment extends BaseAlignment { public VAlignment() { super(VerticalLayout.class); } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "400px", "500px"); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java index 2ac2d74ed6..220e7e7968 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizing.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; /** @@ -34,4 +34,13 @@ public class VComponentSizing extends BaseComponentSizing { super(VerticalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + l1.setWidth("400px"); + l1.setHeight("-1px"); + l2.setWidth("400px"); + l2.setHeight("800px"); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java index 0ac3e00cdb..a2391e81a0 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VIcon.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseIcon; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; /** @@ -34,4 +34,13 @@ public class VIcon extends BaseIcon { super(VerticalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "400px", "-1px"); + l1.setSpacing(true); + l2.setSpacing(true); + mainLayout.setSpacing(true); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java index e0ba99ccc3..0b1f38e999 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutMarginSpacing.java @@ -15,8 +15,14 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; +import java.util.Iterator; + +import com.vaadin.server.VaadinRequest; import com.vaadin.tests.layouts.layouttester.BaseLayoutForSpacingMargin; +import com.vaadin.ui.AbstractOrderedLayout; +import com.vaadin.ui.Component; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; /** @@ -34,4 +40,25 @@ public class VLayoutMarginSpacing extends BaseLayoutForSpacingMargin { super(VerticalLayout.class); } + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator<Component> iterator = l2.iterator(); + while (iterator.hasNext()) { + Component component = iterator.next(); + if (component instanceof Table) { + component.setSizeUndefined(); + } else if (component instanceof Label) { + component.setWidth("100%"); + } + } + } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + l1.setSizeUndefined(); + l2.setSizeUndefined(); + } + } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java index 40730e4a57..b38c2028a1 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegError.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; import com.vaadin.tests.layouts.layouttester.BaseRegError; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; /** @@ -33,4 +33,10 @@ public class VLayoutRegError extends BaseRegError { public VLayoutRegError() { super(VerticalLayout.class); } + + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + super.setLayoutMeasures(l1, l2, "400px", "900px"); + } } diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java index 67f1c2cbd1..cb7c7bd573 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutSizing.java @@ -15,8 +15,8 @@ */ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.annotations.Theme; -import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import com.vaadin.tests.layouts.layouttester.BaseLayoutSizing; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; /** @@ -25,7 +25,7 @@ import com.vaadin.ui.VerticalLayout; * @author Vaadin Ltd */ -public class VLayoutSizing extends BaseComponentSizing { +public class VLayoutSizing extends BaseLayoutSizing { /** * @param layoutClass @@ -34,4 +34,12 @@ public class VLayoutSizing extends BaseComponentSizing { super(VerticalLayout.class); } + @Override + protected void setLayoutMeasures(AbstractOrderedLayout l1, + AbstractOrderedLayout l2, String w, String h) { + l1.setWidth("400px"); + l1.setHeight("-1px"); + l2.setWidth("400px"); + l2.setHeight("500px"); + } } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java index 2584573dc5..10c7087c3f 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutMarginSpacingTest.java @@ -14,7 +14,8 @@ public abstract class BaseLayoutMarginSpacingTest extends MultiBrowserTest { openTestURL(); sleep(500); compareScreen("initial"); - String[] states = { "marginOnSpaceOff", "marginOnfSpaceOn" }; + String[] states = { "marginOnSpaceOff", "marginOnSpaceOn", + "marginOffSpaceOn" }; ButtonElement marginBtn = $(ButtonElement.class).get(0); ButtonElement spaceBtn = $(ButtonElement.class).get(1); marginBtn.click(); @@ -23,5 +24,8 @@ public abstract class BaseLayoutMarginSpacingTest extends MultiBrowserTest { spaceBtn.click(); sleep(1000); compareScreen(states[1]); + marginBtn.click(); + sleep(1000); + compareScreen(states[2]); } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java index ee2a474544..0c0321276a 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/BaseLayoutSizingTest.java @@ -14,13 +14,14 @@ import com.vaadin.tests.tb3.MultiBrowserTest; * @author Vaadin Ltd */ public abstract class BaseLayoutSizingTest extends MultiBrowserTest { + protected String[] states = new String[] { "setSize350px", "setSize_-1px", + "setSize75Percent", "setSize100Percent" }; + @Test public void LayoutSizing() throws IOException, InterruptedException { openTestURL(); sleep(500); compareScreen("initial"); - String[] states = { "setSize350px", "setSize_-1px", "setSize75Percent", - "setSize100Percent" }; List<ButtonElement> buttons = $(ButtonElement.class).all(); int index = 0; // go through all buttons click them and see result diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java index 0c88d20cf2..722d67b69e 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutRegErrorTest.java @@ -1,5 +1,13 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; /** @@ -9,4 +17,19 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; */ public class GridLayoutRegErrorTest extends BaseLayoutRegErrorTest { + @Override + public void LayoutRegError() throws IOException { + super.LayoutRegError(); + + // The layout is too high to fit into one screenshot, we need to scroll + // and take another. + + List<CheckBoxElement> checkBoxes = $(CheckBoxElement.class).all(); + assertEquals(3, checkBoxes.size()); + CheckBoxElement lastCheckBox = checkBoxes.get(2); + + new Actions(driver).moveToElement(lastCheckBox).build().perform(); + + compareScreen("RegError-Scrolled"); + } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java index b25da0a5ab..28e2c26d39 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutSizingTest.java @@ -1,5 +1,7 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; +import java.io.IOException; + import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; /** @@ -9,4 +11,9 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; */ public class GridLayoutSizingTest extends BaseLayoutSizingTest { + @Override + public void LayoutSizing() throws IOException, InterruptedException { + states[0] = "setSize600px"; + super.LayoutSizing(); + } }
\ No newline at end of file diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java index 776c0c8ae9..eb0e05b9ec 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HIconTest.java @@ -1,6 +1,34 @@ package com.vaadin.tests.layouts.layouttester.HLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.HorizontalLayoutElement; import com.vaadin.tests.layouts.layouttester.BaseIconTest; public class HIconTest extends BaseIconTest { + + @Override + public void LayoutIcon() throws IOException { + super.LayoutIcon(); + + // The layout is too wide to fit into one screenshot, we need to scroll + // and take another. + + List<HorizontalLayoutElement> layouts = $(HorizontalLayoutElement.class) + .all(); + assertEquals(8, layouts.size()); + HorizontalLayoutElement lastOfRow1 = layouts.get(3); + HorizontalLayoutElement lastOfRow2 = layouts.get(7); + + // scroll to both to ensure both contents are fully in view + new Actions(driver).moveToElement(lastOfRow1).build().perform(); + new Actions(driver).moveToElement(lastOfRow2).build().perform(); + + compareScreen("icon-scrolled"); + } } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java index 8183746103..fdd54c0fe0 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/HLayout/HLayoutRegErrorTest.java @@ -1,6 +1,47 @@ package com.vaadin.tests.layouts.layouttester.HLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.HorizontalLayoutElement; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; public class HLayoutRegErrorTest extends BaseLayoutRegErrorTest { + + @Override + public void LayoutRegError() throws IOException { + super.LayoutRegError(); + + // The layout is too wide to fit into one screenshot, we need to scroll + // and take two more. + + List<HorizontalLayoutElement> layouts = $(HorizontalLayoutElement.class) + .all(); + assertEquals(10, layouts.size()); + HorizontalLayoutElement group2row1 = layouts.get(2); + HorizontalLayoutElement group2row2 = layouts.get(7); + HorizontalLayoutElement group3row1 = layouts.get(3); + HorizontalLayoutElement group3row2 = layouts.get(8); + HorizontalLayoutElement lastOfRow1 = layouts.get(4); + HorizontalLayoutElement lastOfRow2 = layouts.get(9); + + // scroll to both to ensure both contents are fully in view + new Actions(driver).moveToElement(group3row1).build().perform(); + new Actions(driver).moveToElement(group3row2).build().perform(); + // scroll back to get the previous group at the left edge + new Actions(driver).moveToElement(group2row1).build().perform(); + new Actions(driver).moveToElement(group2row2).build().perform(); + + compareScreen("RegError-Scrolled-Middle"); + + // scroll to last ones + new Actions(driver).moveToElement(lastOfRow1).build().perform(); + new Actions(driver).moveToElement(lastOfRow2).build().perform(); + + compareScreen("RegError-Scrolled-End"); + } } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java index 48184a0591..d8ab553b7e 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VAlignmentTest.java @@ -1,6 +1,30 @@ package com.vaadin.tests.layouts.layouttester.VLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.TextFieldElement; import com.vaadin.tests.layouts.layouttester.BaseAlignmentTest; public class VAlignmentTest extends BaseAlignmentTest { + + @Override + public void layoutAlignment() throws IOException { + super.layoutAlignment(); + + // The layout is too high to fit into one screenshot, we need to scroll + // and take another. + + List<TextFieldElement> textFields = $(TextFieldElement.class).all(); + assertEquals(9, textFields.size()); + TextFieldElement lastTextField = textFields.get(8); + + new Actions(driver).moveToElement(lastTextField).build().perform(); + + compareScreen("alignment-scrolled"); + } } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java index cabb6c3a4b..16925e6339 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VComponentSizingTest.java @@ -1,6 +1,49 @@ package com.vaadin.tests.layouts.layouttester.VLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.ButtonElement; +import com.vaadin.testbench.elements.VerticalLayoutElement; import com.vaadin.tests.layouts.layouttester.BaseComponentSizingTest; public class VComponentSizingTest extends BaseComponentSizingTest { + + @Override + public void ComponentSizing() throws IOException, InterruptedException { + openTestURL(); + sleep(500); + + // The layout is too high to fit into one screenshot, we need to scroll + // down to see relevant content. And keep doing it since interacting + // with the controls scrolls back up again. + + List<VerticalLayoutElement> layouts = $(VerticalLayoutElement.class) + .all(); + assertEquals(5, layouts.size()); + VerticalLayoutElement lastLayout = layouts.get(4); + + compareScreen("initial"); + + new Actions(driver).moveToElement(lastLayout).build().perform(); + compareScreen("scrolled"); + + String[] states = { "setSize350px", "setSize_-1px", "setSize75Percent", + "setSize100Percent" }; + List<ButtonElement> buttons = $(ButtonElement.class).all(); + int index = 0; + // go through all buttons click them and see result + for (ButtonElement btn : buttons) { + btn.click(); + sleep(500); + new Actions(driver).moveToElement(lastLayout).build().perform(); + compareScreen(states[index]); + + index++; + } + } } diff --git a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java index 970a3d9607..699d05fbef 100644 --- a/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java +++ b/uitest/src/test/java/com/vaadin/tests/layouts/layouttester/VLayout/VLayoutRegErrorTest.java @@ -1,5 +1,13 @@ package com.vaadin.tests.layouts.layouttester.VLayout; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.List; + +import org.openqa.selenium.interactions.Actions; + +import com.vaadin.testbench.elements.CheckBoxElement; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; /** @@ -8,4 +16,20 @@ import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; * @author Vaadin Ltd */ public class VLayoutRegErrorTest extends BaseLayoutRegErrorTest { + + @Override + public void LayoutRegError() throws IOException { + super.LayoutRegError(); + + // The layout is too high to fit into one screenshot, we need to scroll + // and take another. + + List<CheckBoxElement> checkBoxes = $(CheckBoxElement.class).all(); + assertEquals(3, checkBoxes.size()); + CheckBoxElement lastCheckBox = checkBoxes.get(2); + + new Actions(driver).moveToElement(lastCheckBox).build().perform(); + + compareScreen("RegError-Scrolled"); + } } |
