dnsruby 1.55 → 1.56.0

data/test/spec_helper.rb

@@ -0,0 +1,16 @@
+if ENV['RUN_EXTRA_TASK'] == 'TRUE'
+  require 'coveralls'
+  Coveralls.wear!
+
+  require 'simplecov'
+
+  SimpleCov.formatter =
+    SimpleCov::Formatter::MultiFormatter[SimpleCov::Formatter::HTMLFormatter,
+                                         Coveralls::SimpleCov::Formatter]
+  SimpleCov.start do
+    add_filter 'test/'
+  end
+end
+
+require 'minitest/autorun'
+require 'dnsruby'

data/test/tc_axfr.rb

@@ -1,35 +1,32 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. 
-#You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0 
-#
-#Unless required by applicable law or agreed to in writing, software 
-#distributed under the License is distributed on an "AS IS" BASIS, 
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#See the License for the specific language governing permissions and 
-#limitations under the License.
-#++
-begin
-require 'rubygems'
-rescue LoadError
-end
-require 'test/unit'
-require 'dnsruby'
-class TestAxfr < Test::Unit::TestCase
-  def test_axfr
-    zt = Dnsruby::ZoneTransfer.new
-    zt.transfer_type = Dnsruby::Types.AXFR
-    zt.server = "ns0.validation-test-servers.nominet.org.uk"
-    zone = zt.transfer("validation-test-servers.nominet.org.uk")
-    assert(zone.length > 0)
-    assert(zt.last_tsigstate==nil)
-  end
-  
-  
-  # NB - test_ixfr is in tc_tsig.rg - this is becuase it requires
-  # TSIG to make an update (which we can then test for with ixfr)
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
+class TestAxfr < Minitest::Test
+  def test_axfr
+    zt = Dnsruby::ZoneTransfer.new
+    zt.transfer_type = Dnsruby::Types.AXFR
+    zt.server = "ns0.validation-test-servers.nominet.org.uk"
+    zone = zt.transfer("validation-test-servers.nominet.org.uk")
+    assert(zone.length > 0)
+    assert(zt.last_tsigstate==nil)
+  end
+
+
+  #  NB - test_ixfr is in tc_tsig.rg - this is becuase it requires
+  #  TSIG to make an update (which we can then test for with ixfr)
 end

data/test/tc_cache.rb

@@ -1,24 +1,24 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-#++
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
 
-require 'test/unit'
-require 'dnsruby'
 include Dnsruby
 
-class TestCache < Test::Unit::TestCase
+class TestCache < Minitest::Test
   def test_cache
     cache = Cache.new
     m1 = Message.new("example.com.", Types.A, Classes.IN)
@@ -53,10 +53,10 @@ class TestCache < Test::Unit::TestCase
   end
 
   def test_opt_record
-    # Create a very large message, encode it and decode it - there should be an opt record
-    # test getting that in and out the cache
-    # We should be able to do this in the online test by getting back a very big
-    # record from the test zone
+    #  Create a very large message, encode it and decode it - there should be an opt record
+    #  test getting that in and out the cache
+    #  We should be able to do this in the online test by getting back a very big
+    #  record from the test zone
   end
 
   def test_negative
@@ -64,7 +64,7 @@ class TestCache < Test::Unit::TestCase
   end
 
   def test_resolver_do_caching
-    # Get the records back from the test zone
+    #  Get the records back from the test zone
     Dnsruby::PacketSender.clear_caches
     res = Resolver.new("ns0.validation-test-servers.nominet.org.uk.")
     res.do_caching = false
@@ -75,12 +75,12 @@ class TestCache < Test::Unit::TestCase
     assert(!ret.cached)
     assert(ret.rcode == RCode.NoError)
     assert(ret.header.aa)
