dnsruby 1.55 → 1.56.0

data/test/tc_message.rb

@@ -0,0 +1,87 @@
+# --
+# 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 TestMessage < Minitest::Test
+
+  include Dnsruby
+
+  #  Creates and returns sample message:
+  # 
+  #  ;; QUESTION SECTION (1  record)
+  #  ;; cnn.com.	IN	A
+  #  ;; Security Level : UNCHECKED
+  #  ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 7195
+  #  ;; flags: ; QUERY: 1, ANSWER: 0, AUTHORITY: 0, ADDITIONAL: 0
+  def sample_message
+    Message.new('cnn.com', 'A')
+  end
+
+  def test_question_section_formatted_ok
+    multiline_regex = /QUESTION SECTION.+record.+cnn.com.\s+IN\s+A/m
+    assert multiline_regex.match(sample_message.to_s)
+  end
+
+  def test_has_security_level_line
+    line_regex = /^;; Security Level : .+/
+    assert line_regex.match(sample_message.to_s)
+  end
+
+  def test_has_flags_and_section_count
+    line_regex = /^;; flags:.+QUERY: \d+, ANSWER: \d+, AUTHORITY: \d+, ADDITIONAL: \d+/
+    assert line_regex.match(sample_message.to_s)
+  end
+
+  def test_rd_flag_displayed_when_true
+    message = sample_message
+    message.header.instance_variable_set(:@rd, true)
+    assert /;; flags(.+)rd/.match(message.to_s), message
+  end
+
+  def test_header_line_contains_opcode_and_status_and_id
+    message = sample_message
+    header_line = message.to_s.split("\n").grep(/->>HEADER<<-/).first
+    line_regex = /->>HEADER<<- opcode: .+, status: .+, id: \d+/
+    assert line_regex.match(header_line)
+  end
+
+  def test_getopt
+    message = sample_message
+    assert message.get_opt.nil?
+
+    #  Add an OPT record
+    opt = RR::OPT.new(4096, 32768)
+    message.additional << opt
+
+    opt = message.get_opt
+    assert opt.is_a?(Dnsruby::RR::OPT),
+           "Expected get_opt to return a Dnsruby::RR::OPT, but it returned a #{opt.class}"
+  end
+
+  def test_2eq
+    test = ->(msg1, msg2, expected_result) do
+      assert (msg1 == msg2) == expected_result
+    end
+    msg_a = sample_message
+    msg_b = sample_message; msg_b.header.rd = (! msg_b.header.rd)
+    test.(msg_a, msg_a, true)
+    test.(msg_a, msg_b, false)
+    test.(msg_a, msg_a.to_s, false)
+    test.(msg_a, nil, false)
+    #  TODO: Add more tests.
+  end
+end

data/test/tc_misc.rb

@@ -1,99 +1,95 @@
-#--
-#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 TestMisc < 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 TestMisc < Minitest::Test
   def test_wildcard
-    # test to make sure that wildcarding works.
-    #
+    #  test to make sure that wildcarding works.
+    # 
     rr = Dnsruby::RR.create('*.t.dnsruby.validation-test-servers.nominet.org.uk 60 IN A 10.0.0.1')
-    
+
     assert(rr, 'RR got made')
-    
+
     assert_equal('*.t.dnsruby.validation-test-servers.nominet.org.uk', rr.name.to_s,    'Name is correct'   )
     assert_equal(60,      rr.ttl,               'TTL is correct'    )
     assert_equal(Dnsruby::Classes.IN,   rr.klass,              'CLASS is correct'  )
     assert_equal(Dnsruby::Types.A,    rr.type,               'TYPE is correct'   )
     assert_equal('10.0.0.1', rr.address.to_s,        'Address is correct')
   end
-  
+
   def test_misc
-    
-    #
-    # Make sure the underscore in SRV hostnames work.
-    #
+
+    # 
+    #  Make sure the underscore in SRV hostnames work.
+    # 
     srv = Dnsruby::RR.create('_rvp._tcp.t.dnsruby.validation-test-servers.nominet.org.uk. 60 IN SRV 0 0 80 im.bastardsinc.biz')
-    
-    assert(!$@,  'No errors')
-    assert(srv, 'SRV got made')
-    
-    
-    #~ # Test that the 5.005 Use of uninitialized value at
-    #~ # /usr/local/lib/perl5/site_perl/5.005/Net/DNS/RR.pm line 639. bug is gone
+
+    assert(srv, 'SRV not created successfully')
+
+
+    # ~ # Test that the 5.005 Use of uninitialized value at
+    # ~ # /usr/local/lib/perl5/site_perl/5.005/Net/DNS/RR.pm line 639. bug is gone
     rr = Dnsruby::RR.create('mx.t.dnsruby.validation-test-servers.nominet.org.uk 60 IN MX 10 a.t.dnsruby.validation-test-servers.nominet.org.uk')
     assert(rr, 'RR created')
-    
+
     assert_equal(rr.preference, 10, 'Preference works')
-    
-    
-    
+
+
+
     mx = Dnsruby::RR.create('mx.t.dnsruby.validation-test-servers.nominet.org.uk 60 IN MX 0 mail.dnsruby.validation-test-servers.nominet.org.uk')
-    
+
     assert(mx.to_s =~ /0 mail.dnsruby.validation-test-servers.nominet.org.uk/) # was 'like'
     assert_equal(mx.preference, 0)
     assert_equal(mx.exchange.to_s, 'mail.dnsruby.validation-test-servers.nominet.org.uk')
-    
+
     srv = Dnsruby::RR.create('srv.t.dnsruby.validation-test-servers.nominet.org.uk 60 IN SRV 0 2 3 target.dnsruby.validation-test-servers.nominet.org.uk')
-    
+
 #    # @todo@ Absolute name issues
 #    assert(srv.inspect =~ /0 2 3 target.dnsruby.validation-test-servers.nominet.org.uk\./)
 #    assert_equal(srv.rdatastr, '0 2 3 target.dnsruby.validation-test-servers.nominet.org.uk.')
-    
-    
-    
+
+
+
   end
-  
+
   def test_TXT_RR
-    
-    #
-    #
-    # Below are some thests that have to do with TXT RRs 
-    #
-    #
-    
-    
-    # QUESTION SECTION:
-    #txt2.t.net-dns.org.		IN	TXT
-    
-    # ANSWER SECTION:
-    #txt2.t.net-dns.org.	60	IN	TXT	"Net-DNS\ complicated $tuff" "sort of \" text\ and binary \000 data"
-    
-    # AUTHORITY SECTION:
-    #net-dns.org.		3600	IN	NS	ns1.net-dns.org.
-    #net-dns.org.		3600	IN	NS	ns.ripe.net.
-    #net-dns.org.		3600	IN	NS	ns.hactrn.net.
-    
-    # ADDITIONAL SECTION:
-    #ns1.net-dns.org.	3600	IN	A	193.0.4.49
-    #ns1.net-dns.org.	3600	IN	AAAA
-    
+
+    # 
+    # 
+    #  Below are some thests that have to do with TXT RRs
+    # 
+    # 
+
+
+    #  QUESTION SECTION:
+    # txt2.t.net-dns.org.		IN	TXT
+
+    #  ANSWER SECTION:
+    # txt2.t.net-dns.org.	60	IN	TXT	"Net-DNS\ complicated $tuff" "sort of \" text\ and binary \000 data"
+
+    #  AUTHORITY SECTION:
+    # net-dns.org.		3600	IN	NS	ns1.net-dns.org.
+    # net-dns.org.		3600	IN	NS	ns.ripe.net.
+    # net-dns.org.		3600	IN	NS	ns.hactrn.net.
+
+    #  ADDITIONAL SECTION:
+    # ns1.net-dns.org.	3600	IN	A	193.0.4.49
+    # ns1.net-dns.org.	3600	IN	AAAA
+
     uuencodedPacket=%w{
 11 99 85 00 00 01
 00 01 00 03 00 02 04 74  78 74 32 01 74 07 6e 65
@@ -109,34 +105,34 @@ class TestMisc < Test::Unit::TestCase
 73 06 68 61 63 74 72 6e  c0 93 c0 79 00 01 00 01
 00 00 0e 10 00 04 c1 00  04 31 c0 79 00 1c 00 01
 00 00 0e 10 00 10 20 01  06 10 02 40 00 03 00 00
-12 34 be 21 e3 1e                               
+12 34 be 21 e3 1e
 }
-    
+
     uuencodedPacket.map!{|e| e.hex}
     packetdata = uuencodedPacket.pack('c*')
     packetdata.gsub!("\s*", "")
-    
+
     packet     = Dnsruby::Message.decode(packetdata)
     txtRr=(packet.answer)[0]
     assert_equal('Net-DNS; complicated $tuff',txtRr.strings[0],"First Char string in TXT RR read from wireformat")
-    
-    # Compare the second char_str this contains a NULL byte (space NULL
-    # space=200020 in hex)
-    
+
+    #  Compare the second char_str this contains a NULL byte (space NULL
+    #  space=200020 in hex)
+
     temp = (txtRr.strings)[1].unpack('H*')[0]
-    #    #assert_equal(unpack('H*',(TXTrr.char_str_list())[1]),"736f7274206f66202220746578743b20616e642062696e61727920002064617461", "Second Char string in TXT RR read from wireformat")
+    #     #assert_equal(unpack('H*',(TXTrr.char_str_list())[1]),"736f7274206f66202220746578743b20616e642062696e61727920002064617461", "Second Char string in TXT RR read from wireformat")
     assert_equal("736f7274206f66202220746578743b20616e642062696e61727920002064617461", temp,"Second Char string in TXT RR read from wireformat")
-    
-    
+
+
     txtRr2=Dnsruby::RR.create('txt2.t.dnsruby.validation-test-servers.nominet.org.uk.	60	IN	TXT  "Test1 \" \; more stuff"  "Test2"')
