net-dns 0.8.0 → 0.9.0

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

@@ -1,11 +1,10 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRMRTest < Test::Unit::TestCase
-
+class RRMRTest < Minitest::Test
   def setup
     @klass      = Net::DNS::RR::MR
-    @rr         = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.bornagain.edu.", :ttl => 9000)
+    @rr         = @klass.new(name: "eddie.movie.edu.", newname: "eddie.bornagain.edu.", ttl: 9000)
 
     @rr_name    = "eddie.movie.edu."
     @rr_type    = "MR"
@@ -16,9 +15,8 @@ class RRMRTest < Test::Unit::TestCase
     @rr_output  = "eddie.movie.edu.        9000    IN      MR      eddie.bornagain.edu."
   end
 
-
   def test_initialize_from_hash
-    @record = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.bornagain.edu.", :ttl => 9000)
+    @record = @klass.new(name: "eddie.movie.edu.", newname: "eddie.bornagain.edu.", ttl: 9000)
     assert_equal @rr_output,  @record.inspect
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
@@ -48,7 +46,6 @@ class RRMRTest < Test::Unit::TestCase
   #   assert_equal @rr_newname, @record.newname
   # end
 
-
   InvalidArguments = [
     # FIXME: { :name => "eddie.movie.edu.", :newname => "foo___bar" },
     # FIXME: { :name => "eddie.movie.edu.", :newname => "foo$bar" },
@@ -56,7 +53,7 @@ class RRMRTest < Test::Unit::TestCase
     Object.new,
     Array.new(7),
     "9000  IN  MR",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -65,28 +62,26 @@ class RRMRTest < Test::Unit::TestCase
   end
 
   def test_initialize_should_raise_with_missing_newname
-    error = assert_raises(ArgumentError) { @klass.new(:name => "eddie.movie.edu.") }
+    error = assert_raises(ArgumentError) { @klass.new(name: "eddie.movie.edu.") }
     assert_match /:newname/, error.message
   end
 
-
   def test_value
-    @rr = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.newname.edu.")
-    assert_equal  "eddie.newname.edu.", @rr.value
+    @rr = @klass.new(name: "eddie.movie.edu.", newname: "eddie.newname.edu.")
+    assert_equal "eddie.newname.edu.", @rr.value
 
-    @rr = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.othername.edu.")
-    assert_equal  "eddie.othername.edu.", @rr.value
+    @rr = @klass.new(name: "eddie.movie.edu.", newname: "eddie.othername.edu.")
+    assert_equal "eddie.othername.edu.", @rr.value
   end
 
   def test_newname
-    @rr = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.newname.edu.")
-    assert_equal  "eddie.newname.edu.", @rr.newname
+    @rr = @klass.new(name: "eddie.movie.edu.", newname: "eddie.newname.edu.")
+    assert_equal "eddie.newname.edu.", @rr.newname
 
-    @rr = @klass.new(:name => "eddie.movie.edu.", :newname => "eddie.othername.edu.")
+    @rr = @klass.new(name: "eddie.movie.edu.", newname: "eddie.othername.edu.")
     assert_equal  "eddie.othername.edu.", @rr.newname
   end
 
-
   def test_inspect
     assert_equal  "eddie.movie.edu.        9000    IN      MR      eddie.bornagain.edu.",
                   @rr.inspect
@@ -101,5 +96,4 @@ class RRMRTest < Test::Unit::TestCase
     assert_equal  ["eddie.movie.edu.", 9000, "IN", "MR", "eddie.bornagain.edu."],
                   @rr.to_a
   end
-
 end

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

@@ -1,25 +1,23 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRMXTest < Test::Unit::TestCase
-
+class RRMXTest < Minitest::Test
   def setup
     @rr_name        = "example.com."
     @rr_type        = "MX"
     @rr_cls         = "IN"
-    @rr_ttl         = 10000
+    @rr_ttl         = 10_000
     @rr_preference  = 10
     @rr_exchange    = "mail.example.com."
     @rr_value       = "#{@rr_preference} #{@rr_exchange}"
 
     @rr_output  = "example.com.            10000   IN      MX      10 mail.example.com."
 
-    @rr         = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail.example.com.", :ttl => 10000)
+    @rr         = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.", ttl: 10_000)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail.example.com.", :ttl => 10000)
+    @record = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.", ttl: 10_000)
     assert_equal @rr_output,      @record.to_s
     assert_equal @rr_name,        @record.name
     assert_equal @rr_type,        @record.type