-    # Store the ttls
+    #  Store the ttls
     first_ttls = ret.answer.rrset(
       "overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT).ttl
-    # Wait a while
+    #  Wait a while
     sleep(1)
-    # Ask for the same records
+    #  Ask for the same records
     ret = res.query("overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT)
 #    print "#{ret}\n"
     assert(ret.rcode == RCode.NoError)
@@ -88,7 +88,7 @@ class TestCache < Test::Unit::TestCase
   end
 
   def test_online
-    # Get the records back from the test zone
+    #  Get the records back from the test zone
     Dnsruby::PacketSender.clear_caches
     Dnsruby::Recursor.clear_caches
     res = SingleResolver.new("ns0.validation-test-servers.nominet.org.uk.")
@@ -99,12 +99,12 @@ class TestCache < Test::Unit::TestCase
     assert(!ret.cached)
     assert(ret.rcode == RCode.NoError)
     assert(ret.header.aa)
-    # Store the ttls
+    #  Store the ttls
     first_ttls = ret.answer.rrset(
       "overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT).ttl
-    # Wait a while
+    #  Wait a while
     sleep(1)
-    # Ask for the same records
+    #  Ask for the same records
     query = Message.new("overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT)
     ret = res.send_message(query)
 #    print "#{ret}\n"
@@ -112,16 +112,16 @@ class TestCache < Test::Unit::TestCase
     assert(ret.cached)
     second_ttls = ret.answer.rrset(
       "overflow.dnsruby.validation-test-servers.nominet.org.uk", Types.TXT).ttl
-    # make sure the ttl is less the time we waited
+    #  make sure the ttl is less the time we waited
     assert((second_ttls == first_ttls - 1) || (second_ttls == first_ttls - 2),
             "First ttl = #{first_ttls}, second = #{second_ttls}\n")
-    # make sure the header flags (and ID) are right
+    #  make sure the header flags (and ID) are right
     assert(ret.header.id == query.header.id, "First id = #{query.header.id}, cached response was #{ret.header.id}\n")
     assert(!ret.header.aa)
   end
 
   def test_online_uncached
-    # @TODO@ Check that wildcard queries are not cached
+    #  @TODO@ Check that wildcard queries are not cached
   end
 
 end

data/test/tc_dlv.rb

@@ -1,34 +1,34 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License.
-#You may obtain a copy of the License at
-#
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
 #     http://www.apache.org/licenses/LICENSE-2.0
-#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-#++
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
 
-require 'test/unit'
-require 'dnsruby'
 include Dnsruby
 
-class TestDlv < Test::Unit::TestCase
+class TestDlv < Minitest::Test
   def test_dlv
-    # Enable DLV (only) for validation.
-    # Try to validate some records which can only be done through dlv
-    # OK - if we don't configure trust anchors, and there is no signed root, then this is easy!
+    #  Enable DLV (only) for validation.
+    #  Try to validate some records which can only be done through dlv
+    #  OK - if we don't configure trust anchors, and there is no signed root, then this is easy!
         Dnsruby::Dnssec.clear_trusted_keys
     Dnsruby::Dnssec.clear_trust_anchors
     Dnsruby::PacketSender.clear_caches
 #    Dnssec.do_validation_with_recursor(true)
-    # @TODO@ Should use whole RRSet of authoritative NS for these resolvers,
-    # not individual servers!
+    #  @TODO@ Should use whole RRSet of authoritative NS for these resolvers,
+    #  not individual servers!
     res = Dnsruby::Resolver.new("a.ns.se")
     res.add_server("b.ns.se")
     res.dnssec=true
@@ -43,31 +43,31 @@ class TestDlv < Test::Unit::TestCase
     ret = res.query("ns2.nic.se", Dnsruby::Types.A)
     assert(ret.security_level == Dnsruby::Message::SecurityLevel::UNCHECKED)
 
-    # Load DLV key
+    #  Load DLV key
     dlv_key = RR.create("dlv.isc.org. IN DNSKEY 257 3 5 BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt TDN0YUuWrBNh")
     Dnssec.add_dlv_key(dlv_key)
     Dnsruby::PacketSender.clear_caches
 
 
-    # SE no longer in DLV
+    #  SE no longer in DLV
 #    res = Dnsruby::Recursor.new()
 #    ret = res.query("ns2.nic.se", Dnsruby::Types.A)
 #    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
 
-    # .cz no longer in dlv?
+    #  .cz no longer in dlv?
 #    ret = res.query("b.ns.nic.cz", Dnsruby::Types.A)
 #    assert(ret.security_level == Dnsruby::Message::SecurityLevel::SECURE)
 
-    # Test .gov
+    #  Test .gov
 #    Dnsruby::TheLog.level = Logger::DEBUG
 res = Resolver.new
     ret = res.query("nih.gov", "NS")
     assert(ret.security_level = Dnsruby::Message::SecurityLevel::SECURE)
   end
 
-   # se no longer in dlv
+   #  se no longer in dlv
 #  def test_scrub_non_authoritative
-##    Dnssec.do_validation_with_recursor(true)
+# #    Dnssec.do_validation_with_recursor(true)
 #    res = Dnsruby::Recursor.new()
 #    ret = res.query("frobbit.se")
 #      res.prune_rrsets_to_rfc5452(ret, "frobbit.se.")

data/test/tc_dns.rb

@@ -1,34 +1,31 @@
-#--
-#Copyright 2007 Nominet UK
-#
-#Licensed under the Apache License, Version 2.0 (the "License");
-#you may not use this file except in compliance with the License. 
-#You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0 
-#
-#Unless required by applicable law or agreed to in writing, software 
-#distributed under the License is distributed on an "AS IS" BASIS, 
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-#See the License for the specific language governing permissions and 
-#limitations under the License.
-#++
-begin
-require 'rubygems'
-rescue LoadError
-end
-require 'test/unit'
-require 'dnsruby'
+# --
+# Copyright 2007 Nominet UK
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+
+require_relative 'spec_helper'
+
 include Dnsruby
-class TestDNS < Test::Unit::TestCase
+class TestDNS < Minitest::Test
   def setup
     Dnsruby::Config.reset
   end
-  
+
   def test_ipv4_address
     Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("221.186.184.68")) }
   end
-  
+
   def test_resolv_rb_api
     DNS.open {|dns|
       dns.getresources("www.ruby-lang.org", Types.A).each  {|r| assert_equal(r.address.to_s, "221.186.184.68")}
@@ -59,7 +56,7 @@ class TestDNS < Test::Unit::TestCase
     assert_equal(r[0].exchange.to_s, "carbon.ruby-lang.org")
     assert_equal(r[0].klass, Classes.IN)
     assert_equal(r[0].type, Types.MX)
-    r = d.each_resource("www.ruby-lang.org", Types.ANY) {|r|     
+    r = d.each_resource("www.ruby-lang.org", Types.ANY) {|r|
       assert_equal(r.name.to_s, "www.ruby-lang.org")
       assert_equal(r.domainname.to_s, "carbon.ruby-lang.org")
       assert_equal(r.klass, Classes.IN)
@@ -67,20 +64,20 @@ class TestDNS < Test::Unit::TestCase
     }
     d.close
   end
-  
+
   def test_async_api
-    #@TODO@ Do we really want an async API for Resolv/DNS?
-    #Or would users be better off with Resolver async API?
+    # @TODO@ Do we really want an async API for Resolv/DNS?
+    # Or would users be better off with Resolver async API?
   end
-  
+
   def test_concurrent
-    #@TODO@ What kind of concurrent testing are we going to do on the top-level API?
+    # @TODO@ What kind of concurrent testing are we going to do on the top-level API?
   end
-  
+
   def test_bad_input
-    #
-    # Check that new() is vetting things properly.
-    #
+    # 
+    #  Check that new() is vetting things properly.
+    # 
     Dnsruby.log.level=Logger::FATAL
     [:nameserver].each do |test|
 #      [{}, 'kjghdfkjhase',1,'\1',nil].each do |input|
@@ -96,7 +93,7 @@ class TestDNS < Test::Unit::TestCase
       end
     end
   end
-  
+
   def test_online
     res = DNS.new
     rrs = [
@@ -120,47 +117,47 @@ class TestDNS < Test::Unit::TestCase
       :type		=> Types.TXT,
       :name		=> 'txt.t.dnsruby.validation-test-servers.nominet.org.uk',
       :strings		=> ['Net-DNS']
-    }		
-    ]		
-    
+    }
+    ]
+
     rrs.each do |data|
       answer = res.getresource(data[:name], data[:type])
       assert(answer)
       assert_equal(answer.klass,    'IN',             'Class correct'           )
-      
+
       packet, queried_name = res.send_query(data[:name], data[:type])
-      
+
       assert(packet, "Got an answer for #{data[:name]} IN #{data[:type]}")
       assert_equal(1, packet.header.qdcount, 'Only one question')
       assert_equal(1, packet.header.ancount, 'Got single answer')
-      
+
       question = (packet.question)[0]
       answer   = (packet.answer)[0]
-      
+
       assert(question,                           'Got question'            )
       assert_equal(data[:name],  question.qname.to_s,  'Question has right name' )
       assert_equal(data[:name],  queried_name.to_s,  'queried_name has right name' )
       assert_equal(Types.new(data[:type]),  question.qtype,  'Question has right type' )
       assert_equal('IN',             question.qclass.string, 'Question has right class')
-      
+
       assert(answer)
       assert_equal(answer.klass,    'IN',             'Class correct'           )
-      
-      
-      data.keys.each do |meth| 
+
+
+      data.keys.each do |meth|
         if (meth == :type)
-          assert_equal(Types.new(data[meth]).to_s, answer.send(meth).to_s, "#{meth} correct (#{data[:name]})") 
-        else       
-          assert_equal(data[meth].to_s, answer.send(meth).to_s, "#{meth} correct (#{data[:name]})") 
+          assert_equal(Types.new(data[meth]).to_s, answer.send(meth).to_s, "#{meth} correct (#{data[:name]})")
+        else
+          assert_equal(data[meth].to_s, answer.send(meth).to_s, "#{meth} correct (#{data[:name]})")
         end
       end
     end # do
   end # test_online
-  
-  def test_search_query_reverse    
-    #
-    # test that getname() DTRT with reverse lookups
-    #
+
+  def test_search_query_reverse
+    # 
+    #  test that getname() DTRT with reverse lookups
+    # 
     tests = [
     {
       :ip => '198.41.0.4',
@@ -171,31 +168,31 @@ class TestDNS < Test::Unit::TestCase
       :host => 'h.root-servers.net',
     },
     ]
-    
+
     res = DNS.new
-    tests.each do |test| 
+    tests.each do |test|
       name = res.getname(test[:ip])
-      
+
       assert_instance_of(Name,name)
-      
+
       next unless name
-      
+
       assert_equal(name.to_s, test[:host], "getname(#{test[:ip]}) works")
     end # do
   end # test
-  
+
   def test_searchlist
     res = DNS.new(
                   :domain     => 't.dnsruby.validation-test-servers.nominet.org.uk',
     :search => ["t.dnsruby.validation-test-servers.nominet.org.uk", "dnsruby.validation-test-servers.nominet.org.uk"]
     )
-    
-    #
-    # test the send_query() appends the default domain and 
-    # searchlist correctly.
-    #
-    #@TODO@ Should really be done in Config test!
-    
+
+    # 
+    #  test the send_query() appends the default domain and
+    #  searchlist correctly.
+    # 
+    # @TODO@ Should really be done in Config test!
+
     tests = [
     {
       :method => 'search',
@@ -210,30 +207,30 @@ class TestDNS < Test::Unit::TestCase
       :name   => 'a'
     }
     ]
-    
+
     res.send_query("a.t.dnsruby.validation-test-servers.nominet.org.uk",  "A")
     res.config.ndots=2
-    
+
     tests.each do |test|
       method = test[:method]
-      
+
       if (method=="query")
         res.config.apply_search_list=false
       else
         res.config.apply_search_list=true
       end
-      
+
       ans, query = res.send_query(test[:name])
-      
+
       assert_instance_of(Message, ans)
-      
+
       assert_equal(1, ans.header.ancount, "Correct answer count (with persistent socket and #{method})")
-      
+
       a = ans.answer
-      
+
       assert_instance_of(RR::IN::A, a[0])
       assert_equal(a[0].name.to_s, 'a.t.dnsruby.validation-test-servers.nominet.org.uk',"Correct name (with persistent socket and #{method})")
     end
-    
+
   end
 end