From fd2517acfc840436862004fbf2401adb5de8f3d2 Mon Sep 17 00:00:00 2001
From: "Julian C. Dunn" <jdunn@getchef.com>
Date: Fri, 13 Jun 2014 00:13:17 -0400
Subject: [PATCH] Convert to Minitest.
---
test/ipaddress/ipv4_test.rb | 29 +++++++++++------------------
test/ipaddress/ipv6_test.rb | 32 ++++++++++++--------------------
test/ipaddress/prefix_test.rb | 14 ++++----------
test/ipaddress_test.rb | 11 ++++-------
test/test_helper.rb | 12 +++++++++---
5 files changed, 40 insertions(+), 58 deletions(-)
diff --git a/test/ipaddress/ipv4_test.rb b/test/ipaddress/ipv4_test.rb
index 534349e..bf969ad 100644
--- a/test/ipaddress/ipv4_test.rb
+++ b/test/ipaddress/ipv4_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class IPv4Test < Test::Unit::TestCase
+class IPv4Test < Minitest::Test
def setup
@klass = IPAddress::IPv4
@@ -73,25 +73,19 @@ class IPv4Test < Test::Unit::TestCase
assert_instance_of @klass, ip
end
assert_instance_of IPAddress::Prefix32, @ip.prefix
- assert_raise (ArgumentError) do
+ assert_raises (ArgumentError) do
@klass.new
end
- assert_nothing_raised do
- @klass.new "10.0.0.0/8"
- end
end
def test_initialize_format_error
@invalid_ipv4.each do |i|
- assert_raise(ArgumentError) {@klass.new(i)}
+ assert_raises(ArgumentError) {@klass.new(i)}
end
- assert_raise (ArgumentError) {@klass.new("10.0.0.0/asd")}
+ assert_raises (ArgumentError) {@klass.new("10.0.0.0/asd")}
end
def test_initialize_without_prefix
- assert_nothing_raised do
- @klass.new("10.10.0.0")
- end
ip = @klass.new("10.10.0.0")
assert_instance_of IPAddress::Prefix32, ip.prefix
assert_equal 32, ip.prefix.to_i
@@ -111,7 +105,7 @@ class IPv4Test < Test::Unit::TestCase
end
def test_initialize_should_require_ip
- assert_raise(ArgumentError) { @klass.new }
+ assert_raises(ArgumentError) { @klass.new }
end
def test_method_data
@@ -400,8 +394,8 @@ class IPv4Test < Test::Unit::TestCase
end
def test_method_split
- assert_raise(ArgumentError) {@ip.split(0)}
- assert_raise(ArgumentError) {@ip.split(257)}
+ assert_raises(ArgumentError) {@ip.split(0)}
+ assert_raises(ArgumentError) {@ip.split(257)}
assert_equal @ip.network, @ip.split(1).first
@@ -431,9 +425,8 @@ class IPv4Test < Test::Unit::TestCase
end
def test_method_subnet
- assert_raise(ArgumentError) {@network.subnet(23)}
- assert_raise(ArgumentError) {@network.subnet(33)}
- assert_nothing_raised {@ip.subnet(30)}
+ assert_raises(ArgumentError) {@network.subnet(23)}
+ assert_raises(ArgumentError) {@network.subnet(33)}
arr = ["172.16.10.0/26", "172.16.10.64/26", "172.16.10.128/26",
"172.16.10.192/26"]
assert_equal arr, @network.subnet(26).map {|s| s.to_string}
@@ -444,7 +437,7 @@ class IPv4Test < Test::Unit::TestCase
end
def test_method_supernet
- assert_raise(ArgumentError) {@ip.supernet(24)}
+ assert_raises(ArgumentError) {@ip.supernet(24)}
assert_equal "0.0.0.0/0", @ip.supernet(0).to_string
assert_equal "0.0.0.0/0", @ip.supernet(-2).to_string
assert_equal "172.16.10.0/23", @ip.supernet(23).to_string
@@ -546,7 +539,7 @@ class IPv4Test < Test::Unit::TestCase
assert_equal prefix, res.prefix
assert_equal "#{ip}/#{prefix}", res.to_string
end
- assert_raise(ArgumentError){ @klass.parse_classful("192.168.256.257") }
+ assert_raises(ArgumentError){ @klass.parse_classful("192.168.256.257") }
end
end # class IPv4Test
diff --git a/test/ipaddress/ipv6_test.rb b/test/ipaddress/ipv6_test.rb
index 8e6213c..f0932d7 100644
--- a/test/ipaddress/ipv6_test.rb
+++ b/test/ipaddress/ipv6_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class IPv6Test < Test::Unit::TestCase
+class IPv6Test < Minitest::Test
def setup
@klass = IPAddress::IPv6
@@ -53,15 +53,12 @@ class IPv6Test < Test::Unit::TestCase
def test_initialize
assert_instance_of @klass, @ip
- @valid_ipv6.keys.each do |ip|
- assert_nothing_raised {@klass.new ip}
- end
@invalid_ipv6.each do |ip|
- assert_raise(ArgumentError) {@klass.new ip}
+ assert_raises(ArgumentError) {@klass.new ip}
end
assert_equal 64, @ip.prefix
- assert_raise(ArgumentError) {
+ assert_raises(ArgumentError) {
@klass.new "::10.1.1.1"
}
end
@@ -263,18 +260,18 @@ class IPv6Test < Test::Unit::TestCase
compressed = "2001:db8:0:cd30::"
expanded = "2001:0db8:0000:cd30:0000:0000:0000:0000"
assert_equal expanded, @klass.expand(compressed)
- assert_not_equal expanded, @klass.expand("2001:0db8:0::cd3")
- assert_not_equal expanded, @klass.expand("2001:0db8::cd30")
- assert_not_equal expanded, @klass.expand("2001:0db8::cd3")
+ refute_equal expanded, @klass.expand("2001:0db8:0::cd3")
+ refute_equal expanded, @klass.expand("2001:0db8::cd30")
+ refute_equal expanded, @klass.expand("2001:0db8::cd3")
end
def test_classmethod_compress
compressed = "2001:db8:0:cd30::"
expanded = "2001:0db8:0000:cd30:0000:0000:0000:0000"
assert_equal compressed, @klass.compress(expanded)
- assert_not_equal compressed, @klass.compress("2001:0db8:0::cd3")
- assert_not_equal compressed, @klass.compress("2001:0db8::cd30")
- assert_not_equal compressed, @klass.compress("2001:0db8::cd3")
+ refute_equal compressed, @klass.compress("2001:0db8:0::cd3")
+ refute_equal compressed, @klass.compress("2001:0db8::cd30")
+ refute_equal compressed, @klass.compress("2001:0db8::cd3")
end
def test_classmethod_parse_data
@@ -297,7 +294,7 @@ class IPv6Test < Test::Unit::TestCase
end # class IPv6Test
-class IPv6UnspecifiedTest < Test::Unit::TestCase
+class IPv6UnspecifiedTest < Minitest::Test
def setup
@klass = IPAddress::IPv6::Unspecified
@@ -310,7 +307,6 @@ class IPv6UnspecifiedTest < Test::Unit::TestCase
end
def test_initialize
- assert_nothing_raised {@klass.new}
assert_instance_of @klass, @ip
end
@@ -331,7 +327,7 @@ class IPv6UnspecifiedTest < Test::Unit::TestCase
end # class IPv6UnspecifiedTest
-class IPv6LoopbackTest < Test::Unit::TestCase
+class IPv6LoopbackTest < Minitest::Test
def setup
@klass = IPAddress::IPv6::Loopback
@@ -344,7 +340,6 @@ class IPv6LoopbackTest < Test::Unit::TestCase
end
def test_initialize
- assert_nothing_raised {@klass.new}
assert_instance_of @klass, @ip
end
@@ -364,7 +359,7 @@ class IPv6LoopbackTest < Test::Unit::TestCase
end # class IPv6LoopbackTest
-class IPv6MappedTest < Test::Unit::TestCase
+class IPv6MappedTest < Minitest::Test
def setup
@klass = IPAddress::IPv6::Mapped
@@ -390,14 +385,11 @@ class IPv6MappedTest < Test::Unit::TestCase
end
def test_initialize
- assert_nothing_raised {@klass.new("::172.16.10.1")}
assert_instance_of @klass, @ip
@valid_mapped.each do |ip, u128|
- assert_nothing_raised {@klass.new ip}
assert_equal u128, @klass.new(ip).to_u128
end
@valid_mapped_ipv6.each do |ip, u128|
- assert_nothing_raised {@klass.new ip}
assert_equal u128, @klass.new(ip).to_u128
end
end
diff --git a/test/ipaddress/prefix_test.rb b/test/ipaddress/prefix_test.rb
index bff812e..1a0e277 100644
--- a/test/ipaddress/prefix_test.rb
+++ b/test/ipaddress/prefix_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class Prefix32Test < Test::Unit::TestCase
+class Prefix32Test < Minitest::Test
def setup
@netmask0 = "0.0.0.0"
@@ -89,12 +89,9 @@ class Prefix32Test < Test::Unit::TestCase
end
def test_initialize
- assert_raise (ArgumentError) do
+ assert_raises (ArgumentError) do
@klass.new 33
end
- assert_nothing_raised do
- @klass.new 8
- end
assert_instance_of @klass, @klass.new(8)
end
@@ -122,7 +119,7 @@ class Prefix32Test < Test::Unit::TestCase
end # class Prefix32Test
-class Prefix128Test < Test::Unit::TestCase
+class Prefix128Test < Minitest::Test
def setup
@u128_hash = {
@@ -135,12 +132,9 @@ class Prefix128Test < Test::Unit::TestCase
end
def test_initialize
- assert_raise (ArgumentError) do
+ assert_raises (ArgumentError) do
@klass.new 129
end
- assert_nothing_raised do
- @klass.new 64
- end
assert_instance_of @klass, @klass.new(64)
end
diff --git a/test/ipaddress_test.rb b/test/ipaddress_test.rb
index c8bf2e7..39347aa 100644
--- a/test/ipaddress_test.rb
+++ b/test/ipaddress_test.rb
@@ -1,6 +1,6 @@
require 'test_helper'
-class IPAddressTest < Test::Unit::TestCase
+class IPAddressTest < Minitest::Test
def setup
@valid_ipv4 = "172.16.10.1/24"
@@ -38,17 +38,14 @@ class IPAddressTest < Test::Unit::TestCase
end
def test_method_IPAddress
- assert_nothing_raised {@method.call(@valid_ipv4)}
- assert_nothing_raised {@method.call(@valid_ipv6)}
- assert_nothing_raised {@method.call(@valid_mapped)}
assert_instance_of @ipv4class, @method.call(@valid_ipv4)
assert_instance_of @ipv6class, @method.call(@valid_ipv6)
assert_instance_of @mappedclass, @method.call(@valid_mapped)
- assert_raise(ArgumentError) {@method.call(@invalid_ipv4)}
- assert_raise(ArgumentError) {@method.call(@invalid_ipv6)}
- assert_raise(ArgumentError) {@method.call(@invalid_mapped)}
+ assert_raises(ArgumentError) {@method.call(@invalid_ipv4)}
+ assert_raises(ArgumentError) {@method.call(@invalid_ipv6)}
+ assert_raises(ArgumentError) {@method.call(@invalid_mapped)}
assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[0])
assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[1])
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 99fd5e9..249ea52 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,14 +1,20 @@
require 'rubygems'
require 'minitest/autorun'
-require 'test/unit'
$LOAD_PATH.unshift(File.dirname(__FILE__))
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
require 'ipaddress'
-module Test::Unit
+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
+
+module Minitest
- class TestCase
+ class Test
def self.must(name, &block)
test_name = "test_#{name.gsub(/\s+/,'_')}".to_sym
--
GitLab