net-dns 0.8.0 → 0.9.0

data/test/{resolver_test.rb → unit/resolver_test.rb}

@@ -5,9 +5,7 @@ class Net::DNS::Resolver
   attr_reader :config
 end
 
-
-class ResolverTest < Test::Unit::TestCase
-
+class ResolverTest < Minitest::Test
   def test_initialize
     assert_nothing_raised { Net::DNS::Resolver.new }
   end
@@ -17,7 +15,7 @@ class ResolverTest < Test::Unit::TestCase
   end
 
   def test_initialize_with_multi_name_servers
-    resolver = Net::DNS::Resolver.new({:config_file => 'fixtures/resolv.conf'})
+    resolver = Net::DNS::Resolver.new(config_file: File.expand_path('../../spec/fixtures/resolv.conf', __dir__))
     assert_equal ['192.168.1.1', '192.168.1.2', '192.168.1.3', '192.168.1.4'], resolver.nameservers
   end
 
@@ -28,7 +26,7 @@ class ResolverTest < Test::Unit::TestCase
   end
 
   def test_query_with_no_nameservers_should_raise_resolvererror
-    assert_raises(Net::DNS::Resolver::Error) { Net::DNS::Resolver.new(:nameservers => []).query("example.com") }
+    assert_raises(Net::DNS::Resolver::Error) { Net::DNS::Resolver.new(nameservers: []).query("example.com") }
   end
 
   # def test_send_to_ipv6_nameserver_should_not_raise_einval
@@ -58,7 +56,7 @@ class ResolverTest < Test::Unit::TestCase
 
   def test_make_query_packet_from_string_like_ipv6
     packet = _make_query_packet("2001:1ac0::200:0:a5d1:6004:2", Net::DNS::A, cls = Net::DNS::IN)
-    assert_equal "2.0.0.0.4.0.0.6.1.d.5.a.0.0.0.0.0.0.2.0.0.0.0.0.0.c.a.1.1.0.0.2.ip6.arpa",  packet.question.first.qName
+    assert_equal "2.0.0.0.4.0.0.6.1.d.5.a.0.0.0.0.0.0.2.0.0.0.0.0.0.c.a.1.1.0.0.2.ip6.arpa", packet.question.first.qName
     assert_equal Net::DNS::PTR.to_i,          packet.question.first.qType.to_i
     assert_equal Net::DNS::IN.to_i,           packet.question.first.qClass.to_i
   end
@@ -79,33 +77,33 @@ class ResolverTest < Test::Unit::TestCase
 
   def test_should_return_state_without_exception
     res = Net::DNS::Resolver.new
-    assert_nothing_raised {res.state}
+    assert_nothing_raised { res.state }
   end
 
   RubyPlatforms = [
-    ["darwin9.0", false],   # Mac OS X
+    ["darwin9.0", false], # Mac OS X
     ["darwin", false],      # JRuby on Mac OS X
     ["linux-gnu", false],
     ["mingw32", true],      # ruby 1.8.6 (2008-03-03 patchlevel 114) [i386-mingw32]
     ["mswin32", true],      # ruby 1.8.6 (2008-03-03 patchlevel 114) [i386-mswin32]
     ["mswin32", true],      # ruby 1.8.6 (2008-04-22 rev 6555) [x86-jruby1.1.1]
-  ]
+  ].freeze
 
   C = Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG
 
   def test_self_platform_windows_question
     RubyPlatforms.each do |platform, is_windows|
       assert_equal is_windows,
-                    override_platform(platform) { Net::DNS::Resolver.platform_windows? },
-                    "Expected `#{is_windows}' with platform `#{platform}'"
+                   override_platform(platform) { Net::DNS::Resolver.platform_windows? },
+                   "Expected `#{is_windows}' with platform `#{platform}'"
     end
   end
 
-
   private
 
   def override_platform(new_platform, &block)
     raise LocalJumpError, "no block given" unless block_given?
+
     old_platform = C["host_os"]
     C["host_os"] = new_platform
     result = yield
@@ -113,5 +111,4 @@ class ResolverTest < Test::Unit::TestCase
     C["host_os"] = old_platform
     result
   end
-
 end

data/test/{rr → unit/rr}/a_test.rb

@@ -1,24 +1,22 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRATest < Test::Unit::TestCase
-
+class RRATest < Minitest::Test
   def setup
     @rr_name    = "google.com."
     @rr_type    = "A"
     @rr_cls     = "IN"
-    @rr_ttl     = 10000
+    @rr_ttl     = 10_000
     @rr_value   = "64.233.187.99"
     @rr_address = IPAddr.new(@rr_value)
 
     @rr_output  = "google.com.             10000   IN      A       64.233.187.99"
 