@@ -53,14 +51,13 @@ class RRMXTest < Test::Unit::TestCase
   #   assert_equal @rr_exchange,    @record.exchange
   # end
 
-
   InvalidArguments = [
-    { :name => "google.com" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN NS",
     "google.com. 10800 IN NS",
-  ]
+  ].freeze
 
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
@@ -68,32 +65,30 @@ class RRMXTest < Test::Unit::TestCase
     end
   end
 
-
   def test_preference
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail.example.com.")
-    assert_equal  10, @rr.preference
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.")
+    assert_equal 10, @rr.preference
 
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 100, :exchange => "mail.example.com.")
-    assert_equal  100, @rr.preference
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 100, exchange: "mail.example.com.")
+    assert_equal 100, @rr.preference
   end
 
   def test_exchange
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail.example.com.")
-    assert_equal  "mail.example.com.", @rr.exchange
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.")
+    assert_equal "mail.example.com.", @rr.exchange
 
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail2.example.com.")
-    assert_equal  "mail2.example.com.", @rr.exchange
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail2.example.com.")
+    assert_equal "mail2.example.com.", @rr.exchange
   end
 
   def test_value
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 10, :exchange => "mail.example.com.")
-    assert_equal  "10 mail.example.com.", @rr.value
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 10, exchange: "mail.example.com.")
+    assert_equal "10 mail.example.com.", @rr.value
 
-    @rr = Net::DNS::RR::MX.new(:name => "example.com.", :preference => 100, :exchange => "mail2.example.com.")
+    @rr = Net::DNS::RR::MX.new(name: "example.com.", preference: 100, exchange: "mail2.example.com.")
     assert_equal  "100 mail2.example.com.", @rr.value
   end
 
-
   def test_inspect
     assert_equal  "example.com.            10000   IN      MX      10 mail.example.com.",
                   @rr.inspect
@@ -105,8 +100,7 @@ class RRMXTest < Test::Unit::TestCase
   end
 
   def test_to_a
-    assert_equal  ["example.com.", 10000, "IN", "MX", "10 mail.example.com."],
+    assert_equal  ["example.com.", 10_000, "IN", "MX", "10 mail.example.com."],
                   @rr.to_a
   end
-
 end

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

@@ -1,23 +1,21 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRNSTest < Test::Unit::TestCase
-
+class RRNSTest < Minitest::Test
   def setup
     @rr_name    = "google.com."
     @rr_type    = "NS"
     @rr_cls     = "IN"
-    @rr_ttl     = 10800
+    @rr_ttl     = 10_800
     @rr_nsdname = "ns1.google.com."
-    
+
     @rr_output  = "google.com.             10800   IN      NS      ns1.google.com."
 
-    @rr         = Net::DNS::RR::NS.new(:name => "google.com.", :nsdname => "ns1.google.com.", :ttl => @rr_ttl)
+    @rr         = Net::DNS::RR::NS.new(name: "google.com.", nsdname: "ns1.google.com.", ttl: @rr_ttl)
   end
 
-
   def test_initialize_from_hash
-    @record = Net::DNS::RR::NS.new(:name => "google.com.", :nsdname => "ns1.google.com.")
+    @record = Net::DNS::RR::NS.new(name: "google.com.", nsdname: "ns1.google.com.")
     assert_equal @rr_output,  @record.inspect
     assert_equal @rr_name,    @record.name
     assert_equal @rr_type,    @record.type
@@ -47,27 +45,24 @@ class RRNSTest < Test::Unit::TestCase
     assert_equal @rr_nsdname, @record.nsdname
   end
 
-
   InvalidArguments = [
-    { :name => "google.com", :nsdname => "255.256" },
-    { :name => "google.com" },
+    { name: "google.com", nsdname: "255.256" },
+    { name: "google.com" },
     Object.new,
     Array.new(7),
     "10800 IN A",
-  ]
-  
+  ].freeze
+
   InvalidArguments.each_with_index do |arguments, index|
     define_method "test_initialize_should_raise_with_invalid_arguments_#{index}" do
       assert_raises(ArgumentError) { Net::DNS::RR::NS.new(arguments) }
     end
   end
 
