From 003f7043c5a68e128bfa9d7b938f8c6cf58dc237 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <michael@stapelberg.de>
Date: Wed, 3 Aug 2011 02:12:29 +0200
Subject: [PATCH] t/70-force-focus-wrapping: use launch_with_config

---
 testcases/t/70-force_focus_wrapping.t | 47 +++++++--------------------
 1 file changed, 11 insertions(+), 36 deletions(-)

diff --git a/testcases/t/70-force_focus_wrapping.t b/testcases/t/70-force_focus_wrapping.t
index 020a3603..f2dfc18e 100644
--- a/testcases/t/70-force_focus_wrapping.t
+++ b/testcases/t/70-force_focus_wrapping.t
@@ -5,37 +5,21 @@
 # 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;
-
-# force update of the cached socket path in lib/i3test
-get_socket_path(0);
+my $config = <<EOT;
+# i3 config file (v4)
+font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+EOT
 
-diag("pid = " . $process->pid);
+my $process = launch_with_config($config);
 
 my $tmp = fresh_workspace;
 
@@ -70,22 +54,13 @@ exit_gracefully($process->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;
-
-# force update of the cached socket path in lib/i3test
-get_socket_path(0);
+$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
 
-diag("pid = " . $process->pid);
+$process = launch_with_config($config);
 
 $tmp = fresh_workspace;
 
-- 
2.39.5