1493461 - consolidate main TB window size in mozmill tests

Status: RESOLVED FIXED

(Thunderbird :: Testing Infrastructure, enhancement)

Description

[:aceman]

In bug 1387704 we identified that some TB mozmill tests resize the main app window and hard-code the dimensions at some places. Let's consolidate that into some global constants and helper functions so that mistakes do not happen.

Comment 1

[:aceman]

Attachment: 1493461.patch

This could do it.
It appears at one spot we were resizing the window to a non-integer width so I added the Math.round, so the requested width matches what we read back.

Some of the sleep(0)s are removed as resize_to() already contains the sleep(0). The same with wait_for_resize().

Try run:
https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=516d2a1ab508ba4609ef3b1227505cf4636c8dc4

Comment 2

[:aceman]

Attachment: 1493461.patch v1.1

I forgot to simplify 2 places.

Comment 3

[Jorg K (CEST = GMT+2)]

This conflicts with changes from bug 1493513.

Comment 4

[Jorg K (CEST = GMT+2)]

Comment on attachment 9011269 [details] [diff] [review]
1493461.patch v1.1

Review of attachment 9011269 [details] [diff] [review]:
-----------------------------------------------------------------

r+ with comments ;-)

::: mail/test/mozmill/message-header/test-message-header.js
@@ +888,5 @@
>      let toolbar = mc.e("header-view-toolbar");
>      let mode = toolbar.getAttribute("mode");
>  
>      // Get really big, so that we can figure out how big we actually want to be.
> +    resize_to(1200, gDefaultWindowHeight, mc);

gDefaultWindowHeight=768, the test had 600. That's intentional, yes? Does the height matter?

@@ +904,5 @@
>      toolbar.setAttribute("mode", mode);
>  
>      // And resize to half way between the big and small widths, so that we
>      //  can toggle the mode to force the overflow.
> +    resize_to(Math.round((bigWidth + smallWidth) / 2), gDefaultWindowHeight, mc);

and here

@@ +925,5 @@
>      if (expandedHeadersTopBox.clientHeight != tallHeight)
>        throw new Error("The header box should have returned to its original size!");
>  
>      // And make our window big to achieve the same effect as the just icons mode.
> +    resize_to(1200, gDefaultWindowHeight, mc);

and here and many times more below.

::: mail/test/mozmill/quick-filter-bar/test-display-issues.js
@@ +66,5 @@
>                   "Collapsy bar width:", qfbCollapsy.clientWidth,
>                   "shrunk?", qfbCollapsy.getAttribute("shrink")]);
>    }
>  
>    function assertCollapsed(width) {

Remove parameter since you removed it from the calls?

@@ +74,5 @@
>        throw new Error("The collapsy bar should be shrunk!");
>      if (qfbExemplarLabel.clientWidth != 0)
>        throw new Error("The exemplar label should be collapsed!");
>    }
>    function assertExpanded(width) {

and here?

::: mail/test/mozmill/shared-modules/test-window-helpers.js
@@ +816,5 @@
> + * @param aWidth       the requested window width
> + * @param aHeight      the requested window height
> + * @param aController  window controller
> + */
> +function resize_to(aWidth, aHeight, aController) {

Having the controller last seems awkward. Should be first, no?

Comment 5

[:aceman]

(In reply to Jorg K (GMT+2) from comment #4)
> ::: mail/test/mozmill/message-header/test-message-header.js
> gDefaultWindowHeight=768, the test had 600. That's intentional, yes? Does
> the height matter?

I think it doesn't.
 
> ::: mail/test/mozmill/quick-filter-bar/test-display-issues.js
> @@ +66,5 @@
> >                   "Collapsy bar width:", qfbCollapsy.clientWidth,
> >                   "shrunk?", qfbCollapsy.getAttribute("shrink")]);
> >    }
> >  
> >    function assertCollapsed(width) {
> 
> Remove parameter since you removed it from the calls?

Yes, thanks.
 
> ::: mail/test/mozmill/shared-modules/test-window-helpers.js
> > +function resize_to(aWidth, aHeight, aController) {
> 
> Having the controller last seems awkward. Should be first, no?

OK, no problem.

Comment 6

[:aceman]

Attachment: 1493461.patch v1.2

Thanks.

Comment 7

[:aceman]

https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=71e4de3ab519095077fb40b2b1cec6e4801ae5cd

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/comm-central/rev/1b38cacc09e5
consolidate main TB window size handling in MozMill tests. r=jorgk