tests: Convert all testcases to use the new launch_with_config API

[i3/i3] / testcases / t / 70-force_focus_wrapping.t

diff --git a/testcases/t/70-force_focus_wrapping.t b/testcases/t/70-force_focus_wrapping.t
index 020a36030c70fc732e800daa784a62888cb625a6..8a990f23e96dc649880f306de312a2438aaf1f80 100644 (file)
--- a/testcases/t/70-force_focus_wrapping.t
+++ b/testcases/t/70-force_focus_wrapping.t
@@ -5,49 +5,33 @@
 # Tests if the 'force_focus_wrapping' config directive works correctly.
 #
 use i3test;
-use Cwd qw(abs_path);
-use Proc::Background;
-use File::Temp qw(tempfile tempdir);
 use X11::XCB qw(:all);
 use X11::XCB::Connection;
 
 my $x = X11::XCB::Connection->new;
 
-# assuming we are run by complete-run.pl
-my $i3_path = abs_path("../i3");
-my $socketpath = File::Temp::tempnam('/tmp', 'i3-test-socket-');
-
 #####################################################################
 # 1: test the wrapping behaviour without force_focus_wrapping
 #####################################################################
 
-my ($fh, $tmpfile) = tempfile();
-say $fh "# i3 config file (v4)";
-say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
-say $fh "ipc-socket $socketpath";
-close($fh);
-
-diag("Starting i3");
-my $i3cmd = "exec " . abs_path("../i3") . " -V -d all --disable-signalhandler -c $tmpfile >/dev/null 2>/dev/null";
-my $process = Proc::Background->new($i3cmd);
-sleep 1;
+my $config = <<EOT;
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+EOT
 
-# force update of the cached socket path in lib/i3test
-get_socket_path(0);
-
-diag("pid = " . $process->pid);
+my $pid = launch_with_config($config);
 
 my $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-my $first = open_standard_window($x);
-my $second = open_standard_window($x);
+my $first = open_window($x);
+my $second = open_window($x);
 
 cmd 'layout tabbed';
 cmd 'focus parent';
 
-my $third = open_standard_window($x);
+my $third = open_window($x);
 is($x->input_focus, $third->id, 'third window focused');
 
 cmd 'focus left';
@@ -64,40 +48,34 @@ is($x->input_focus, $second->id, 'second window focused');
 cmd 'focus right';
 is($x->input_focus, $third->id, 'third window focused');
 
-exit_gracefully($process->pid);
+exit_gracefully($pid);
 
 #####################################################################
 # 2: test the wrapping behaviour with force_focus_wrapping
 #####################################################################
 
-($fh, $tmpfile) = tempfile();
-say $fh "# i3 config file (v4)";
-say $fh "font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1";
-say $fh "ipc-socket $socketpath";
-say $fh "force_focus_wrapping true";
-close($fh);
-
-diag("Starting i3");
-$i3cmd = "exec " . abs_path("../i3") . " -V -d all --disable-signalhandler -c $tmpfile >/dev/null 2>/dev/null";
-$process = Proc::Background->new($i3cmd);
-sleep 1;
+$config = <<EOT;
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+force_focus_wrapping true
+EOT
 
-# force update of the cached socket path in lib/i3test
-get_socket_path(0);
-
-diag("pid = " . $process->pid);
+$pid = launch_with_config($config);
 
 $tmp = fresh_workspace;
 
 ok(@{get_ws_content($tmp)} == 0, 'no containers yet');
 
-$first = open_standard_window($x);
-$second = open_standard_window($x);
+$first = open_window($x);
+$second = open_window($x);
 
 cmd 'layout tabbed';
 cmd 'focus parent';
 
-$third = open_standard_window($x);
+$third = open_window($x);
+
+sync_with_i3($x);
+
 is($x->input_focus, $third->id, 'third window focused');
 
 cmd 'focus left';
@@ -114,6 +92,6 @@ is($x->input_focus, $second->id, 'second window focused');
 cmd 'focus right';
 is($x->input_focus, $first->id, 'first window focused');
 
-exit_gracefully($process->pid);
+exit_gracefully($pid);
 
 done_testing;