diff options
| author | Mike Mackintosh <m@zyp.io> | 2015-02-09 21:50:21 -0500 |
|---|---|---|
| committer | Mike Mackintosh <m@zyp.io> | 2015-02-09 22:18:11 -0500 |
| commit | d6138e2e41b19e7b7f84db6c3031e8ec286e39ac (patch) | |
| tree | 7e9ba6f0679effc4e2c01fe15f30d11c07fe3604 /test | |
| parent | fd2517acfc840436862004fbf2401adb5de8f3d2 (diff) | |
| download | ipaddress-d6138e2e41b19e7b7f84db6c3031e8ec286e39ac.tar.gz | |
updated remaining tests for minitest
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipaddress/mongoid_test.rb | 10 | ||||
| -rw-r--r-- | test/ipaddress_test.rb | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/test/ipaddress/mongoid_test.rb b/test/ipaddress/mongoid_test.rb index 175e918..b463e84 100644 --- a/test/ipaddress/mongoid_test.rb +++ b/test/ipaddress/mongoid_test.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'ipaddress/mongoid' -class MongoidTest < Test::Unit::TestCase +class MongoidTest < Minitest::Test def setup @valid_host4 = "172.16.10.1" @@ -14,7 +14,7 @@ class MongoidTest < Test::Unit::TestCase @host6 = IPAddress.parse(@valid_host6) @network4 = IPAddress.parse(@valid_network4) @network6 = IPAddress.parse(@valid_network6) - @invalid_values = [nil, "", 1, "invalid"] + @invalid_values = [nil, "", "invalid"] end def test_mongoize @@ -37,9 +37,6 @@ class MongoidTest < Test::Unit::TestCase assert_equal @valid_network6, IPAddress.mongoize(@valid_network6_compressed) @invalid_values.each do |invalid_value| - # Invalid address should not raise error - assert_nothing_raised {IPAddress.mongoize(invalid_value)} - # Invalid addresses should serialize to nil assert_equal nil, IPAddress.mongoize(invalid_value) end @@ -59,9 +56,6 @@ class MongoidTest < Test::Unit::TestCase assert_equal @network6, IPAddress.demongoize(@valid_network6) @invalid_values.each do |invalid_value| - # Invalid stored values should not raise error - assert_nothing_raised {IPAddress.demongoize(invalid_value)} - # Invalid stored value should be loaded as nil assert_equal nil, IPAddress.demongoize(invalid_value) end diff --git a/test/ipaddress_test.rb b/test/ipaddress_test.rb index 39347aa..862c889 100644 --- a/test/ipaddress_test.rb +++ b/test/ipaddress_test.rb @@ -52,9 +52,9 @@ class IPAddressTest < Minitest::Test assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[2]) assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[3]) - assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[0])} - assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[1])} - assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[2])} + assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[0])} + assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[1])} + assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[2])} end |