From e992f6e6faa1303bda735af696c0ed810b45dadf Mon Sep 17 00:00:00 2001
From: Jordan Sissel <jls@semicomplete.com>
Date: Thu, 4 Aug 2016 17:56:35 -0700
Subject: [PATCH] Update to use MiniTest instead of the now defunct Test::Unit.

Things pass for me under Ruby 2.2.1
---
 t/test_basic.rb                  | 4 ++--
 t/test_chaining.rb               | 4 ++--
 t/test_cmd_behave_screen_edge.rb | 4 ++--
 t/test_cmd_exec.rb               | 4 ++--
 t/test_cmd_getwindowname.rb      | 4 ++--
 t/test_cmd_getwindowpid.rb       | 4 ++--
 t/test_cmd_key.rb                | 4 ++--
 t/test_cmd_windowfocus.rb        | 4 ++--
 t/test_cmd_windowmap.rb          | 4 ++--
 t/test_cmd_windowminimize.rb     | 4 ++--
 t/test_cmd_windowmove.rb         | 4 ++--
 t/test_cmd_windowsize.rb         | 4 ++--
 t/test_mousemove.rb              | 4 ++--
 t/test_script.rb                 | 4 ++--
 t/test_search.rb                 | 4 ++--
 t/test_typing.rb                 | 4 ++--
 t/test_window.rb                 | 4 ++--
 t/xdo_test_helper.rb             | 4 ++--
 18 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/t/test_basic.rb b/t/test_basic.rb
index 81844ed..04844d6 100644
--- a/t/test_basic.rb
+++ b/t/test_basic.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolBasicTests < Test::Unit::TestCase
+class XdotoolBasicTests < MiniTest::Test
   include XdoTestHelper
 
   def test_noargs_exit_1
diff --git a/t/test_chaining.rb b/t/test_chaining.rb
index 44ea19a..c7579f3 100644
--- a/t/test_chaining.rb
+++ b/t/test_chaining.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolChainingTests < Test::Unit::TestCase
+class XdotoolChainingTests < MiniTest::Test
   include XdoTestHelper
 
   def setup
diff --git a/t/test_cmd_behave_screen_edge.rb b/t/test_cmd_behave_screen_edge.rb
index 5504b31..5159771 100644
--- a/t/test_cmd_behave_screen_edge.rb
+++ b/t/test_cmd_behave_screen_edge.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandBehaveScreenEdgeTests < Test::Unit::TestCase
+class XdotoolCommandBehaveScreenEdgeTests < MiniTest::Test
   include XdoTestHelper
 
   def test_expected_failures
diff --git a/t/test_cmd_exec.rb b/t/test_cmd_exec.rb
index 1b93c14..c6c8f3c 100644
--- a/t/test_cmd_exec.rb
+++ b/t/test_cmd_exec.rb
@@ -2,10 +2,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandExecTests < Test::Unit::TestCase
+class XdotoolCommandExecTests < MiniTest::Test
   include XdoTestHelper
 
   def test_expected_failures
diff --git a/t/test_cmd_getwindowname.rb b/t/test_cmd_getwindowname.rb
index 0e0094b..466539e 100644
--- a/t/test_cmd_getwindowname.rb
+++ b/t/test_cmd_getwindowname.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandGetWindowPidTests < Test::Unit::TestCase
+class XdotoolCommandGetWindowPidTests < MiniTest::Test
   include XdoTestHelper
 
   def assert_is_title(lines)
diff --git a/t/test_cmd_getwindowpid.rb b/t/test_cmd_getwindowpid.rb
index 8451246..bd8a96f 100644
--- a/t/test_cmd_getwindowpid.rb
+++ b/t/test_cmd_getwindowpid.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandGetWindowPidTests < Test::Unit::TestCase
+class XdotoolCommandGetWindowPidTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_cmd_key.rb b/t/test_cmd_key.rb
index 584508f..7f9c4de 100644
--- a/t/test_cmd_key.rb
+++ b/t/test_cmd_key.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandKeyTests < Test::Unit::TestCase
+class XdotoolCommandKeyTests < MiniTest::Test
   include XdoTestHelper
 
   def test_flags
