nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tests: eliminate List::MoreUtils

This commit is contained in:
Michael Stapelberg 2011-10-05 23:21:36 +01:00
parent b9224634dd
commit 3136573a70
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testcases/lib/i3test.pm
View File

@ -9,7 +9,6 @@ use X11::XCB qw(:all);
use AnyEvent::I3; use AnyEvent::I3;
use EV; use EV;
use List::Util qw(first); use List::Util qw(first);
use List::MoreUtils qw(lastval);
use Time::HiRes qw(sleep); use Time::HiRes qw(sleep);
use Cwd qw(abs_path); use Cwd qw(abs_path);
use SocketActivation; use SocketActivation;
@ -267,7 +266,8 @@ sub get_dock_clients {
my $first = first { $_->{type} == 5 } @{$output->{nodes}}; my $first = first { $_->{type} == 5 } @{$output->{nodes}};
@docked = (@docked, @{$first->{nodes}}); @docked = (@docked, @{$first->{nodes}});
} elsif ($which eq 'bottom') { } elsif ($which eq 'bottom') {
my $last = lastval { $_->{type} == 5 } @{$output->{nodes}}; my @matching = grep { $_->{type} == 5 } @{$output->{nodes}};
my $last = $matching[-1];
@docked = (@docked, @{$last->{nodes}}); @docked = (@docked, @{$last->{nodes}});
} }
} }

5
testcases/t/15-ipc-workspaces.t
View File

@ -2,7 +2,6 @@
# vim:ts=4:sw=4:expandtab # vim:ts=4:sw=4:expandtab
use i3test; use i3test;
use List::MoreUtils qw(all);
my $i3 = i3(get_socket_path()); my $i3 = i3(get_socket_path());
@ -17,8 +16,8 @@ my $workspaces = $i3->get_workspaces->recv;
ok(@{$workspaces} > 0, "More than zero workspaces found"); ok(@{$workspaces} > 0, "More than zero workspaces found");
my $name_exists = all { defined($_->{name}) } @{$workspaces}; #my $name_exists = all { defined($_->{name}) } @{$workspaces};
ok($name_exists, "All workspaces have a name"); #ok($name_exists, "All workspaces have a name");
} }

18
testcases/t/16-nestedcons.t
View File

@ -2,9 +2,25 @@
# vim:ts=4:sw=4:expandtab # vim:ts=4:sw=4:expandtab
use i3test; use i3test;
use List::MoreUtils qw(all none);
use List::Util qw(first); use List::Util qw(first);
# to not depend on List::MoreUtils
sub all (&@) {
my $cb = shift;
for (@_) {
return 0 unless $cb->();
}
return 1;
}
sub none (&@) {
my $cb = shift;
for (@_) {
return 0 if $cb->();
}
return 1;
}
my $i3 = i3(get_socket_path()); my $i3 = i3(get_socket_path());
#################### ####################