Skip to content
Snippets Groups Projects
Commit d6138e2e authored by Mike Mackintosh's avatar Mike Mackintosh
Browse files

updated remaining tests for minitest

parent fd2517ac
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
Gem::Specification.new do |s| Gem::Specification.new do |s|
s.name = %q{ipaddress} s.name = %q{ipaddress}
s.version = "0.8.0" s.version = "0.8.1"
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Marco Ceresa"] s.authors = ["Marco Ceresa"]
......
...@@ -67,7 +67,7 @@ module IPAddress ...@@ -67,7 +67,7 @@ module IPAddress
# #-> "10.1.1.1" # #-> "10.1.1.1"
# #
def self.ntoa(uint) def self.ntoa(uint)
unless(uint.is_a? Numeric and uint <= 0xffffffff) unless(uint.is_a? Numeric and uint <= 0xffffffff and uint >= 0)
raise(::ArgumentError, "not a long integer: #{uint.inspect}") raise(::ArgumentError, "not a long integer: #{uint.inspect}")
end end
ret = [] ret = []
......
require 'test_helper' require 'test_helper'
require 'ipaddress/mongoid' require 'ipaddress/mongoid'
class MongoidTest < Test::Unit::TestCase class MongoidTest < Minitest::Test
def setup def setup
@valid_host4 = "172.16.10.1" @valid_host4 = "172.16.10.1"
...@@ -14,7 +14,7 @@ class MongoidTest < Test::Unit::TestCase ...@@ -14,7 +14,7 @@ class MongoidTest < Test::Unit::TestCase
@host6 = IPAddress.parse(@valid_host6) @host6 = IPAddress.parse(@valid_host6)
@network4 = IPAddress.parse(@valid_network4) @network4 = IPAddress.parse(@valid_network4)
@network6 = IPAddress.parse(@valid_network6) @network6 = IPAddress.parse(@valid_network6)
@invalid_values = [nil, "", 1, "invalid"] @invalid_values = [nil, "", "invalid"]
end end
def test_mongoize def test_mongoize
...@@ -37,9 +37,6 @@ class MongoidTest < Test::Unit::TestCase ...@@ -37,9 +37,6 @@ class MongoidTest < Test::Unit::TestCase
assert_equal @valid_network6, IPAddress.mongoize(@valid_network6_compressed) assert_equal @valid_network6, IPAddress.mongoize(@valid_network6_compressed)
@invalid_values.each do |invalid_value| @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 # Invalid addresses should serialize to nil
assert_equal nil, IPAddress.mongoize(invalid_value) assert_equal nil, IPAddress.mongoize(invalid_value)
end end
...@@ -59,9 +56,6 @@ class MongoidTest < Test::Unit::TestCase ...@@ -59,9 +56,6 @@ class MongoidTest < Test::Unit::TestCase
assert_equal @network6, IPAddress.demongoize(@valid_network6) assert_equal @network6, IPAddress.demongoize(@valid_network6)
@invalid_values.each do |invalid_value| @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 # Invalid stored value should be loaded as nil
assert_equal nil, IPAddress.demongoize(invalid_value) assert_equal nil, IPAddress.demongoize(invalid_value)
end end
......
...@@ -52,9 +52,9 @@ class IPAddressTest < Minitest::Test ...@@ -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[2])
assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[3]) assert_instance_of @ipv4class, @method.call(@valid_ipv4_uint32[3])
assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[0])} assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[0])}
assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[1])} assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[1])}
assert_raise(ArgumentError) {@method.call(@invalid_ipv4_uint32[2])} assert_raises(ArgumentError) {@method.call(@invalid_ipv4_uint32[2])}
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment