dnsruby 1.55 → 1.56.0

data/test/tc_packet_unique_push.rb

@@ -1,46 +1,43 @@
-#--
-#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 TestPacketUniquePush < Test::Unit::TestCase
-  #  def test_packUniquePush
-  #    
-  #    
-  #    testProc('unique_push');
-  #  end
-  #  
-  ##  def test_packetSafePush
-  ##    begin
-  ##      testProc('safe_push');
-  ##      flunk("Shouldn't work!")
-  ##    rescue Exception
-  ##    end
-  ##  end
-  
-  #  def testProc (method)
+class TestPacketUniquePush < Minitest::Test
+  #   def test_packUniquePush
+  # 
+  # 
+  #     testProc('unique_push');
+  #   end
+  # 
+  # #  def test_packetSafePush
+  # #    begin
+  # #      testProc('safe_push');
+  # #      flunk("Shouldn't work!")
+  # #    rescue Exception
+  # #    end
+  # #  end
+
+  #   def testProc (method)
   def test_proc
     domain = 'example.com';
-    
+
     tests = [
-    [ 
+    [
     1,
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
@@ -50,26 +47,26 @@ class TestPacketUniquePush < Test::Unit::TestCase
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('bar.example.com 60 IN A 10.0.0.1'),
     ],
-    [ 
+    [
     1, # RFC 2136 section 1.1
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 90 IN A 10.0.0.1'),
     ],
-    [ 
+    [
     3,
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.2'),
     RR.create('foo.example.com 60 IN A 10.0.0.3'),
     ],
-    [ 
+    [
     3,
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.2'),
     RR.create('foo.example.com 60 IN A 10.0.0.3'),
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     ],
-    [ 
+    [
     3,
     RR.create('foo.example.com 60 IN A 10.0.0.1'),
     RR.create('foo.example.com 60 IN A 10.0.0.2'),
@@ -77,28 +74,28 @@ class TestPacketUniquePush < Test::Unit::TestCase
     RR.create('foo.example.com 60 IN A 10.0.0.4'),
     ],
     ]
-    
+
     methods = {
 		'add_answer'     => 'ancount',
 		'add_authority'  => 'nscount',
 		'add_additional' => 'arcount',
     }
-    
-    tests.each do | try |  
+
+    tests.each do | try |
       count = try.shift;
       rrs = try;
-      
+
       methods.each do |method, count_meth|
-        
+
         packet = Message.new(domain)
-        
+
         rrs.each do |rr|
           packet.send(method,rr)
         end
-        
+
         assert_equal(count, packet.header.send(count_meth), "#{method} right for #{rrs.inspect}");
         assert_equal(count, packet.header.send(count_meth), "#{method} right for #{rrs.inspect}");
-        
+
       end
     end
   end

data/test/tc_question.rb

@@ -1,54 +1,51 @@
-#--
-#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 TestQuestion < Test::Unit::TestCase
+class TestQuestion < Minitest::Test
   def test_question
     domain = "example.com"
     type = Types.MX
     klass = Classes.IN
-    
+
     q = Question.new(domain, type, klass)
     assert(q, "new() returned something")
     assert_equal(domain, q.qname.to_s, "qName()")
     assert_equal(type, q.qtype, "qType()")
     assert_equal(klass, q.qclass, "qClass()")
-    
-    #
-    # Check the aliases
-    #
+
+    # 
+    #  Check the aliases
+    # 
     assert_equal(q.zname.to_s,  domain, 'zName()'  );
     assert_equal(q.ztype,  type,   'zType()'  );
     assert_equal(q.zclass, klass,  'zClass()' );
-    
-    #
-    # Check that we can change stuff
-    #
+
+    # 
+    #  Check that we can change stuff
+    # 
     q.qname=('example.net');
     q.qtype=('A');
     q.qclass=('CH');
-    
+
     assert_equal('example.net', q.qname.to_s,  'qName()'  );
     assert_equal(q.qtype,  Types.A,           'qType()'  );
     assert_equal(q.qclass, Classes.CH,          'qClass()' );
-    
+
   end
 end

data/test/tc_queue.rb

@@ -1,23 +1,22 @@
-#--
-#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 'test/unit'
-require 'dnsruby'
+require_relative 'spec_helper'
 
-class TestQueue < Test::Unit::TestCase
+class TestQueue < Minitest::Test
   def test_queue
     q = Queue.new
     r = Dnsruby::Resolver.new

data/test/tc_recur.rb

@@ -1,23 +1,22 @@
-#--
-#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 'dnsruby'
-require 'test/unit'
+require_relative 'spec_helper'
 
-class TestRecur < Test::Unit::TestCase
+class TestRecur < Minitest::Test
   def test_recur
     Dnsruby::PacketSender.clear_caches
     r = Dnsruby::Recursor.new

data/test/tc_res_config.rb

@@ -1,53 +1,50 @@
-#--
-#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 TestResolverConfig < Test::Unit::TestCase
-  
+# --
+# 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 TestResolverConfig < Minitest::Test
+
   GoodInput = {
     "port"		  => 54,
     "src_address"        => '10.1.0.1',
     "src_address6"        => 'fc00::1:2:3',
     "src_port"        => 56453,
     "use_tcp"		   => true,
-    #	"stayopen"       => 1,
+    # 	"stayopen"       => 1,
     "ignore_truncation"          => true,
     "recurse"        => false,
     "packet_timeout"    => 5,
-    #	"dnssec"         => 1,
-    #	"force_v4"       => 1,
+    # 	"dnssec"         => 1,
+    # 	"force_v4"       => 1,
   };
-  
+
   ExtendedInput={
     "query_timeout"        => 30,
     "retry_delay"	       => 6,
     "retry_times"		   => 5,
   }
-  
+
   LookupInput={
     "domain"	       => 'dnsruby.rubyforge.org',
     "apply_search_list"         => false,
     "ndots"       => 4	,
     "apply_domain" => false
   }
-  
+
   def setup
     Dnsruby::Config.reset
   end
@@ -57,35 +54,35 @@ class TestResolverConfig < Test::Unit::TestCase
     assert(res, "new returned something");
     assert_instance_of(Dnsruby::Resolver, res, "new() returns an object of the correct class.");
 
-    #    assert(res.config.nameserver,       'nameserver() works');
-    
+    #     assert(res.config.nameserver,       'nameserver() works');
+
     searchlist = ["t.dnsruby.validation-test-servers.nominet.org.uk", "t2.dnsruby.validation-test-servers.nominet.org.uk"];
     assert_equal(res.config.search=searchlist, searchlist, 'setting searchlist returns correctly.');
     assert_equal(res.config.search,               searchlist, 'setting searchlist stickts.');
-    
-    
-    #~ #diag "\n\nIf you do not have Net::DNS::SEC installed you will see a warning.\n";
-    #~ #diag "It is safe to ignore this\n";
+
+
+    # ~ #diag "\n\nIf you do not have Net::DNS::SEC installed you will see a warning.\n";
+    # ~ #diag "It is safe to ignore this\n";
 
     (GoodInput.merge(ExtendedInput)).each do | param, value |
-      #      puts("Setting " + param);
+      #       puts("Setting " + param);
       res.send(param+"=", value)
       assert_equal(res.send(param), value,       "setting #param sticks");
     end;
-    
+
   end
-  
+
   def test_single_resolver
     [Dnsruby::SingleResolver.new({:nameserver => ["127.0.0.1"]}),
       Dnsruby::SingleResolver.new({:nameserver => ["::1"]})].each {|res|
       GoodInput.each do | param, value |
-        #      puts("Setting " + param);
+        #       puts("Setting " + param);
         res.send(param+"=", value)
         assert_equal(res.send(param), value,       "setting #param sticks");
       end;
     }
   end
-  
+
   def test_dns
     res = Dnsruby::DNS.new
     LookupInput.each do | param, value |
@@ -93,5 +90,5 @@ class TestResolverConfig < Test::Unit::TestCase
       assert_equal(res.config.send(param), value,       "setting #param sticks");
     end;
   end
-  
+
 end