diff --git a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png index 407ba3d50b9..99e287e4511 100755 Binary files a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png and b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png differ diff --git a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png index 8d38871ead5..051910e15b3 100755 Binary files a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png index d8351818433..049103f2605 100755 Binary files a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png and b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png differ diff --git a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png index 302d103eebd..b7e887f800e 100755 Binary files a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png and b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png differ diff --git a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png index 8e13410ab52..31727ab5fb5 100755 Binary files a/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png and b/uitest/reference-screenshots/chrome/GridAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png differ diff --git a/uitest/reference-screenshots/chrome/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/chrome/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png index a2f2119ea78..152b63d06ec 100755 Binary files a/uitest/reference-screenshots/chrome/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png and b/uitest/reference-screenshots/chrome/GridAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png differ diff --git a/uitest/reference-screenshots/chrome/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png b/uitest/reference-screenshots/chrome/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png index fd08d0012e5..a3faa6fd827 100755 Binary files a/uitest/reference-screenshots/chrome/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png and b/uitest/reference-screenshots/chrome/GridCaptionTest-LayoutCaption_ANY_Chrome__caption.png differ diff --git a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png index 8ba5a7f2df4..065588dc767 100755 Binary files a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png index a9d157051d0..42877013215 100755 Binary files a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png index 2f216175e18..c8c6f50b966 100755 Binary files a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png and b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png differ diff --git a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png index 6085226f880..8aeb0dbdd12 100755 Binary files a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png index 39bbb1786c2..5fb40dfbc7d 100755 Binary files a/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/GridComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/chrome/GridIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/chrome/GridIconTest-LayoutIcon_ANY_Chrome__icon.png index 8af174043b0..9fc27797a3d 100755 Binary files a/uitest/reference-screenshots/chrome/GridIconTest-LayoutIcon_ANY_Chrome__icon.png and b/uitest/reference-screenshots/chrome/GridIconTest-LayoutIcon_ANY_Chrome__icon.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png index 8e5465d1876..1342c2c57a8 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png and b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png index 60d0d4dd878..cfa391874be 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png and b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png index 13e887d2455..1ef52060e7a 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png and b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png index 0df91512cf0..886534c214e 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/GridLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png index d78eed4814a..55e0994837c 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png new file mode 100644 index 00000000000..57d3ce747c9 Binary files /dev/null and b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png index bb7cf900c27..e27e41ae53c 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png and b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png new file mode 100644 index 00000000000..6153d28bafc Binary files /dev/null and b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png deleted file mode 100755 index 4f8b0375fa3..00000000000 Binary files a/uitest/reference-screenshots/chrome/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png b/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png new file mode 100644 index 00000000000..d8fc04f0dde Binary files /dev/null and b/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png index 119c303fe6a..48d7459a767 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png and b/uitest/reference-screenshots/chrome/GridLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png index 8ba5a7f2df4..e5f6fef8f75 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png index a9d157051d0..d9f4873bc60 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png deleted file mode 100755 index 4962ab58756..00000000000 Binary files a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png and /dev/null differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png new file mode 100644 index 00000000000..1fadc3b9733 Binary files /dev/null and b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize600px.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png index 244582e7a6c..0d49fe084b6 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png index 908f6492da0..d545cb2c3d1 100755 Binary files a/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/GridLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png index 81aaa8e9a01..6618ca39bd8 100755 Binary files a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png and b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__add.png differ diff --git a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png index 5cbda6704c0..b2d42c7c8fe 100755 Binary files a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png index fc5f94ea206..6639e74b500 100755 Binary files a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png and b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__move.png differ diff --git a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png index b212a6c48a7..ff1e4e4c8f8 100755 Binary files a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png and b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__remove.png differ diff --git a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png index 7b16f05e583..fd6e0c8178b 100755 Binary files a/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png and b/uitest/reference-screenshots/chrome/HAddReplaceMoveTest-LayoutAlignment_ANY_Chrome__replace.png differ diff --git a/uitest/reference-screenshots/chrome/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/chrome/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png index 708a3177cef..b0bf3054bb0 100755 Binary files a/uitest/reference-screenshots/chrome/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png and b/uitest/reference-screenshots/chrome/HAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png differ diff --git a/uitest/reference-screenshots/chrome/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png b/uitest/reference-screenshots/chrome/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png index 9ab090be1d9..8aba1d52d52 100755 Binary files a/uitest/reference-screenshots/chrome/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png and b/uitest/reference-screenshots/chrome/HCaptionTest-LayoutCaption_ANY_Chrome__caption.png differ diff --git a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png index e7add3a4335..9d99e0b2e37 100755 Binary files a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png index dff4d574b56..365878113bc 100755 Binary files a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png index 88f7d1b7d90..407d4b5b7ae 100755 Binary files a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png and b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png differ diff --git a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png index d6b9c512198..a0bd9cc8689 100755 Binary files a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png index e6dacf66643..9f266e3edbf 100755 Binary files a/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/HComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png b/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png new file mode 100644 index 00000000000..e2ee3b21d5f Binary files /dev/null and b/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon-scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon.png index 3a7164a2188..f805fec9191 100755 Binary files a/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon.png and b/uitest/reference-screenshots/chrome/HIconTest-LayoutIcon_ANY_Chrome__icon.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png index 824d4a7806f..3fed295bfeb 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png and b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png index d8b837566ed..f801bf05d28 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png and b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png index f962af2b38d..d6c1c2df557 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png and b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png index 1f295b033d3..55d98e1dbf8 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/HLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png index cb18db7db6f..13061814a2f 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png new file mode 100644 index 00000000000..1a4beb85801 Binary files /dev/null and b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png index 5626e665bc1..5cc8272623c 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png and b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png new file mode 100644 index 00000000000..30bd92228d8 Binary files /dev/null and b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png deleted file mode 100755 index 4e71c21d492..00000000000 Binary files a/uitest/reference-screenshots/chrome/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png new file mode 100644 index 00000000000..7890264eab6 Binary files /dev/null and b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-End.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png new file mode 100644 index 00000000000..aec7bb9b59d Binary files /dev/null and b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled-Middle.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png index aefae890da7..73e61502f4e 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png and b/uitest/reference-screenshots/chrome/HLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png index e7add3a4335..9d99e0b2e37 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png index dff4d574b56..562eb6e2699 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png index 88f7d1b7d90..efe19ea55fd 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png and b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png index d6b9c512198..e02e28f3092 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png index e6dacf66643..2f34a2b88b0 100755 Binary files a/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/HLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png b/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png new file mode 100644 index 00000000000..841d2e1eadb Binary files /dev/null and b/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment-scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png b/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png index 609d847c61d..f4793e0f70c 100755 Binary files a/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png and b/uitest/reference-screenshots/chrome/VAlignmentTest-layoutAlignment_ANY_Chrome__alignment.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png index ec1539923d7..8ab31b71aa1 100755 Binary files a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png new file mode 100644 index 00000000000..8ab31b71aa1 Binary files /dev/null and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png index 9c4c671cd49..8483cc42828 100755 Binary files a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png index 148ee8a48d2..9ad4c64cd7b 100755 Binary files a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize350px.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png index be6e9e9cd80..fa317dc8f46 100755 Binary files a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png index 8adb1bc17e0..85dfedf6f9e 100755 Binary files a/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/VComponentSizingTest-ComponentSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/chrome/VIconTest-LayoutIcon_ANY_Chrome__icon.png b/uitest/reference-screenshots/chrome/VIconTest-LayoutIcon_ANY_Chrome__icon.png index ce677cbdf14..c35aa48a91b 100755 Binary files a/uitest/reference-screenshots/chrome/VIconTest-LayoutIcon_ANY_Chrome__icon.png and b/uitest/reference-screenshots/chrome/VIconTest-LayoutIcon_ANY_Chrome__icon.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png index 4270e4405f3..1a7a61ebe97 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png and b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_100_0.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png index a0527348289..1ba9c22b977 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png and b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_25_75.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png index b57263b3e2b..894c926f2a1 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png and b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__expand_50_50.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png index fdfb51a1c84..e153773bb31 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/VLayoutExpandTest-LayoutExpand_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png index 391202dc57d..a990cf08e42 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png new file mode 100644 index 00000000000..df7882e33f9 Binary files /dev/null and b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOffSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png index 91c1a7dfe39..ba76ccd6754 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png and b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOff.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png new file mode 100644 index 00000000000..9e785ecb985 Binary files /dev/null and b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnSpaceOn.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png b/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png deleted file mode 100755 index d84c300f00e..00000000000 Binary files a/uitest/reference-screenshots/chrome/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Chrome__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png b/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png new file mode 100644 index 00000000000..f6759bcc102 Binary files /dev/null and b/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError-Scrolled.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png b/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png index 35609948b83..9a8b8d2a4fd 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png and b/uitest/reference-screenshots/chrome/VLayoutRegErrorTest-LayoutRegError_ANY_Chrome__RegError.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png index ec1539923d7..02e9ad22c8d 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png and b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__initial.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png index 9c4c671cd49..14fc7213167 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png and b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize100Percent.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png index 148ee8a48d2..4c512558d7c 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png and b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize350px.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png index be6e9e9cd80..8b7f4d22378 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png and b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize75Percent.png differ diff --git a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png index 8adb1bc17e0..81739b964f5 100755 Binary files a/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png and b/uitest/reference-screenshots/chrome/VLayoutSizingTest-LayoutSizing_ANY_Chrome__setSize_-1px.png differ diff --git a/uitest/reference-screenshots/firefox/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png b/uitest/reference-screenshots/firefox/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png deleted file mode 100644 index 8cdc0f99b7b..00000000000 Binary files a/uitest/reference-screenshots/firefox/GridLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/firefox/GridLayoutSizingTest-LayoutSizing_ANY_Firefox__setSize350px.png b/uitest/reference-screenshots/firefox/GridLayoutSizingTest-LayoutSizing_ANY_Firefox__setSize350px.png deleted file mode 100644 index 0df74e69e10..00000000000 Binary files a/uitest/reference-screenshots/firefox/GridLayoutSizingTest-LayoutSizing_ANY_Firefox__setSize350px.png and /dev/null differ diff --git a/uitest/reference-screenshots/firefox/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png b/uitest/reference-screenshots/firefox/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png deleted file mode 100644 index 65b150fc113..00000000000 Binary files a/uitest/reference-screenshots/firefox/HLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/firefox/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png b/uitest/reference-screenshots/firefox/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png deleted file mode 100644 index ed6a00ec75b..00000000000 Binary files a/uitest/reference-screenshots/firefox/VLayoutMarginSpacingTest-LayoutMarginSpacing_ANY_Firefox__marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/internetexplorer/GridLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png b/uitest/reference-screenshots/internetexplorer/GridLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png deleted file mode 100755 index 433a40205bf..00000000000 Binary files a/uitest/reference-screenshots/internetexplorer/GridLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/internetexplorer/GridLayoutSizingTest-LayoutSizing_Windows_InternetExplorer_11_setSize350px.png b/uitest/reference-screenshots/internetexplorer/GridLayoutSizingTest-LayoutSizing_Windows_InternetExplorer_11_setSize350px.png deleted file mode 100755 index 826162a11d9..00000000000 Binary files a/uitest/reference-screenshots/internetexplorer/GridLayoutSizingTest-LayoutSizing_Windows_InternetExplorer_11_setSize350px.png and /dev/null differ diff --git a/uitest/reference-screenshots/internetexplorer/HLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png b/uitest/reference-screenshots/internetexplorer/HLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png deleted file mode 100755 index b14f852e3f7..00000000000 Binary files a/uitest/reference-screenshots/internetexplorer/HLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/internetexplorer/VLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png b/uitest/reference-screenshots/internetexplorer/VLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png deleted file mode 100755 index 5306cd7837b..00000000000 Binary files a/uitest/reference-screenshots/internetexplorer/VLayoutMarginSpacingTest-LayoutMarginSpacing_Windows_InternetExplorer_11_marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png deleted file mode 100644 index 4e2c8e96776..00000000000 Binary files a/uitest/reference-screenshots/phantomjs/GridLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png b/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png deleted file mode 100644 index 85e2064e31a..00000000000 Binary files a/uitest/reference-screenshots/phantomjs/GridLayoutSizingTest-LayoutSizing_LINUX_PhantomJS_1_setSize350px.png and /dev/null differ diff --git a/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png deleted file mode 100644 index 3cdd15c551d..00000000000 Binary files a/uitest/reference-screenshots/phantomjs/HLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png and /dev/null differ diff --git a/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png b/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png deleted file mode 100644 index 4f6ba58d5ea..00000000000 Binary files a/uitest/reference-screenshots/phantomjs/VLayoutMarginSpacingTest-LayoutMarginSpacing_LINUX_PhantomJS_1_marginOnfSpaceOn.png and /dev/null differ 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 20cb15240e4..fb6c28c3522 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 @@ -31,7 +31,7 @@ private void buildLayout() { } layout.setMargin(false); layout.setSpacing(false); - 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 637019c61f9..fa5aee05448 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 @@ -42,8 +42,6 @@ public ExpandButton(final AbstractComponent c1, } 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 b122d48fe3c..2331be46fe8 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 @@ -26,8 +26,6 @@ protected void setup(VaadinRequest request) { 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 7ae05f343a0..cb08992bf40 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 @@ -28,10 +28,11 @@ public abstract class BaseLayoutTestUI extends AbstractReindeerTestUI { 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 = { 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 = { "", "VeryLongOneWordCaption", "Very long caption of 50 approximately symbols aaaaaaaaaaaa aaaaaa aaa " }; @@ -74,7 +75,8 @@ protected void init() { 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; } @@ -91,9 +93,7 @@ protected void getLayoutForLayoutSizing(final String compType) { l2.setMargin(false); final AbstractComponent c1 = getTestTable(); - c1.setSizeFull(); final AbstractComponent c2 = getTestTable(); - c2.setSizeFull(); class SetSizeButton extends Button { SetSizeButton(final String size) { @@ -106,6 +106,7 @@ class SetSizeButton extends Button { } else if (compType == "component") { c2.setHeight(size); c2.setWidth(size); + c2.setCaption("Configured width"); } }); } @@ -135,11 +136,13 @@ class SetSizeButton extends Button { newLabel.setSizeUndefined(); l2.addComponent(newLabel); }); + 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); @@ -207,6 +210,12 @@ protected AbstractLayout createLabelsFields( protected void setup(VaadinRequest request) { mainLayout.setMargin(false); mainLayout.setSpacing(false); + mainLayout.setSizeUndefined(); + getLayout().setSizeUndefined(); + if (getLayout().getParent() instanceof VerticalLayout) { + ((VerticalLayout) getLayout().getParent()).setSizeUndefined(); + } + mainLayout.addComponent(l1); mainLayout.addComponent(l2); addComponent(mainLayout); @@ -226,8 +235,8 @@ protected void setLayoutMeasures(AbstractOrderedLayout l1, 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 c6da40e8783..ea108c8d374 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 @@ -8,6 +8,7 @@ public class GridAlignment extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { buildLayout(); super.setup(request); + layout.setSizeFull(); } /** @@ -16,8 +17,6 @@ protected void setup(VaadinRequest request) { 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 d808b99bdcd..7c5b223d158 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 @@ -21,8 +21,7 @@ public GridBaseLayoutTestUI() { @Override protected void setup(VaadinRequest request) { - layout.setMargin(true); - layout.setSizeFull(); + layout.setSizeUndefined(); getUI().setContent(layout); } @@ -33,9 +32,7 @@ protected void getLayoutForLayoutSizing(final String compType) { layout.setMargin(false); final AbstractComponent c1 = getTestTable(); - c1.setSizeFull(); final AbstractComponent c2 = getTestTable(); - c2.setSizeFull(); class SetSizeButton extends Button { SetSizeButton(final String size) { @@ -48,11 +45,12 @@ class SetSizeButton extends Button { } else if (compType == "component") { c2.setHeight(size); c2.setWidth(size); + c2.setCaption("Configured width"); } }); } } - 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%"); @@ -74,5 +72,6 @@ class SetSizeButton extends Button { newLabel.setSizeUndefined(); 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 403fc30305a..5b91b78b514 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 @@ -8,5 +8,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 e9525740475..be9e36e96c7 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 @@ -1,6 +1,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.Label; import com.vaadin.ui.Link; @@ -19,4 +20,13 @@ protected void setup(VaadinRequest request) { 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 8578e9f9581..bb5be728d65 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 @@ -10,6 +10,7 @@ public class GridLayoutExpand extends GridBaseLayoutTestUI { protected void setup(VaadinRequest request) { buildLayout(); super.setup(request); + layout.setSizeFull(); } private void buildLayout() { @@ -27,8 +28,6 @@ public ExpandButton(final int i1, final int i2, final float e1, } 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 1e220cbd69b..1b15b435bfa 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 @@ -17,8 +17,8 @@ protected void setup(VaadinRequest request) { 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(event -> { 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 dcd5c633108..27c82984a29 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 @@ -2,6 +2,7 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.TestDateField; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; @@ -31,4 +32,10 @@ private void buildLayout() { 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 6074cdae525..671fdf11634 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 @@ -1,6 +1,12 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; +import com.vaadin.shared.ui.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; public class GridLayoutSizing extends GridBaseLayoutTestUI { @@ -8,5 +14,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( + "
", + 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 2a20a751b65..4e666c7ba56 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.HLayout; import com.vaadin.tests.layouts.layouttester.BaseAddReplaceMove; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; public class HAddReplaceMove extends BaseAddReplaceMove { @@ -12,4 +13,10 @@ public HAddReplaceMove() { 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 6becfc75c58..156d5f21f3b 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 @@ -1,6 +1,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 { @@ -9,4 +10,10 @@ public HAlignment() { 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 1c020026313..f107d8c4fcf 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 @@ -1,11 +1,36 @@ package com.vaadin.tests.layouts.layouttester.HLayout; +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; public class HComponentSizing extends BaseComponentSizing { public HComponentSizing() { super(HorizontalLayout.class); } + + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator 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 772cda2035b..9f45c8bbf74 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.HLayout; import com.vaadin.tests.layouts.layouttester.BaseIcon; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; public class HIcon extends BaseIcon { @@ -9,4 +10,10 @@ public HIcon() { 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 760f2d7497d..6789650c70c 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 @@ -1,7 +1,14 @@ package com.vaadin.tests.layouts.layouttester.HLayout; +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.v7.ui.Table; public class HLayoutMarginSpacing extends BaseLayoutForSpacingMargin { @@ -9,4 +16,24 @@ public HLayoutMarginSpacing() { super(HorizontalLayout.class); } + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator 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 f78d1d4d6cb..e5fda46012f 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.HLayout; import com.vaadin.tests.layouts.layouttester.BaseRegError; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.HorizontalLayout; public class HLayoutRegError extends BaseRegError { @@ -8,4 +9,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 37c5e9d9e67..2f9cb290410 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 @@ -1,11 +1,43 @@ package com.vaadin.tests.layouts.layouttester.HLayout; -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.VerticalLayout; -public class HLayoutSizing extends BaseComponentSizing { +public class HLayoutSizing extends BaseLayoutSizing { public HLayoutSizing() { super(HorizontalLayout.class); } + + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator 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 3e020b52da0..7b512d5b52d 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 @@ -1,10 +1,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 2eb3616623b..2fef294c2b4 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; public class VComponentSizing extends BaseComponentSizing { @@ -9,4 +10,13 @@ public VComponentSizing() { 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 1fa159a2bec..4e9e215abc9 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseIcon; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; public class VIcon extends BaseIcon { @@ -9,4 +10,13 @@ public VIcon() { 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 87598cd96c0..4eeec256be4 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 @@ -1,7 +1,14 @@ package com.vaadin.tests.layouts.layouttester.VLayout; +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.VerticalLayout; +import com.vaadin.v7.ui.Table; public class VLayoutMarginSpacing extends BaseLayoutForSpacingMargin { @@ -9,4 +16,25 @@ public VLayoutMarginSpacing() { super(VerticalLayout.class); } + @Override + protected void setup(VaadinRequest request) { + super.setup(request); + Iterator 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 cc64105e857..8990724b453 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 @@ -1,6 +1,7 @@ package com.vaadin.tests.layouts.layouttester.VLayout; import com.vaadin.tests.layouts.layouttester.BaseRegError; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; public class VLayoutRegError extends BaseRegError { @@ -8,4 +9,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 d6d91700c75..3e3f0468829 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 @@ -1,12 +1,21 @@ package com.vaadin.tests.layouts.layouttester.VLayout; -import com.vaadin.tests.layouts.layouttester.BaseComponentSizing; +import com.vaadin.tests.layouts.layouttester.BaseLayoutSizing; +import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.VerticalLayout; -public class VLayoutSizing extends BaseComponentSizing { +public class VLayoutSizing extends BaseLayoutSizing { public VLayoutSizing() { 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 3b369a50266..e5aa82ec446 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 void LayoutMarginSpacing() throws IOException, InterruptedException { 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 void LayoutMarginSpacing() throws IOException, InterruptedException { spaceBtn.click(); sleep(1000); compareScreen(states[1]); + marginBtn.click(); + sleep(1000); + compareScreen(states[2]); } } 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 32d32e0aec8..507bead9618 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 @@ -9,13 +9,14 @@ import com.vaadin.tests.tb3.MultiBrowserTest; 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 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 95e4d74e8eb..2032694c198 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,7 +1,30 @@ 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; 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 checkBoxes = $(CheckBoxElement.class).all(); + assertEquals(3, checkBoxes.size()); + CheckBoxElement lastCheckBox = checkBoxes.get(2); + + new Actions(driver).moveToElement(lastCheckBox).build().perform(); + + compareScreen("RegError-Scrolled"); + } } 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 f91f265913f..b94f00ddb89 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,7 +1,14 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; +import java.io.IOException; + import com.vaadin.tests.layouts.layouttester.BaseLayoutSizingTest; public class GridLayoutSizingTest extends BaseLayoutSizingTest { + @Override + public void LayoutSizing() throws IOException, InterruptedException { + states[0] = "setSize600px"; + super.LayoutSizing(); + } } 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 776c0c8ae94..eb0e05b9ec0 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 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 8183746103d..fdd54c0fe0e 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 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 48184a0591d..d8ab553b7ee 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 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 cabb6c3a4b9..16925e6339f 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 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 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 02e12221d47..eac1dbe31b2 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,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.CheckBoxElement; import com.vaadin.tests.layouts.layouttester.BaseLayoutRegErrorTest; 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 checkBoxes = $(CheckBoxElement.class).all(); + assertEquals(3, checkBoxes.size()); + CheckBoxElement lastCheckBox = checkBoxes.get(2); + + new Actions(driver).moveToElement(lastCheckBox).build().perform(); + + compareScreen("RegError-Scrolled"); + } }