-
   def test_value
     assert_equal  "ns1.google.com.", @rr.value
   end
 
-
   def test_inspect
     assert_equal  "google.com.             10800   IN      NS      ns1.google.com.",
                   @rr.inspect
@@ -79,8 +74,7 @@ class RRNSTest < Test::Unit::TestCase
   end
 
   def test_to_a
-    assert_equal  ["google.com.", 10800, "IN", "NS", "ns1.google.com."],
+    assert_equal  ["google.com.", 10_800, "IN", "NS", "ns1.google.com."],
                   @rr.to_a
   end
-
 end

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

@@ -1,17 +1,18 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRTypesTest < Test::Unit::TestCase
-
+class RRTypesTest < Minitest::Test
   def setup
   end
-    
+
   def test_default
+    @_default = Net::DNS::RR::Types.default
+
     # Default type should be ANY => 255
     instance = Net::DNS::RR::Types.new(nil)
     assert_equal("1", instance.to_str)
     assert_equal("A", instance.to_s)
-    
+
     # Let's change default behaviour
     Net::DNS::RR::Types.default = "A"
     instance = Net::DNS::RR::Types.new(nil)
@@ -22,6 +23,8 @@ class RRTypesTest < Test::Unit::TestCase
     instance = Net::DNS::RR::Types.new(nil)
     assert_equal("255", instance.to_str)
     assert_equal("ANY", instance.to_s)
+  ensure
+    Net::DNS::RR::Types.default = Net::DNS::RR::Types::TYPES.invert[@_default]
   end
 
   def test_types
@@ -34,7 +37,7 @@ class RRTypesTest < Test::Unit::TestCase
       assert_equal(num.to_s, instance_from_num.to_str)
     end
     assert_raises(ArgumentError) do
-      Net::DNS::RR::Types.new(Hash.new)
+      Net::DNS::RR::Types.new({})
     end
   end
 
@@ -45,14 +48,14 @@ class RRTypesTest < Test::Unit::TestCase
       assert_match /\|?#{key}\|?/, pattern
     end
   end
-  
+
   def test_valid?
     assert_equal(true,  Net::DNS::RR::Types.valid?("A"))
     assert_equal(true,  Net::DNS::RR::Types.valid?(1))
     assert_equal(false, Net::DNS::RR::Types.valid?("Q"))
     assert_equal(false, Net::DNS::RR::Types.valid?(256))
     assert_raises(ArgumentError) do
-      Net::DNS::RR::Types.valid? Hash.new
+      Net::DNS::RR::Types.valid?({})
     end
   end
 
@@ -65,5 +68,4 @@ class RRTypesTest < Test::Unit::TestCase
       Net::DNS::RR::Types.to_str("string")
     end
   end
-
 end

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

@@ -1,27 +1,25 @@
 require 'test_helper'
 require 'net/dns/rr'
 
-class RRTest < Test::Unit::TestCase
-  
+class RRTest < Minitest::Test
   def setup
     @rr_name = "example.com."
     @type = "A"
     @cls = "IN"
-    @ttl = 10800
+    @ttl = 10_800
     @rdata = "64.233.187.99"
 
-    @defaults = Net::DNS::RR.new(:name => @rr_name,
-                                 :rdata => @rdata)
-    
-    
-    @a_hash = Net::DNS::RR.new(:name => @rr_name,
-                               :ttl => @ttl,
-                               :cls => @cls,
-                               :type => @type,
-                               :address => @rdata)
-    
+    @defaults = Net::DNS::RR.new(name: @rr_name,
+                                 rdata: @rdata)
+
+    @a_hash = Net::DNS::RR.new(name: @rr_name,
+                               ttl: @ttl,
+                               cls: @cls,
+                               type: @type,
+                               address: @rdata)
+
     @a_string = Net::DNS::RR::A.new("example.com. 10800 IN A 64.233.187.99")
-    
+
     @str = "example.com.            10800   IN      A       64.233.187.99"
 
     @a     = Net::DNS::RR.new("foo.example.com. 86400 A 10.1.2.3")
@@ -31,14 +29,14 @@ class RRTest < Test::Unit::TestCase
 
     @a_data = @a.data
     @a_binary = Net::DNS::RR.parse(@a_data)
