tests: lib/i3test: Use //= instead of unless exists $args{key} (Thanks mxf)

[i3/i3] / testcases / t / 32-move-workspace.t

diff --git a/testcases/t/32-move-workspace.t b/testcases/t/32-move-workspace.t
index 7889d5a79ace703d8c1be652768f39cdf98d00c6..3b50e39b9c7582ed21336512b37b01de50a606ec 100644 (file)
--- a/testcases/t/32-move-workspace.t
+++ b/testcases/t/32-move-workspace.t
@@ -3,10 +3,9 @@
 #
 # Checks if the 'move workspace' command works correctly
 #
-use i3test tests => 7;
-use Time::HiRes qw(sleep);
+use i3test;
 
-my $i3 = i3("/tmp/nestedcons");
+my $i3 = i3(get_socket_path());
 
 # We move the pointer out of our way to avoid a bug where the focus will
 # be set to the window under the cursor
@@ -15,31 +14,49 @@ $x->root->warp_pointer(0, 0);
 
 my $tmp = get_unused_workspace();
 my $tmp2 = get_unused_workspace();
-$i3->command("workspace $tmp")->recv;
+cmd "workspace $tmp";
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-$i3->command('open')->recv;
-my ($nodes, $focus) = get_ws_content($tmp);
-my $first = $focus->[0];
-$i3->command('open')->recv;
-($nodes, $focus) = get_ws_content($tmp);
-my $second = $focus->[0];
+my $first = open_empty_con($i3);
+my $second = open_empty_con($i3);
 ok(@{get_ws_content($tmp)} == 2, 'two containers on first ws');
 
-$i3->command("workspace $tmp2")->recv;
+cmd "workspace $tmp2";
 ok(@{get_ws_content($tmp2)} == 0, 'no containers on second ws yet');
 
-$i3->command("workspace $tmp")->recv;
+cmd "workspace $tmp";
 
-$i3->command("move workspace $tmp2")->recv;
+cmd "move workspace $tmp2";
 ok(@{get_ws_content($tmp)} == 1, 'one container on first ws anymore');
 ok(@{get_ws_content($tmp2)} == 1, 'one container on second ws');
-($nodes, $focus) = get_ws_content($tmp2);
+my ($nodes, $focus) = get_ws_content($tmp2);
 
 is($focus->[0], $second, 'same container on different ws');
 
 ($nodes, $focus) = get_ws_content($tmp);
-is($nodes->[0]->{focused}, 1, 'first container focused on first ws');
+ok($nodes->[0]->{focused}, 'first container focused on first ws');
+
+###################################################################
+# check if floating cons are moved to new workspaces properly
+# (that is, if they are floating on the target ws, too)
+###################################################################
+
+$tmp = get_unused_workspace();
+$tmp2 = get_unused_workspace();
+cmd "workspace $tmp";
+
+cmd "open";
+cmd "floating toggle";
+
+my $ws = get_ws($tmp);
+is(@{$ws->{nodes}}, 0, 'no nodes on workspace');
+is(@{$ws->{floating_nodes}}, 1, 'one floating node on workspace');
+
+cmd "move workspace $tmp2";
+
+$ws = get_ws($tmp2);
+is(@{$ws->{nodes}}, 0, 'no nodes on workspace');
+is(@{$ws->{floating_nodes}}, 1, 'one floating node on workspace');
 
-diag( "Testing i3, Perl $], $^X" );
+done_testing;