Merge branch 'master' into next

[i3/i3] / testcases / t / 139-ws-numbers.t

diff --git a/testcases/t/139-ws-numbers.t b/testcases/t/139-ws-numbers.t
index 31f013efd8cb2646d436f3f5d2e1bf9de13b0371..78b9191a73f278374d8b5a0a50aae230826434d9 100644 (file)
--- a/testcases/t/139-ws-numbers.t
+++ b/testcases/t/139-ws-numbers.t
@@ -3,14 +3,8 @@
 # Check if numbered workspaces and named workspaces are sorted in the right way
 # in get_workspaces IPC output (necessary for i3bar etc.).
 use i3test;
-use X11::XCB qw(:all);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
 
 my $i3 = i3(get_socket_path());
-my $x = X11::XCB::Connection->new;
 
 sub check_order {
     my ($msg) = @_;
@@ -19,7 +13,7 @@ sub check_order {
     my @nums = map { $_->{num} } grep { defined($_->{num}) } @ws;
     my @sorted = sort @nums;
 
-    cmp_deeply(\@nums, \@sorted, $msg);
+    is_deeply(\@nums, \@sorted, $msg);
 }
 
 check_order('workspace order alright before testing');
@@ -30,7 +24,7 @@ check_order('workspace order alright before testing');
 
 cmd "workspace 93";
 
-open_window($x);
+open_window;
 
 my @ws = @{$i3->get_workspaces->recv};
 my @f = grep { defined($_->{num}) && $_->{num} == 93 } @ws;
@@ -38,23 +32,23 @@ is(@f, 1, 'ws 93 found by num');
 check_order('workspace order alright after opening 93');
 
 cmd "workspace 92";
-open_window($x);
+open_window;
 check_order('workspace order alright after opening 92');
 
 cmd "workspace 94";
-open_window($x);
+open_window;
 check_order('workspace order alright after opening 94');
 
 cmd "workspace 96";
-open_window($x);
+open_window;
 check_order('workspace order alright after opening 96');
 
 cmd "workspace foo";
-open_window($x);
+open_window;
 check_order('workspace order alright after opening foo');
 
 cmd "workspace 91";
-open_window($x);
+open_window;
 check_order('workspace order alright after opening 91');
 
 done_testing;