From ecb3bb5686ca80e36364949f48a9a3ee51f33aab Mon Sep 17 00:00:00 2001 From: "Julian C. Dunn" Date: Fri, 13 Jun 2014 01:29:21 -0400 Subject: Convert test suite to Minitest. --- net-ssh-multi.gemspec | 3 --- test/channel_test.rb | 4 ++-- test/common.rb | 11 +++++++++-- test/multi_test.rb | 4 ++-- test/server_test.rb | 14 +++++++------- test/session_actions_test.rb | 4 ++-- test/session_test.rb | 4 ++-- 7 files changed, 24 insertions(+), 20 deletions(-) diff --git a/net-ssh-multi.gemspec b/net-ssh-multi.gemspec index b1a919e..f8ee5a5 100644 --- a/net-ssh-multi.gemspec +++ b/net-ssh-multi.gemspec @@ -57,18 +57,15 @@ Gem::Specification.new do |s| if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then s.add_runtime_dependency(%q, [">= 2.6.5"]) s.add_runtime_dependency(%q, [">= 1.2.0"]) - s.add_development_dependency(%q, [">= 0"]) s.add_development_dependency(%q, [">= 0"]) else s.add_dependency(%q, [">= 2.6.5"]) s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) end else s.add_dependency(%q, [">= 2.6.5"]) s.add_dependency(%q, [">= 1.2.0"]) - s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, [">= 0"]) end end diff --git a/test/channel_test.rb b/test/channel_test.rb index 174b22c..2c08573 100644 --- a/test/channel_test.rb +++ b/test/channel_test.rb @@ -1,7 +1,7 @@ require 'common' require 'net/ssh/multi/channel' -class ChannelTest < Test::Unit::TestCase +class ChannelTest < Minitest::Test def test_each_should_iterate_over_each_component_channel channels = [c1 = mock('channel'), c2 = mock('channel'), c3 = mock('channel')] channel = Net::SSH::Multi::Channel.new(mock('session'), channels) @@ -149,4 +149,4 @@ class ChannelTest < Test::Unit::TestCase end end end -end \ No newline at end of file +end diff --git a/test/common.rb b/test/common.rb index dd4f074..ef6ef4f 100644 --- a/test/common.rb +++ b/test/common.rb @@ -1,2 +1,9 @@ -require 'test/unit' -require 'mocha' \ No newline at end of file +require 'minitest/autorun' +require 'mocha/setup' + +if Minitest.const_defined?('Test') + # We're on Minitest 5+. Nothing to do here. +else + # Minitest 4 doesn't have Minitest::Test yet. + Minitest::Test = MiniTest::Unit::TestCase +end diff --git a/test/multi_test.rb b/test/multi_test.rb index 0a5d5bb..7923859 100644 --- a/test/multi_test.rb +++ b/test/multi_test.rb @@ -1,7 +1,7 @@ require 'common' require 'net/ssh/multi' -class MultiTest < Test::Unit::TestCase +class MultiTest < Minitest::Test def test_start_with_block_should_yield_session_and_then_close Net::SSH::Multi::Session.any_instance.expects(:loop) Net::SSH::Multi::Session.any_instance.expects(:close) @@ -17,4 +17,4 @@ class MultiTest < Test::Unit::TestCase Net::SSH::Multi::Session.any_instance.expects(:close).never assert_instance_of Net::SSH::Multi::Session, Net::SSH::Multi.start end -end \ No newline at end of file +end diff --git a/test/server_test.rb b/test/server_test.rb index 4c0c640..544ea16 100644 --- a/test/server_test.rb +++ b/test/server_test.rb @@ -1,7 +1,7 @@ require 'common' require 'net/ssh/multi/server' -class ServerTest < Test::Unit::TestCase +class ServerTest < Minitest::Test def setup @master = stub('multi-session', :default_user => "bob") end @@ -50,7 +50,7 @@ class ServerTest < Test::Unit::TestCase s1 = server('user@host1:1234') s2 = server('user@host2:1234') assert !s1.eql?(s2) - assert_not_equal s1.hash, s2.hash + refute_equal s1.hash, s2.hash assert s1 != s2 end @@ -58,7 +58,7 @@ class ServerTest < Test::Unit::TestCase s1 = server('user@host:1234') s2 = server('user@host:1235') assert !s1.eql?(s2) - assert_not_equal s1.hash, s2.hash + refute_equal s1.hash, s2.hash assert s1 != s2 end @@ -66,7 +66,7 @@ class ServerTest < Test::Unit::TestCase s1 = server('user1@host:1234') s2 = server('user2@host:1234') assert !s1.eql?(s2) - assert_not_equal s1.hash, s2.hash + refute_equal s1.hash, s2.hash assert s1 != s2 end @@ -112,7 +112,7 @@ class ServerTest < Test::Unit::TestCase end def test_close_channels_when_session_is_not_open_should_not_do_anything - assert_nothing_raised { server('host').close_channels } + server('host').close_channels end def test_close_channels_when_session_is_open_should_iterate_over_open_channels_and_close_them @@ -127,7 +127,7 @@ class ServerTest < Test::Unit::TestCase end def test_close_when_session_is_not_open_should_not_do_anything - assert_nothing_raised { server('host').close } + server('host').close end def test_close_when_session_is_open_should_close_session @@ -253,4 +253,4 @@ class ServerTest < Test::Unit::TestCase @master.expects(:next_session).with(server).returns(session) return session end -end \ No newline at end of file +end diff --git a/test/session_actions_test.rb b/test/session_actions_test.rb index 6c688af..e6de5b1 100644 --- a/test/session_actions_test.rb +++ b/test/session_actions_test.rb @@ -2,7 +2,7 @@ require 'common' require 'net/ssh/multi/server' require 'net/ssh/multi/session_actions' -class SessionActionsTest < Test::Unit::TestCase +class SessionActionsTest < Minitest::Test class SessionActionsContainer include Net::SSH::Multi::SessionActions @@ -125,4 +125,4 @@ class SessionActionsTest < Test::Unit::TestCase assert_equal 127, c[:exit_status] end -end \ No newline at end of file +end diff --git a/test/session_test.rb b/test/session_test.rb index c453a97..42a56b2 100644 --- a/test/session_test.rb +++ b/test/session_test.rb @@ -1,7 +1,7 @@ require 'common' require 'net/ssh/multi/session' -class SessionTest < Test::Unit::TestCase +class SessionTest < Minitest::Test def setup @session = Net::SSH::Multi::Session.new end @@ -198,4 +198,4 @@ class SessionTest < Test::Unit::TestCase IO.expects(:select).with([:a, :b, :c], [:a, :c], nil, 5).returns([[:b, :c], [:a, :c]]) @session.process(5) end -end \ No newline at end of file +end -- cgit v1.2.1