This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit 05918a586068b05f364558dc277aaef5881a7775
Author: Andrew Stitcher <astitc...@apache.org>
AuthorDate: Fri Aug 4 18:47:07 2023 -0400
PROTON-2760: Minitest is no longer aliased as MiniTest
---
ruby/examples/testme | 10 +++++-----
ruby/tests/test_connection_driver.rb | 2 +-
ruby/tests/test_container.rb | 2 +-
ruby/tests/test_container_sasl.rb | 2 +-
ruby/tests/test_data.rb | 2 +-
ruby/tests/test_delivery.rb | 2 +-
ruby/tests/test_interop.rb | 2 +-
ruby/tests/test_messaging_adapter.rb | 2 +-
ruby/tests/test_old_adapter.rb | 4 ++--
ruby/tests/test_tools.rb | 6 +++---
ruby/tests/test_uri.rb | 2 +-
ruby/tests/test_utils.rb | 2 +-
12 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/ruby/examples/testme b/ruby/examples/testme
index 5c0c59d7f..66f21268c 100755
--- a/ruby/examples/testme
+++ b/ruby/examples/testme
@@ -24,9 +24,9 @@ require 'socket'
require 'rbconfig'
begin
- MiniTest::Test
-rescue NameError # For older versions of MiniTest
- MiniTest::Test = MiniTest::Unit::TestCase
+ Minitest::Test
+rescue NameError # For older versions of Minitest
+ Minitest::Test = Minitest::Unit::TestCase
end
def listening_port(s)
@@ -37,7 +37,7 @@ def listening_url(s)
":#{listening_port s}"
end
-class ExampleTest < MiniTest::Test
+class ExampleTest < Minitest::Test
def run_script(*args)
return IO.popen([ RbConfig.ruby ] + args.map { |a| a.to_s })
@@ -105,6 +105,6 @@ l = $broker.readline
$url = listening_url(l)
# Kill the broker after all tests
-MiniTest.after_run do
+Minitest.after_run do
Process.kill(:TERM, $broker.pid) if $broker
end
diff --git a/ruby/tests/test_connection_driver.rb
b/ruby/tests/test_connection_driver.rb
index 7a6f68ddb..5569ca7e4 100644
--- a/ruby/tests/test_connection_driver.rb
+++ b/ruby/tests/test_connection_driver.rb
@@ -22,7 +22,7 @@ include Qpid::Proton
# Test delivery of raw proton events
-class RawDriverTest < MiniTest::Test
+class RawDriverTest < Minitest::Test
# Raw handler to record all on_xxx calls
class RecordingHandler
diff --git a/ruby/tests/test_container.rb b/ruby/tests/test_container.rb
index 13e1fd570..c95ff13cc 100644
--- a/ruby/tests/test_container.rb
+++ b/ruby/tests/test_container.rb
@@ -29,7 +29,7 @@ class ExceptionMessagingHandler
def on_error(e) raise e; end
end
-class ContainerTest < MiniTest::Test
+class ContainerTest < Minitest::Test
include Qpid::Proton
def test_simple()
diff --git a/ruby/tests/test_container_sasl.rb
b/ruby/tests/test_container_sasl.rb
index 85a32c21e..44a2fbe76 100644
--- a/ruby/tests/test_container_sasl.rb
+++ b/ruby/tests/test_container_sasl.rb
@@ -30,7 +30,7 @@ class TestContainer < Qpid::Proton::Container
attr_reader :listener
end
-class ContainerSASLTest < MiniTest::Test
+class ContainerSASLTest < Minitest::Test
include Qpid::Proton
# Handler for test client/server that sets up server and client SASL options
diff --git a/ruby/tests/test_data.rb b/ruby/tests/test_data.rb
index 727f5962f..76e206bf9 100644
--- a/ruby/tests/test_data.rb
+++ b/ruby/tests/test_data.rb
@@ -20,7 +20,7 @@ require 'test_tools'
require "securerandom"
require 'qpid_proton'
-class TestData < MiniTest::Test
+class TestData < Minitest::Test
include Qpid::Proton
def assert_from_to(*values)
diff --git a/ruby/tests/test_delivery.rb b/ruby/tests/test_delivery.rb
index db505821d..80c374304 100644
--- a/ruby/tests/test_delivery.rb
+++ b/ruby/tests/test_delivery.rb
@@ -22,7 +22,7 @@ require 'test_tools'
include Qpid::Proton
# Test Delivery and Tracker
-class TestDelivery < MiniTest::Test
+class TestDelivery < Minitest::Test
class NoAutoHandler < MessagingHandler
def on_sender_open(l) l.open({:auto_settle=>false, :auto_accept=>false});
end
diff --git a/ruby/tests/test_interop.rb b/ruby/tests/test_interop.rb
index 27cf0739d..58e6b58ff 100755
--- a/ruby/tests/test_interop.rb
+++ b/ruby/tests/test_interop.rb
@@ -12,7 +12,7 @@ if ((RUBY_VERSION.split(".").map {|x| x.to_i} <=> [1, 9]) <
0)
end
end
-class InteropTest < MiniTest::Test
+class InteropTest < Minitest::Test
include Qpid::Proton
def setup
diff --git a/ruby/tests/test_messaging_adapter.rb
b/ruby/tests/test_messaging_adapter.rb
index 70ec0ca1b..974db0269 100644
--- a/ruby/tests/test_messaging_adapter.rb
+++ b/ruby/tests/test_messaging_adapter.rb
@@ -52,7 +52,7 @@ class NoAutoOpenClose < RecordingHandler
attr_reader :connection, :session, :link
end
-class TestMessagingHandler < MiniTest::Test
+class TestMessagingHandler < Minitest::Test
def test_auto_open_close
d = DriverPair.new(RecordingHandler.new, RecordingHandler.new)
diff --git a/ruby/tests/test_old_adapter.rb b/ruby/tests/test_old_adapter.rb
index 5b052e2f6..103efc127 100644
--- a/ruby/tests/test_old_adapter.rb
+++ b/ruby/tests/test_old_adapter.rb
@@ -41,7 +41,7 @@ class AllHandler < OldMessagingHandler
end
# Tests with Mock handler that handles all methods, expect both old and new
calls
-class TestOldHandler < MiniTest::Test
+class TestOldHandler < Minitest::Test
def setup
@h = [AllHandler.new, AllHandler.new]
@ch, @sh = *@h
@@ -161,7 +161,7 @@ class TestOldHandler < MiniTest::Test
end
# Test with real handlers that implement a few methods
-class TestOldUnhandled < MiniTest::Test
+class TestOldUnhandled < Minitest::Test
def test_message
handler_class = Class.new(OldMessagingHandler) do
diff --git a/ruby/tests/test_tools.rb b/ruby/tests/test_tools.rb
index 171e88743..14b29e791 100644
--- a/ruby/tests/test_tools.rb
+++ b/ruby/tests/test_tools.rb
@@ -23,9 +23,9 @@ require 'qpid_proton'
require 'socket'
begin
- MiniTest::Test
-rescue NameError # For older versions of MiniTest
- MiniTest::Test = MiniTest::Unit::TestCase
+ Minitest::Test
+rescue NameError # For older versions of Minitest
+ Minitest::Test = Minitest::Unit::TestCase
end
class TestError < RuntimeError; end # Normal error
diff --git a/ruby/tests/test_uri.rb b/ruby/tests/test_uri.rb
index 3587d939e..bcf64c713 100644
--- a/ruby/tests/test_uri.rb
+++ b/ruby/tests/test_uri.rb
@@ -19,7 +19,7 @@
require 'test_tools'
require 'qpid_proton'
-class TestURI < MiniTest::Test
+class TestURI < Minitest::Test
PARTS=[:scheme, :userinfo, :host, :port, :path] # Interesting URI components
def uri(u) Qpid::Proton::uri(u); end
diff --git a/ruby/tests/test_utils.rb b/ruby/tests/test_utils.rb
index 30e5e8016..7d2582573 100644
--- a/ruby/tests/test_utils.rb
+++ b/ruby/tests/test_utils.rb
@@ -18,7 +18,7 @@
require 'test_tools'
require 'minitest/unit'
-class UtilsTest < MiniTest::Test
+class UtilsTest < Minitest::Test
include Qpid::Proton
# Make sure Schedule puts tasks in proper order.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