-    @rr         = Net::DNS::RR::A.new(:name => @rr_name, :address => @rr_address, :ttl => @rr_ttl)
+    @rr         = Net::DNS::RR::A.new(name: @rr_name, address: @rr_address, ttl: @rr_ttl)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::A.new(:name => @rr_name, :address => @rr_value, :ttl => @rr_ttl)
+    @record = Net::DNS::RR::A.new(name: @rr_name, address: @rr_value, ttl: @rr_ttl)
     assert_equal @rr_output,  @record.to_s
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
@@ -51,16 +49,15 @@ class RRATest < Test::Unit::TestCase
     assert_equal @rr_value,   @record.value
   end
 
-
   InvalidArguments = [
-    { :name => "google.com", :address => "255.256" },
-    { :name => "google.com" },
+    { name: "google.com", address: "255.256" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN A",
     "google.com. 10800 IN B",
     "google.com. 10800 IM A",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -68,9 +65,8 @@ class RRATest < Test::Unit::TestCase
     end
   end
 
-
   def test_address_getter
-    assert_equal  @rr_address, @rr.address
+    assert_equal @rr_address, @rr.address
   end
 
   def test_address_setter
@@ -81,7 +77,7 @@ class RRATest < Test::Unit::TestCase
     assert_equal expected, @rr.address
 
     expected = IPAddr.new("64.233.187.90")
-    assert_equal expected, @rr.address = 1089059674
+    assert_equal expected, @rr.address = 1_089_059_674
     assert_equal expected, @rr.address
 
     expected = IPAddr.new("64.233.187.80")
@@ -89,12 +85,10 @@ class RRATest < Test::Unit::TestCase
     assert_equal expected, @rr.address
   end
 
-
   def test_value
     assert_equal  @rr_value, @rr.value
   end
 
-
   def test_inspect
     assert_equal  "google.com.             10000   IN      A       64.233.187.99",
                   @rr.inspect
@@ -106,8 +100,7 @@ class RRATest < Test::Unit::TestCase
   end
 
   def test_to_a
-    assert_equal  ["google.com.", 10000, "IN", "A", "64.233.187.99"],
+    assert_equal  ["google.com.", 10_000, "IN", "A", "64.233.187.99"],
                   @rr.to_a
   end
-
 end

data/test/{rr → unit/rr}/aaaa_test.rb

@@ -1,8 +1,7 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRAAAATest < Test::Unit::TestCase
-
+class RRAAAATest < Minitest::Test
   def setup
     @rr_name    = "www.nic.it."
     @rr_type    = "AAAA"
@@ -13,12 +12,11 @@ class RRAAAATest < Test::Unit::TestCase
 
     @rr_output  = "www.nic.it.             60      IN      AAAA    2a00:d40:1:1::239"
 
-    @rr         = Net::DNS::RR::AAAA.new(:name => @rr_name, :address => @rr_address, :ttl => @rr_ttl)
+    @rr         = Net::DNS::RR::AAAA.new(name: @rr_name, address: @rr_address, ttl: @rr_ttl)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::AAAA.new(:name => @rr_name, :address => @rr_value, :ttl => @rr_ttl)
+    @record = Net::DNS::RR::AAAA.new(name: @rr_name, address: @rr_value, ttl: @rr_ttl)
     assert_equal @rr_output,  @record.to_s
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
@@ -51,16 +49,15 @@ class RRAAAATest < Test::Unit::TestCase
     assert_equal @rr_value,   @record.value
   end
 
-
   InvalidArguments = [
-    { :name => "google.com", :address => "2a00" },
-    { :name => "google.com" },
+    { name: "google.com", address: "2a00" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN AAAA",
     # FIXME: "google.com. 10800 IN B",
     # FIXME: "google.com. 10800 IM AAAA",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -68,9 +65,8 @@ class RRAAAATest < Test::Unit::TestCase
     end
   end
 
-
   def test_address_getter
-    assert_equal  @rr_address, @rr.address
+    assert_equal @rr_address, @rr.address
   end
 
   def test_address_setter
@@ -85,12 +81,10 @@ class RRAAAATest < Test::Unit::TestCase
     assert_equal expected, @rr.address
   end
 
-
   def test_value
     assert_equal  @rr_value, @rr.value
   end
 
-
   def test_inspect
     assert_equal  "www.nic.it.             60      IN      AAAA    2a00:d40:1:1::239",
                   @rr.inspect
@@ -105,5 +99,4 @@ class RRAAAATest < Test::Unit::TestCase
     assert_equal  ["www.nic.it.", 60, "IN", "AAAA", "2a00:d40:1:1::239"],
                   @rr.to_a
   end
-
 end

data/test/{rr → unit/rr}/classes_test.rb

@@ -1,22 +1,19 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRClassesTest < Test::Unit::TestCase
-
+class RRClassesTest < Minitest::Test
   def setup
-    @classes = {
-    }
+    @classes = {}
     @regexp_string = "ANY|CH|HS|IN|NONE"
   end
 
-
   StrAndNum = [
-      ['IN'   ,   1],
-      ['CH'   ,   3],
-      ['HS'   ,   4],
-      ['NONE' , 254],
-      ['ANY'  , 255],
-  ]
+    ['IN', 1],
+    ['CH',   3],
+    ['HS',   4],
+    ['NONE', 254],
+    ['ANY', 255],
+  ].freeze
 
   StrAndNum.each do |str, num|
     define_method "test_initialize_from_str_#{str}" do
@@ -32,10 +29,9 @@ class RRClassesTest < Test::Unit::TestCase
   end
 
   def test_initialize_should_raise_with_invalid_class
-    assert_raises(ArgumentError) { Net::DNS::RR::Classes.new(Hash.new) }
+    assert_raises(ArgumentError) { Net::DNS::RR::Classes.new({}) }
   end
 
-
   def test_inspect
     assert_equal 1, Net::DNS::RR::Classes.new(1).inspect
     assert_equal 1, Net::DNS::RR::Classes.new("IN").inspect
@@ -51,8 +47,9 @@ class RRClassesTest < Test::Unit::TestCase
     assert_equal 1, Net::DNS::RR::Classes.new("IN").to_i
   end
 
-
   def test_self_default
+    @_default = Net::DNS::RR::Classes.default
+
     # Default type should be ANY => 255
     instance = Net::DNS::RR::Classes.new(nil)
     assert_equal 1,    instance.to_i
@@ -68,6 +65,8 @@ class RRClassesTest < Test::Unit::TestCase
     instance = Net::DNS::RR::Classes.new(nil)
     assert_equal 1,    instance.to_i
     assert_equal "IN", instance.to_s
+  ensure
+    Net::DNS::RR::Classes.default = Net::DNS::RR::Classes::CLASSES.invert[@_default]
   end
 
   def test_self_valid?
@@ -75,11 +74,10 @@ class RRClassesTest < Test::Unit::TestCase
     assert  Net::DNS::RR::Classes.valid?(1)
     assert !Net::DNS::RR::Classes.valid?("Q")
     assert !Net::DNS::RR::Classes.valid?(256)
-    assert_raises(ArgumentError) { Net::DNS::RR::Classes.valid?(Hash.new) }
+    assert_raises(ArgumentError) { Net::DNS::RR::Classes.valid?({}) }
   end
 
   def test_self_regexp
     assert_equal @regexp_string, Net::DNS::RR::Classes.regexp
   end
-
 end

data/test/{rr → unit/rr}/cname_test.rb

@@ -1,24 +1,22 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRCNAMETest < Test::Unit::TestCase
-
+class RRCNAMETest < Minitest::Test
   def setup
     @rr_name    = "www.google.com."
     @rr_type    = "CNAME"
     @rr_cls     = "IN"
-    @rr_ttl     = 550317
+    @rr_ttl     = 550_317
     @rr_value   = "www.l.google.com."
     @rr_cname   = @rr_value
 
     @rr_output  = "www.google.com.         550317  IN      CNAME   www.l.google.com."
 
-    @rr         = Net::DNS::RR::CNAME.new(:name => @rr_name, :cname => @rr_cname, :ttl => @rr_ttl)
+    @rr         = Net::DNS::RR::CNAME.new(name: @rr_name, cname: @rr_cname, ttl: @rr_ttl)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::CNAME.new(:name => @rr_name, :cname => @rr_value, :ttl => @rr_ttl)
+    @record = Net::DNS::RR::CNAME.new(name: @rr_name, cname: @rr_value, ttl: @rr_ttl)
     assert_equal @rr_output,  @record.to_s
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
@@ -51,16 +49,15 @@ class RRCNAMETest < Test::Unit::TestCase
     assert_equal @rr_value,   @record.value
   end
 
-
   InvalidArguments = [
     # FIXME: { :name => "google.com", :cname => "foo___bar" },
     # FIXME: { :name => "google.com", :cname => "foo$bar" },
-    { :name => "google.com" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN CNAME",
     "google.com. 10800 IN CNAME",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -68,17 +65,14 @@ class RRCNAMETest < Test::Unit::TestCase
     end
   end
 
-
   def test_cname_getter
     assert_equal  @rr_cname, @rr.cname
   end
 
-
   def test_value
     assert_equal  @rr_value, @rr.value
   end
 
-
   def test_inspect
     assert_equal  "www.google.com.         550317  IN      CNAME   www.l.google.com.",
                   @rr.inspect
@@ -90,8 +84,7 @@ class RRCNAMETest < Test::Unit::TestCase
   end
 
   def test_to_a
-    assert_equal  ["www.google.com.", 550317, "IN", "CNAME", "www.l.google.com."],
+    assert_equal  ["www.google.com.", 550_317, "IN", "CNAME", "www.l.google.com."],
                   @rr.to_a
   end
-
 end

data/test/{rr → unit/rr}/hinfo_test.rb

@@ -2,30 +2,28 @@ require 'test_helper'
 require 'net/dns/rr'
 require 'net/dns/rr/hinfo'
 
-class RRHINFOTest < Test::Unit::TestCase
-
+class RRHINFOTest < Minitest::Test
   def setup
     @rr_name    = ""
     @rr_type    = "HINFO"
     @rr_cls     = "IN"
     @rr_ttl     = nil
-    @rr_value   = %Q{"PC-Intel-700mhz" "Redhat Linux 7.1"}
-    @rr_output  = %Q{                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"}
+    @rr_value   = '"PC-Intel-700mhz" "Redhat Linux 7.1"'
+    @rr_output  = '                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"'
 
     @rr_cpu     = "PC-Intel-700mhz"
     @rr_os      = "Redhat Linux 7.1"
 
-    @rr         = Net::DNS::RR::HINFO.new(:name => @rr_name, :cpu => @rr_cpu, :os => @rr_os)
+    @rr         = Net::DNS::RR::HINFO.new(name: @rr_name, cpu: @rr_cpu, os: @rr_os)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::HINFO.new(:name => @rr_name, :cpu => @rr_cpu, :os => @rr_os)
+    @record = Net::DNS::RR::HINFO.new(name: @rr_name, cpu: @rr_cpu, os: @rr_os)
     assert_equal @rr_output,  @record.to_s
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
     assert_equal @rr_cls,     @record.cls
-    assert_equal 10800,       @record.ttl
+    assert_equal 10_800, @record.ttl
     assert_equal @rr_value,   @record.value
 
     assert_equal @rr_cpu,     @record.cpu
@@ -33,7 +31,7 @@ class RRHINFOTest < Test::Unit::TestCase
   end
 
   def test_initialize_from_string
-    @record = Net::DNS::RR::HINFO.new(%Q{#{@rr_name} #{@rr_ttl} #{@rr_cls} #{@rr_type} PC-Intel-700mhz "Redhat Linux 7.1"})
+    @record = Net::DNS::RR::HINFO.new(%Q(#{@rr_name} #{@rr_ttl} #{@rr_cls} #{@rr_type} PC-Intel-700mhz "Redhat Linux 7.1"))
     assert_equal @rr_output,  @record.to_s
     assert_equal @rr_value,   @record.value
 
@@ -47,14 +45,15 @@ class RRHINFOTest < Test::Unit::TestCase
     # FIXME: assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
     assert_equal @rr_cls,     @record.cls
-    assert_equal 10800,       @record.ttl
+    assert_equal 10_800, @record.ttl
     assert_equal @rr_value,   @record.value
 
     assert_equal @rr_cpu,     @record.cpu
     assert_equal @rr_os,      @record.os
   end
 
-  # FIXME: Can't get valid data
+  # FIXME: Can't get valid data
+  #
   # def test_parse
   #   data = "\002in\000\000\r\000\001\000\000*0\000!\017PC-Intel-700mhz\020Redhat Linux 7.1"
   #   @record = Net::DNS::RR.parse(data)
@@ -69,14 +68,13 @@ class RRHINFOTest < Test::Unit::TestCase
   #   assert_equal @rr_os,      @record.os
   # end
 
-
   InvalidArguments = [
-    { :name => "google.com" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN HINFO",
     "IN HINFO",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -84,7 +82,6 @@ class RRHINFOTest < Test::Unit::TestCase
     end
   end
 
-
   def test_cpu
     assert_equal  @rr_cpu, @rr.cpu
   end
@@ -93,25 +90,22 @@ class RRHINFOTest < Test::Unit::TestCase
     assert_equal  @rr_os, @rr.os
   end
 
-
   def test_value
-    assert_equal  %Q{"PC-Intel-700mhz" "Redhat Linux 7.1"}, @rr.value
+    assert_equal  '"PC-Intel-700mhz" "Redhat Linux 7.1"', @rr.value
   end
 
-
   def test_inspect
-    assert_equal  %Q{                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"},
+    assert_equal  '                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"',
                   @rr.inspect
   end
 
   def test_to_s
-    assert_equal  %Q{                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"},
+    assert_equal  '                                IN      HINFO   "PC-Intel-700mhz" "Redhat Linux 7.1"',
                   @rr.to_s
   end
 
   def test_to_a
-    assert_equal  [nil, nil, "IN", "HINFO", %Q{"PC-Intel-700mhz" "Redhat Linux 7.1"}],
+    assert_equal  [nil, nil, "IN", "HINFO", '"PC-Intel-700mhz" "Redhat Linux 7.1"'],
                   @rr.to_a
   end
-
 end