t/141-resize.t: do not compare float values directly. use i3test.pm::cmp_float which compares using precision of 1e-6.

This commit is contained in:
Pavel Löbl 2012-05-05 17:28:42 +02:00 committed by Michael Stapelberg
parent 6bbcddab29
commit 8557b05a2c
2 changed files with 31 additions and 22 deletions

View File

@ -33,6 +33,7 @@ our @EXPORT = qw(
open_floating_window open_floating_window
get_dock_clients get_dock_clients
cmd cmd
cmp_float
sync_with_i3 sync_with_i3
does_i3_live does_i3_live
exit_gracefully exit_gracefully
@ -563,6 +564,14 @@ sub launch_with_config {
return $i3_pid; return $i3_pid;
} }
# compares two floats and return true if they differ less
# then 1e-6
sub cmp_float {
my ($a, $b) = @_;
return abs($a - $b) < 1e-6;
}
package i3test::X11; package i3test::X11;
use parent 'X11::XCB::Connection'; use parent 'X11::XCB::Connection';

View File

@ -22,8 +22,8 @@ cmd 'resize grow up 10 px or 25 ppt';
my ($nodes, $focus) = get_ws_content($tmp); my ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.25, 'top window got only 25%'); ok(cmp_float($nodes->[0]->{percent}, 0.25), 'top window got only 25%');
is($nodes->[1]->{percent}, 0.75, 'bottom window got 75%'); ok(cmp_float($nodes->[1]->{percent}, 0.75), 'bottom window got 75%');
############################################################ ############################################################
@ -34,8 +34,8 @@ cmd 'split h';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.25, 'top window got only 25%'); ok(cmp_float($nodes->[0]->{percent}, 0.25), 'top window got only 25%');
is($nodes->[1]->{percent}, 0.75, 'bottom window got 75%'); ok(cmp_float($nodes->[1]->{percent}, 0.75), 'bottom window got 75%');
############################################################ ############################################################
# checks that resizing within stacked/tabbed cons works # checks that resizing within stacked/tabbed cons works
@ -52,14 +52,14 @@ cmd 'split h';
cmd 'layout stacked'; cmd 'layout stacked';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.5, 'top window got 50%'); ok(cmp_float($nodes->[0]->{percent}, 0.5), 'top window got 50%');
is($nodes->[1]->{percent}, 0.5, 'bottom window got 50%'); ok(cmp_float($nodes->[1]->{percent}, 0.5), 'bottom window got 50%');
cmd 'resize grow up 10 px or 25 ppt'; cmd 'resize grow up 10 px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.25, 'top window got 25%'); ok(cmp_float($nodes->[0]->{percent}, 0.25), 'top window got 25%');
is($nodes->[1]->{percent}, 0.75, 'bottom window got 75%'); ok(cmp_float($nodes->[1]->{percent}, 0.75), 'bottom window got 75%');
############################################################ ############################################################
# Checks that resizing in the parent's parent's orientation works. # Checks that resizing in the parent's parent's orientation works.
@ -79,14 +79,14 @@ $top = open_window;
$bottom = open_window; $bottom = open_window;
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.5, 'left window got 50%'); ok(cmp_float($nodes->[0]->{percent}, 0.5), 'left window got 50%');
is($nodes->[1]->{percent}, 0.5, 'right window got 50%'); ok(cmp_float($nodes->[1]->{percent}, 0.5), 'right window got 50%');
cmd 'resize grow left 10 px or 25 ppt'; cmd 'resize grow left 10 px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.25, 'left window got 25%'); ok(cmp_float($nodes->[0]->{percent}, 0.25), 'left window got 25%');
is($nodes->[1]->{percent}, 0.75, 'right window got 75%'); ok(cmp_float($nodes->[1]->{percent}, 0.75), 'right window got 75%');
################################################################################ ################################################################################
# Check that the resize grow/shrink width/height syntax works. # Check that the resize grow/shrink width/height syntax works.
@ -101,8 +101,8 @@ $right = open_window;
cmd 'resize grow width 10 px or 25 ppt'; cmd 'resize grow width 10 px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.25, 'left window got 25%'); ok(cmp_float($nodes->[0]->{percent}, 0.25), 'left window got 25%');
is($nodes->[1]->{percent}, 0.75, 'right window got 75%'); ok(cmp_float($nodes->[1]->{percent}, 0.75), 'right window got 75%');
# Now test it with four windows # Now test it with four windows
$tmp = fresh_workspace; $tmp = fresh_workspace;
@ -112,19 +112,19 @@ open_window for (1..4);
cmd 'resize grow width 10 px or 25 ppt'; cmd 'resize grow width 10 px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.166666666666667, 'first window got 16%'); ok(cmp_float($nodes->[0]->{percent}, 0.166666666666667), 'first window got 16%');
is($nodes->[1]->{percent}, 0.166666666666667, 'second window got 16%'); ok(cmp_float($nodes->[1]->{percent}, 0.166666666666667), 'second window got 16%');
is($nodes->[2]->{percent}, 0.166666666666667, 'third window got 16%'); ok(cmp_float($nodes->[2]->{percent}, 0.166666666666667), 'third window got 16%');
is($nodes->[3]->{percent}, 0.50, 'fourth window got 50%'); ok(cmp_float($nodes->[3]->{percent}, 0.50), 'fourth window got 50%');
# height should be a no-op in this situation # height should be a no-op in this situation
cmd 'resize grow height 10 px or 25 ppt'; cmd 'resize grow height 10 px or 25 ppt';
($nodes, $focus) = get_ws_content($tmp); ($nodes, $focus) = get_ws_content($tmp);
is($nodes->[0]->{percent}, 0.166666666666667, 'first window got 16%'); ok(cmp_float($nodes->[0]->{percent}, 0.166666666666667), 'first window got 16%');
is($nodes->[1]->{percent}, 0.166666666666667, 'second window got 16%'); ok(cmp_float($nodes->[1]->{percent}, 0.166666666666667), 'second window got 16%');
is($nodes->[2]->{percent}, 0.166666666666667, 'third window got 16%'); ok(cmp_float($nodes->[2]->{percent}, 0.166666666666667), 'third window got 16%');
is($nodes->[3]->{percent}, 0.50, 'fourth window got 50%'); ok(cmp_float($nodes->[3]->{percent}, 0.50), 'fourth window got 50%');
############################################################ ############################################################