-    
+
     assert_equal((txtRr2.strings)[0],'Test1 " ; more stuff', "First arg string in TXT RR read from zonefileformat")
     assert_equal((txtRr2.strings)[1],'Test2',"Second Char string in TXT RR read from zonefileformat")
-    
-    
-    #    txtRr3   = RR.create("baz.example.com 3600 HS TXT '\"' 'Char Str2'")
+
+
+    #     txtRr3   = RR.create("baz.example.com 3600 HS TXT '\"' 'Char Str2'")
     txtRr3   = Dnsruby::RR.create("baz.example.com 3600 IN TXT '\"' 'Char Str2'")
-    
+
     assert_equal( (txtRr3.strings)[0],'"',"Escaped \" between the  single quotes")
   end
 end

data/test/tc_name.rb

@@ -1,84 +1,81 @@
-#--
-#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'
-include Dnsruby
-class TestName < Test::Unit::TestCase
-  def test_label_length
-    Name::Label.set_max_length(Name::Label::MaxLabelLength) # Other tests may have changed this  
-    # Test max label length = 63
-    begin
-      name = Name.create("a.b.12345678901234567890123456789012345678901234567890123456789012345.com")
-      assert(false, "Label of more than max=63 allowed")
-    rescue ResolvError
-    end
-  end
-  
-  def test_name_length
-    # Test max name length=255
-    begin
-      name = Name.create("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.com")
-      assert(false, "Name of length > 255 allowed")
-    rescue ResolvError
-    end
-  end
-  
-  def test_absolute
-    n = Name.create("example.com")
-    assert(!n.absolute?)
-    n = Name.create("example.com.")
-    assert(n.absolute?)
-  end
-
-  def test_wild
-    n = Name.create("example.com")
-    assert(!n.wild?)
-    n = Name.create("*.example.com.")
-    assert(n.wild?)
-  end
-
-  def test_canonical_ordering
-    names = []
-    names.push(Name.create("example"))
-    names.push(Name.create("a.example"))
-    names.push(Name.create("yljkjljk.a.example"))
-    names.push(Name.create("Z.a.example"))
-    names.push(Name.create("zABC.a.EXAMPLE"))
-    names.push(Name.create("z.example"))
-    names.push(Name.create("\001.z.example"))
-    names.push(Name.create("*.z.example"))
-#    names.push(Name.create("\200.z.example"))
-    names.push(Name.create(["c8"].pack("H*")+".z.example"))
-    names.each_index {|i|
-      if (i < (names.length() - 1))
-        assert(names[i].canonically_before(names[i+1]))
-        assert(!(names[i+1].canonically_before(names[i])))
-      end
-    }
-    assert(Name.create("x.w.example").canonically_before(Name.create("z.w.example")))
-    assert(Name.create("x.w.example").canonically_before(Name.create("a.z.w.example")))
-  end
-
-  def test_escapes
-    n1 = Name.create("\\nall.all.")
-    n2 = Name.create("nall.all.")
-    assert(n1 == n2, n1.to_s)
-  end
-end
+# --
+# 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 TestName < Minitest::Test
+  def test_label_length
+    Name::Label.set_max_length(Name::Label::MaxLabelLength) # Other tests may have changed this
+    #  Test max label length = 63
+    begin
+      name = Name.create("a.b.12345678901234567890123456789012345678901234567890123456789012345.com")
+      assert(false, "Label of more than max=63 allowed")
+    rescue ResolvError
+    end
+  end
+
+  def test_name_length
+    #  Test max name length=255
+    begin
+      name = Name.create("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123.com")
+      assert(false, "Name of length > 255 allowed")
+    rescue ResolvError
+    end
+  end
+
+  def test_absolute
+    n = Name.create("example.com")
+    assert(!n.absolute?)
+    n = Name.create("example.com.")
+    assert(n.absolute?)
+  end
+
+  def test_wild
+    n = Name.create("example.com")
+    assert(!n.wild?)
+    n = Name.create("*.example.com.")
+    assert(n.wild?)
+  end
+
+  def test_canonical_ordering
+    names = []
+    names.push(Name.create("example"))
+    names.push(Name.create("a.example"))
+    names.push(Name.create("yljkjljk.a.example"))
+    names.push(Name.create("Z.a.example"))
+    names.push(Name.create("zABC.a.EXAMPLE"))
+    names.push(Name.create("z.example"))
+    names.push(Name.create("\001.z.example"))
+    names.push(Name.create("*.z.example"))
+#    names.push(Name.create("\200.z.example"))
+    names.push(Name.create(["c8"].pack("H*")+".z.example"))
+    names.each_index {|i|
+      if (i < (names.length() - 1))
+        assert(names[i].canonically_before(names[i+1]))
+        assert(!(names[i+1].canonically_before(names[i])))
+      end
+    }
+    assert(Name.create("x.w.example").canonically_before(Name.create("z.w.example")))
+    assert(Name.create("x.w.example").canonically_before(Name.create("a.z.w.example")))
+  end
+
+  def test_escapes
+    n1 = Name.create("\\nall.all.")
+    n2 = Name.create("nall.all.")
+    assert(n1 == n2, n1.to_s)
+  end
+end