-    @mx_data = @mx.data 
+    @mx_data = @mx.data
     @mx_binary = Net::DNS::RR.parse(@mx_data)
 
-    @array = [@rr_name,@ttl,@cls,@type,@rdata]
+    @array = [@rr_name, @ttl, @cls, @type, @rdata]
   end
 
   def test_classes
-    assert_instance_of Net::DNS::RR::A, @a 
+    assert_instance_of Net::DNS::RR::A, @a
     assert_instance_of Net::DNS::RR::MX, @mx
     assert_instance_of Net::DNS::RR::CNAME, @cname
     assert_instance_of Net::DNS::RR::TXT, @txt
@@ -47,12 +45,12 @@ class RRTest < Test::Unit::TestCase
   end
 
   def test_ttl
-    assert_equal @a.ttl, 86400
+    assert_equal @a.ttl, 86_400
     assert_equal @mx.ttl, 7200
-    assert_equal @cname.ttl, 10800
+    assert_equal @cname.ttl, 10_800
     assert_equal @txt.ttl, 3600
-    assert_equal @a_binary.ttl, 86400
-    assert_equal @mx_binary.ttl, 7200    
+    assert_equal @a_binary.ttl, 86_400
+    assert_equal @mx_binary.ttl, 7200
   end
 
   def test_types
@@ -60,17 +58,17 @@ class RRTest < Test::Unit::TestCase
     assert_equal @mx.type, "MX"
     assert_equal @cname.type, "CNAME"
     assert_equal @txt.type, "TXT"
-    assert_equal @a_binary.type, "A"    
-    assert_equal @mx_binary.type, "MX"    
+    assert_equal @a_binary.type, "A"
+    assert_equal @mx_binary.type, "MX"
   end
-  
+
   def test_cls
     assert_equal @a.cls, "IN"
     assert_equal @mx.cls, "IN"
     assert_equal @cname.cls, "IN"
     assert_equal @txt.cls, "HS"
-    assert_equal @a_binary.cls, "IN"    
-    assert_equal @mx_binary.cls, "IN"    
+    assert_equal @a_binary.cls, "IN"
+    assert_equal @mx_binary.cls, "IN"
   end
 
   def test_name
@@ -78,10 +76,10 @@ class RRTest < Test::Unit::TestCase
     assert_equal @mx.name, "example.com."
     assert_equal @cname.name, "www.example.com"
     assert_equal @txt.name, "baz.example.com"
-    assert_equal @a_binary.name, "foo.example.com."    
-    assert_equal @mx_binary.name, "example.com."    
-  end    
-  
+    assert_equal @a_binary.name, "foo.example.com."
+    assert_equal @mx_binary.name, "example.com."
+  end
+
   def test_rdata
     assert_equal @a.address.to_s, "10.1.2.3"
     assert_equal @mx.preference, 10
@@ -92,15 +90,15 @@ class RRTest < Test::Unit::TestCase
     assert_equal @mx_binary.preference, 10
     assert_equal @mx_binary.exchange, "mailhost.example.com."
   end
-  
+
   def test_simple
-    assert_equal @rr_name,  @defaults.name
+    assert_equal @rr_name, @defaults.name
     assert_equal @type,  @defaults.type
     assert_equal @cls,   @defaults.cls
     assert_equal @ttl,   @defaults.ttl
     assert_equal @rdata, @defaults.rdata.to_s
-    
-    assert_equal(@str,@a_hash.inspect)
+
+    assert_equal(@str, @a_hash.inspect)
     assert_equal(@rr_name, @a_hash.name)
     assert_equal(@type, @a_hash.type)
     assert_equal(@cls, @a_hash.cls)
@@ -113,7 +111,7 @@ class RRTest < Test::Unit::TestCase
     assert_equal(@cls, @a_string.cls)
     assert_equal(@ttl, @a_string.ttl)
     assert_equal(@rdata, @a_string.address.to_s)
-    
+
     assert_equal(@a_data, @a_binary.data)
     assert_equal(@mx_data, @mx_binary.data)
 
@@ -126,6 +124,4 @@ class RRTest < Test::Unit::TestCase
       Net::DNS::RR.new("google.com. 10800 IM A")
     end
   end
-
 end
-