diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipaddress/ipv4_test.rb | 6 | ||||
| -rw-r--r-- | test/ipaddress/ipv6_test.rb | 14 | ||||
| -rw-r--r-- | test/ipaddress_test.rb | 2 |
3 files changed, 17 insertions, 5 deletions
diff --git a/test/ipaddress/ipv4_test.rb b/test/ipaddress/ipv4_test.rb index 8b3a52c..5177c75 100644 --- a/test/ipaddress/ipv4_test.rb +++ b/test/ipaddress/ipv4_test.rb @@ -109,7 +109,11 @@ class IPv4Test < Test::Unit::TestCase end def test_method_data - assert_equal "\254\020\n\001", @ip.data + if RUBY_VERSION < "2.0" + assert_equal "\254\020\n\001", @ip.data + else + assert_equal "\xAC\x10\n\x01".b, @ip.data + end end def test_method_to_string diff --git a/test/ipaddress/ipv6_test.rb b/test/ipaddress/ipv6_test.rb index 9d9ff3e..8e6213c 100644 --- a/test/ipaddress/ipv6_test.rb +++ b/test/ipaddress/ipv6_test.rb @@ -31,7 +31,9 @@ class IPv6Test < Test::Unit::TestCase "1080::8:800:200C:417A" => 21932261930451111902915077091070067066} @invalid_ipv6 = [":1:2:3:4:5:6:7", - ":1:2:3:4:5:6:7"] + ":1:2:3:4:5:6:7", + "2002:516:2:200", + "dd"] @networks = { "2001:db8:1:1:1:1:1:1/32" => "2001:db8::/32", @@ -180,7 +182,11 @@ class IPv6Test < Test::Unit::TestCase end def test_method_data - str = " \001\r\270\000\000\000\000\000\b\b\000 \fAz" + if RUBY_VERSION < "2.0" + str = " \001\r\270\000\000\000\000\000\b\b\000 \fAz" + else + str = " \x01\r\xB8\x00\x00\x00\x00\x00\b\b\x00 \fAz".b + end assert_equal str, @ip.data end @@ -257,7 +263,7 @@ 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:0::cd3") assert_not_equal expanded, @klass.expand("2001:0db8::cd30") assert_not_equal expanded, @klass.expand("2001:0db8::cd3") end @@ -266,7 +272,7 @@ class IPv6Test < Test::Unit::TestCase 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:0::cd3") assert_not_equal compressed, @klass.compress("2001:0db8::cd30") assert_not_equal compressed, @klass.compress("2001:0db8::cd3") end diff --git a/test/ipaddress_test.rb b/test/ipaddress_test.rb index ed72aed..8e2bb66 100644 --- a/test/ipaddress_test.rb +++ b/test/ipaddress_test.rb @@ -43,6 +43,8 @@ class IPAddressTest < Test::Unit::TestCase assert_equal false, IPAddress::valid?("10.0.0") assert_equal false, IPAddress::valid?("10.0") assert_equal false, IPAddress::valid?("2002:::1") + assert_equal false, IPAddress::valid?("2002:516:2:200") + end def test_module_method_valid_ipv4_netmark? |