diff --git a/t/test_cmd_windowfocus.rb b/t/test_cmd_windowfocus.rb
index 05e46fc..aa1e099 100644
--- a/t/test_cmd_windowfocus.rb
+++ b/t/test_cmd_windowfocus.rb
@@ -2,10 +2,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandWindowFocusTests < Test::Unit::TestCase
+class XdotoolCommandWindowFocusTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_cmd_windowmap.rb b/t/test_cmd_windowmap.rb
index e58907e..978d6a6 100644
--- a/t/test_cmd_windowmap.rb
+++ b/t/test_cmd_windowmap.rb
@@ -2,10 +2,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandWindowMapTests < Test::Unit::TestCase
+class XdotoolCommandWindowMapTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_cmd_windowminimize.rb b/t/test_cmd_windowminimize.rb
index b8c9512..6d5aa49 100644
--- a/t/test_cmd_windowminimize.rb
+++ b/t/test_cmd_windowminimize.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandWindowMinimizeTests < Test::Unit::TestCase
+class XdotoolCommandWindowMinimizeTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_cmd_windowmove.rb b/t/test_cmd_windowmove.rb
index 51e9d5b..57b5825 100644
--- a/t/test_cmd_windowmove.rb
+++ b/t/test_cmd_windowmove.rb
@@ -2,10 +2,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandWindowMoveTests < Test::Unit::TestCase
+class XdotoolCommandWindowMoveTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_cmd_windowsize.rb b/t/test_cmd_windowsize.rb
index 290b55a..b0b3685 100644
--- a/t/test_cmd_windowsize.rb
+++ b/t/test_cmd_windowsize.rb
@@ -2,10 +2,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolCommandWindowSizeTests < Test::Unit::TestCase
+class XdotoolCommandWindowSizeTests < MiniTest::Test
   include XdoTestHelper
 
   def test_succeeds_with_valid_window
diff --git a/t/test_mousemove.rb b/t/test_mousemove.rb
index d0a849f..922a1a4 100644
--- a/t/test_mousemove.rb
+++ b/t/test_mousemove.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolMouseMoveTests < Test::Unit::TestCase
+class XdotoolMouseMoveTests < MiniTest::Test
   include XdoTestHelper
 
   def test_mousemove_should_have_no_output
diff --git a/t/test_script.rb b/t/test_script.rb
index 6de7438..86e3c59 100644
--- a/t/test_script.rb
+++ b/t/test_script.rb
@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 require "tempfile"
 
-class XdotoolScriptTests < Test::Unit::TestCase
+class XdotoolScriptTests < MiniTest::Test
   include XdoTestHelper
 
   def xdotool_script_ok(commands)
diff --git a/t/test_search.rb b/t/test_search.rb
index 4b9a273..30239f7 100644
--- a/t/test_search.rb
+++ b/t/test_search.rb
@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolSearchTests < Test::Unit::TestCase
+class XdotoolSearchTests < MiniTest::Test
   include XdoTestHelper
 
   def test_search_pid
diff --git a/t/test_typing.rb b/t/test_typing.rb
index 3d28890..7db166e 100644
--- a/t/test_typing.rb
+++ b/t/test_typing.rb
@@ -1,11 +1,11 @@
 #!/usr/bin/env ruby
 #
 
-require "test/unit"
+require "minitest"
 require "tempfile"
 require "./xdo_test_helper"
 
-class XdotoolTypingTests < Test::Unit::TestCase
+class XdotoolTypingTests < MiniTest::Test
   include XdoTestHelper
   SYMBOLS = "`12345678990-=~ !@\#$%^&*()_+[]\{}|;':\",./<>?"
   LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
diff --git a/t/test_window.rb b/t/test_window.rb
index 215353b..4c18a20 100644
--- a/t/test_window.rb
+++ b/t/test_window.rb
@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require "test/unit"
+require "minitest"
 require "./xdo_test_helper"
 
-class XdotoolWindowTests < Test::Unit::TestCase
+class XdotoolWindowTests < MiniTest::Test
   include XdoTestHelper
 
   def setup
diff --git a/t/xdo_test_helper.rb b/t/xdo_test_helper.rb
index 627f46e..0df4345 100644
--- a/t/xdo_test_helper.rb
+++ b/t/xdo_test_helper.rb
@@ -1,4 +1,4 @@
-require "test/unit"
+require "minitest"
 
 module XdoTestHelper
   def setup
@@ -145,7 +145,7 @@ def try(options = {})
     (1 .. times).each do
       begin
         yield
-      rescue Test::Unit::AssertionFailedError => e
+      rescue MiniTest::Unit::AssertionFailedError => e
         $stderr.puts "Retrying..."
         last_exception = e
         sleep(delay)