floating-unmap.t: switch order, don’t use workaround

diff --git a/testcases/t/36-floating-unmap.t b/testcases/t/36-floating-unmap.t
deleted file mode 100644 (file)
index 9d122fa..0000000
--- a/testcases/t/36-floating-unmap.t
+++ /dev/null
@@ -1,64 +0,0 @@
-#!perl
-# vim:ts=4:sw=4:expandtab
-# Regression test: Floating windows were not correctly unmapped when switching
-# to a different workspace.
-
-use i3test tests => 5;
-use X11::XCB qw(:all);
-use Time::HiRes qw(sleep);
-
-BEGIN {
-    use_ok('X11::XCB::Window');
-}
-
-my $i3 = i3("/tmp/nestedcons");
-
-my $tmp = get_unused_workspace();
-$i3->command("workspace $tmp")->recv;
-
-#############################################################################
-# 1: open a floating window, get it mapped
-#############################################################################
-
-my $x = X11::XCB::Connection->new;
-
-# FIXME: we open a tiling container as long as t/37* is not done (should swap positions with t/36* then)
-my $twindow = $x->root->create_child(
-    class => WINDOW_CLASS_INPUT_OUTPUT,
-    rect => [ 0, 0, 30, 30],
-    background_color => '#C0C0C0',
-);
-
-isa_ok($twindow, 'X11::XCB::Window');
-
-$twindow->map;
-
-sleep 0.25;
-
-# Create a floating window which is smaller than the minimum enforced size of i3
-my $window = $x->root->create_child(
-    class => WINDOW_CLASS_INPUT_OUTPUT,
-    rect => [ 0, 0, 30, 30],
-    background_color => '#C0C0C0',
-    # replace the type with 'utility' as soon as the coercion works again in X11::XCB
-    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
-);
-
-isa_ok($window, 'X11::XCB::Window');
-
-$window->map;
-
-sleep 0.25;
-
-ok($window->mapped, 'Window is mapped');
-
-# switch to a different workspace, see if the window is still mapped?
-
-my $otmp = get_unused_workspace();
-$i3->command("workspace $otmp")->recv;
-
-sleep 0.25;
-
-ok(!$window->mapped, 'Window is not mapped after switching ws');
-
-$i3->command("nop testcase done")->recv;

diff --git a/testcases/t/37-floating-unmap.t b/testcases/t/37-floating-unmap.t
new file mode 100644 (file)
index 0000000..8fc7c4c
--- /dev/null
+++ b/testcases/t/37-floating-unmap.t
@@ -0,0 +1,51 @@
+#!perl
+# vim:ts=4:sw=4:expandtab
+# Regression test: Floating windows were not correctly unmapped when switching
+# to a different workspace.
+
+use i3test tests => 4;
+use X11::XCB qw(:all);
+use Time::HiRes qw(sleep);
+
+BEGIN {
+    use_ok('X11::XCB::Window');
+}
+
+my $i3 = i3("/tmp/nestedcons");
+
+my $tmp = get_unused_workspace();
+$i3->command("workspace $tmp")->recv;
+
+#############################################################################
+# 1: open a floating window, get it mapped
+#############################################################################
+
+my $x = X11::XCB::Connection->new;
+
+# Create a floating window which is smaller than the minimum enforced size of i3
+my $window = $x->root->create_child(
+    class => WINDOW_CLASS_INPUT_OUTPUT,
+    rect => [ 0, 0, 30, 30],
+    background_color => '#C0C0C0',
+    # replace the type with 'utility' as soon as the coercion works again in X11::XCB
+    window_type => $x->atom(name => '_NET_WM_WINDOW_TYPE_UTILITY'),
+);
+
+isa_ok($window, 'X11::XCB::Window');
+
+$window->map;
+
+sleep 0.25;
+
+ok($window->mapped, 'Window is mapped');
+
+# switch to a different workspace, see if the window is still mapped?
+
+my $otmp = get_unused_workspace();
+$i3->command("workspace $otmp")->recv;
+
+sleep 0.25;
+
+ok(!$window->mapped, 'Window is not mapped after switching ws');
+
+$i3->command("nop testcase done")->recv;