libxml-ruby 5.0.6 → 6.0.0

data/test/test_canonicalize.rb

@@ -1,120 +1,122 @@
-# encoding: UTF-8
-require_relative './test_helper'
-
-class TestCanonicalize < Minitest::Test
-  def path(file)
-    File.join(File.dirname(__FILE__), file)
-  end
-  
-  # (www.w3.org) 3.1 PIs, Comments, and Outside of Document Element
-  # http://www.w3.org/TR/xml-c14n#Example-OutsideDoc
-  def test_canonicalize_with_w3c_c14n_3_1
-    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-1.xml'))
-
-    # With Comments
-    expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-1'))
-    assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
-
-    # Without Comments
-    expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-1'))
-    assert_equal(expected_without_comments, given_doc.canonicalize)
-    assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
-
-    # Without Comments (XML_C14N_1_1)
-    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-1'))
-    mode = LibXML::XML::Document::XML_C14N_1_1
-    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end#test_canonicalize_with_w3c_c14n_3_1
-
-
-  # (www.w3.org) 3.2 Whitespace in Document Content
-  # http://www.w3.org/TR/xml-c14n#Example-WhitespaceInContent
-  def test_canonicalize_with_w3c_c14n_3_2
-    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-2.xml'))
-    expected = IO.read(self.path('c14n/result/without-comments/example-2'))
-    assert_equal(expected, given_doc.canonicalize)
-
-    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-2'))
-    mode = LibXML::XML::Document::XML_C14N_1_1
-    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end
-
-  # (www.w3.org) 3.3 Start and End Tags
-  # http://www.w3.org/TR/xml-c14n#Example-SETags
-  # (2012-02-20) Test failing due to missing 'attr' in 'e9' node.
-  #   - Embedded DTD not parsed out of XML, therefore default attributes are
-  #     not applied to canonicalization.
-  def test_canonicalize_with_w3c_c14n_3_3
-    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-3.xml'))
-    expected = IO.read(self.path('c14n/result/without-comments/example-3'))
-    assert_equal(expected, given_doc.canonicalize)
-
-    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-3'))
-    mode = LibXML::XML::Document::XML_C14N_1_1
-    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end
-
-  # (www.w3.org) 3.4 Character Modifications and Character References
-  # http://www.w3.org/TR/xml-c14n#Example-Chars
-  def test_canonicalize_with_w3c_c14n_3_4
-    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-4.xml'))
-    expected = IO.read(self.path('c14n/result/without-comments/example-4'))
-    assert_equal(expected, given_doc.canonicalize)
-
-    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-4'))
-    mode = LibXML::XML::Document::XML_C14N_1_1
-    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end
-
-  # (www.w3.org) 3.5 Entity References
-  # http://www.w3.org/TR/xml-c14n#Example-Entities
-  # (2012-02-20) Failing likely due to a logic error
-  #   - libxml2(c14n.c:1788) XML_ENTITY_REF_NODE is invalid node for parsing.
-  def test_canonicalize_with_w3c_c14n_3_5
-    #given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-5.xml'))
-
-    # With Comments
-    #expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-5'))
-
-    # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
-    #assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
-
-    # Without Comments
-    #expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-5'))
-    # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
-    #assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
-    #expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-5'))
-    #mode = LibXML::XML::Document::XML_C14N_1_1
-
-    # TODO - CANNOT COMPLETE TEST unless libxml2 supports additional node types.
-    #assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end
-
-  # (www.w3.org) 3.6 UTF-8 Encoding
-  # http://www.w3.org/TR/xml-c14n#Example-UTF8
-  def test_canonicalize_with_w3c_c14n_3_6
-    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-6.xml'))
-    expected = IO.read(self.path('c14n/result/without-comments/example-6'), :encoding => Encoding::UTF_8)
-    assert_equal(expected, given_doc.canonicalize)
-
-    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'), :encoding => Encoding::UTF_8)
-    mode = LibXML::XML::Document::XML_C14N_1_1
-    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end
-
-  # (www.w3.org) 3.7 Document Subsets
-  # http://www.w3.org/TR/xml-c14n#Example-DocSubsets
-  def test_canonicalize_with_w3c_c14n_3_7
-    # Non Canonicalized Document
-    # given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-7.xml'))
-    #expected = IO.read(self.path('c14n/result/without-comments/example-7'))
-
-    # e1_node = given_doc.find_first('ietf:e1', 'ietf:http://www.ietf.org')
-
-    # Select current node, all child nodes, all attributes and namespace nodes
-    #subdoc_nodes = e1_node.find("(.//.|.//@id|namespace::*)")
-
-    # TODO - This fails because the namespace nodes aren't taken into account
-    # assert_equal(expected, given_doc.canonicalize(:nodes => subdoc_nodes))
-  end
-end
+# encoding: UTF-8
+require_relative './test_helper'
+
+class TestCanonicalize < Minitest::Test
+  def path(file)
+    File.join(File.dirname(__FILE__), file)
+  end
+  
+  # (www.w3.org) 3.1 PIs, Comments, and Outside of Document Element
+  # http://www.w3.org/TR/xml-c14n#Example-OutsideDoc
+  def test_canonicalize_with_w3c_c14n_3_1
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-1.xml'))
+
+    # With Comments
+    expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-1'))
+    assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
+
+    # Without Comments
+    expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-1'))
+    assert_equal(expected_without_comments, given_doc.canonicalize)
+    assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
+
+    # Without Comments (XML_C14N_1_1)
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-1'))
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.2 Whitespace in Document Content
+  # http://www.w3.org/TR/xml-c14n#Example-WhitespaceInContent
+  def test_canonicalize_with_w3c_c14n_3_2
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-2.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-2'))
+    assert_equal(expected, given_doc.canonicalize)
+
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-2'))
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.3 Start and End Tags
+  # http://www.w3.org/TR/xml-c14n#Example-SETags
+  # (2012-02-20) Test failing due to missing 'attr' in 'e9' node.
+  #   - Embedded DTD not parsed out of XML, therefore default attributes are
+  #     not applied to canonicalization.
+  def test_canonicalize_with_w3c_c14n_3_3
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-3.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-3'))
+    assert_equal(expected, given_doc.canonicalize)
+
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-3'))
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.4 Character Modifications and Character References
+  # http://www.w3.org/TR/xml-c14n#Example-Chars
+  def test_canonicalize_with_w3c_c14n_3_4
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-4.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-4'))
+    assert_equal(expected, given_doc.canonicalize)
+
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-4'))
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.5 Entity References
+  # http://www.w3.org/TR/xml-c14n#Example-Entities
+  def test_canonicalize_with_w3c_c14n_3_5
+    # NOENT resolves entity references, DTDLOAD loads the external entity
+    options = LibXML::XML::Parser::Options::NOENT | LibXML::XML::Parser::Options::DTDLOAD
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-5.xml'), options: options)
+
+    # With Comments
+    expected_with_comments = IO.read(self.path('c14n/result/with-comments/example-5'))
+    assert_equal(expected_with_comments, given_doc.canonicalize(:comments => true))
+
+    # Without Comments
+    expected_without_comments = IO.read(self.path('c14n/result/without-comments/example-5'))
+    assert_equal(expected_without_comments, given_doc.canonicalize(:comments => false))
+
+    # Without Comments (XML_C14N_1_1)
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-5'))
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.6 UTF-8 Encoding
+  # http://www.w3.org/TR/xml-c14n#Example-UTF8
+  def test_canonicalize_with_w3c_c14n_3_6
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-6.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-6'), :encoding => Encoding::UTF_8)
+    assert_equal(expected, given_doc.canonicalize)
+
+    expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'), :encoding => Encoding::UTF_8)
+    mode = LibXML::XML::Document::XML_C14N_1_1
+    assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
+  end
+
+  # (www.w3.org) 3.7 Document Subsets
+  # http://www.w3.org/TR/xml-c14n#Example-DocSubsets
+  def test_canonicalize_with_w3c_c14n_3_7
+    # Parse with DTDATTR and DTDLOAD so default attributes and ID types
+    # from the internal DTD subset are materialized
+    options = LibXML::XML::Parser::Options::DTDATTR | LibXML::XML::Parser::Options::DTDLOAD
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-7.xml'),
+                                           options: options)
+    expected = IO.read(self.path('c14n/result/without-comments/example-7'))
+
+    ctx = given_doc.context
+    ctx.register_namespace('ietf', 'http://www.ietf.org')
+
+    # W3C C14N spec example 3.7 XPath expression for document subsets
+    subdoc_nodes = ctx.find(
+      "(//. | //@* | //namespace::*)" \
+      "[self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2))" \
+      " or count(id('E3')|ancestor-or-self::node()) = count(ancestor-or-self::node())]")
+
+    assert_equal(expected, given_doc.canonicalize(:nodes => subdoc_nodes))
+  end
+end

data/test/test_document.rb

@@ -43,14 +43,12 @@ class TestDocument < Minitest::Test
       end
 
       10.upto(20) do |i|
-        # assert_equal(9, @doc.compression = i)
-        assert_equal(i, @doc.compression = i) # This works around a bug in Ruby 1.8
+        assert_equal(i, @doc.compression = i)
         assert_equal(9, @doc.compression)
       end
 
       -1.downto(-10) do |i|
-        # assert_equal(0, @doc.compression = i)
-        assert_equal(i, @doc.compression = i) # FIXME This bug should get fixed ASAP
+        @doc.compression = i
         assert_equal(0, @doc.compression)
       end
     end

data/test/test_dtd.rb

@@ -44,6 +44,16 @@ class TestDtd < Minitest::Test
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
   end
 
+  def test_internal_subset_nil_ids
+    doc = LibXML::XML::Document.new
+    doc.root = LibXML::XML::Node.new('test')
+    dtd = LibXML::XML::Dtd.new(nil, nil, 'test', doc, true)
+    assert_equal('test', dtd.name)
+    assert_nil(dtd.external_id)
+    assert_nil(dtd.uri)
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE test>\n<test/>\n", doc.to_s)
+  end
+
   def test_external_subset
     xhtml_dtd = LibXML::XML::Dtd.new("-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil)
 		assert xhtml_dtd.name.nil?
@@ -112,14 +122,12 @@ class TestDtd < Minitest::Test
     errors.clear
     LibXML::XML::Parser.string(xml, options: LibXML::XML::Parser::Options::DTDLOAD).parse
     assert_equal(1, errors.length)
-    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
-                 errors[0].to_s)
+    assert_match(/Warning: failed to load.*test\.dtd/, errors[0].to_s)
 
     errors = Array.new
     LibXML::XML::Parser.string(xml, :options => LibXML::XML::Parser::Options::DTDLOAD).parse
     assert_equal(1, errors.length)
-    assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
-                 errors[0].to_s)
+    assert_match(/Warning: failed to load.*test\.dtd/, errors[0].to_s)
   ensure
     LibXML::XML::Error.reset_handler
   end

data/test/test_encoding_sax.rb

@@ -1,115 +1,115 @@
-# encoding: UTF-8
-require_relative './test_helper'
-
-class SaxEncodingCallbacks
-  attr_reader :encoding
-  attr_accessor :assertions
-  include Minitest::Assertions
-
-  def initialize
-    @assertions = 0
-    @encoding = Encoding::UTF_8
-  end
-
-  # Called for a CDATA block event.
-  def on_cdata_block(cdata)
-    assert_equal(self.encoding, cdata.encoding)
-  end
-
-  # Called for a characters event.
-  def on_characters(chars)
-    assert_equal(self.encoding, chars.encoding)
-  end
-
-  # Called for a comment event.
-  def on_comment(msg)
-    assert_equal(self.encoding, msg.encoding)
-  end
-
-  # Called for a end document event.
-  def on_end_document
-  end
-
-  # Called for a end element event.
-  def on_end_element_ns(name, prefix, uri)
-    assert_equal(self.encoding, name.encoding)
-    assert_equal(self.encoding, prefix.encoding) if prefix
-    assert_equal(self.encoding, uri.encoding) if uri
-  end
-
-  # Called for parser errors.
-  def on_error(msg)
-    assert_equal(self.encoding, msg.encoding)
-  end
-
-  # Called for an external subset event.
-  def on_external_subset(name, external_id, system_id)
-    assert_equal(self.encoding, name.encoding)
-    assert_equal(self.encoding, external_id.encoding)
-    assert_equal(self.encoding, system_id.encoding)
-  end
-
-  # Called for an external subset notification event.
-  def on_has_external_subset
-  end
-
-  # Called for an internal subset notification event.
-  def on_has_internal_subset
-  end
-
-  # Called for an internal subset event.
-  def on_internal_subset(name, external_id, system_id)
-    assert_equal(self.encoding, name.encoding)
-    assert_equal(self.encoding, external_id.encoding)
-    assert_equal(self.encoding, system_id.encoding)
-  end
-
-  # Called for 'is standalone' event.
-  def on_is_standalone
-  end
-
-  # Called for an processing instruction event.
-  def on_processing_instruction(target, data)
-    assert_equal(self.encoding, target.encoding)
-    assert_equal(self.encoding, data.encoding)
-  end
-
-  # Called for a reference event.
-  def on_reference(name)
-    assert_equal(self.encoding, name.encoding)
-  end
-
-  # Called for a start document event.
-  def on_start_document
-  end
-
-  # Called for a start element event.
-  def on_start_element_ns(name, attributes, prefix, uri, namespaces)
-    assert_equal(self.encoding, name.encoding) if name
-    assert_equal(self.encoding, prefix.encoding) if prefix
-    assert_equal(self.encoding, uri.encoding) if uri
-  end
-end
-
-class TestEncodingSax < Minitest::Test
-  def setup
-    Encoding.default_internal = nil
-  end
-
-  def file_for_encoding(encoding)
-    file_name = "model/bands.#{encoding.name.downcase}.xml"
-    File.join(File.dirname(__FILE__), file_name)
-  end
-
-  def test_encoding_iso_8859_1
-    parser = LibXML::XML::SaxParser.file(file_for_encoding(Encoding::ISO_8859_1))
-    parser.callbacks = SaxEncodingCallbacks.new
-    parser.parse
-  end
-
-  def test_encoding_utf8
-    parser = LibXML::XML::SaxParser.file(file_for_encoding(Encoding::UTF_8))
-    parser.callbacks = SaxEncodingCallbacks.new
-    parser.parse
-  end
+# encoding: UTF-8
+require_relative './test_helper'
+
+class SaxEncodingCallbacks
+  attr_reader :encoding
+  attr_accessor :assertions
+  include Minitest::Assertions
+
+  def initialize
+    @assertions = 0
+    @encoding = Encoding::UTF_8
+  end
+
+  # Called for a CDATA block event.
+  def on_cdata_block(cdata)
+    assert_equal(self.encoding, cdata.encoding)
+  end
+
+  # Called for a characters event.
+  def on_characters(chars)
+    assert_equal(self.encoding, chars.encoding)
+  end
+
+  # Called for a comment event.
+  def on_comment(msg)
+    assert_equal(self.encoding, msg.encoding)
+  end
+
+  # Called for a end document event.
+  def on_end_document
+  end
+
+  # Called for a end element event.
+  def on_end_element_ns(name, prefix, uri)
+    assert_equal(self.encoding, name.encoding)
+    assert_equal(self.encoding, prefix.encoding) if prefix
+    assert_equal(self.encoding, uri.encoding) if uri
+  end
+
+  # Called for parser errors.
+  def on_error(msg)
+    assert_equal(self.encoding, msg.encoding)
+  end
+
+  # Called for an external subset event.
+  def on_external_subset(name, external_id, system_id)
+    assert_equal(self.encoding, name.encoding)
+    assert_equal(self.encoding, external_id.encoding)
+    assert_equal(self.encoding, system_id.encoding)
+  end
+
+  # Called for an external subset notification event.
+  def on_has_external_subset
+  end
+
+  # Called for an internal subset notification event.
+  def on_has_internal_subset
+  end
+
+  # Called for an internal subset event.
+  def on_internal_subset(name, external_id, system_id)
+    assert_equal(self.encoding, name.encoding)
+    assert_equal(self.encoding, external_id.encoding)
+    assert_equal(self.encoding, system_id.encoding)
+  end
+
+  # Called for 'is standalone' event.
+  def on_is_standalone
+  end
+
+  # Called for an processing instruction event.
+  def on_processing_instruction(target, data)
+    assert_equal(self.encoding, target.encoding)
+    assert_equal(self.encoding, data.encoding)
+  end
+
+  # Called for a reference event.
+  def on_reference(name)
+    assert_equal(self.encoding, name.encoding)
+  end
+
+  # Called for a start document event.
+  def on_start_document
+  end
+
+  # Called for a start element event.
+  def on_start_element_ns(name, attributes, prefix, uri, namespaces)
+    assert_equal(self.encoding, name.encoding) if name
+    assert_equal(self.encoding, prefix.encoding) if prefix
+    assert_equal(self.encoding, uri.encoding) if uri
+  end
+end
+
+class TestEncodingSax < Minitest::Test
+  def setup
+    Encoding.default_internal = nil
+  end
+
+  def file_for_encoding(encoding)
+    file_name = "model/bands.#{encoding.name.downcase}.xml"
+    File.join(File.dirname(__FILE__), file_name)
+  end
+
+  def test_encoding_iso_8859_1
+    parser = LibXML::XML::SaxParser.file(file_for_encoding(Encoding::ISO_8859_1))
+    parser.callbacks = SaxEncodingCallbacks.new
+    parser.parse
+  end
+
+  def test_encoding_utf8
+    parser = LibXML::XML::SaxParser.file(file_for_encoding(Encoding::UTF_8))
+    parser.callbacks = SaxEncodingCallbacks.new
+    parser.parse
+  end
 end

data/test/test_error.rb

@@ -154,7 +154,7 @@ class TestError < Minitest::Test
   end
 
   def test_double_parse_register_handler
-    LibXML::XML::Parser.register_error_handler(lambda {|msg| nil })
+    LibXML::XML::Error.set_handler {|msg| nil }
     parser = LibXML::XML::Parser.string("<test>something</test>")
     parser.parse
 

data/test/test_html_parser.rb

@@ -21,7 +21,7 @@ class HTMLParserTest < Minitest::Test
       LibXML::XML::HTMLParser.file('i_dont_exist.xml')
     end
 
-    assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.to_s)
+    assert_match(/Warning: failed to load.*i_dont_exist\.xml/, error.to_s)
   end
 
   def test_nil_file
@@ -141,7 +141,11 @@ class HTMLParserTest < Minitest::Test
     html = "hello world"
     parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOIMPLIED)
     doc = parser.parse
-    assert_equal("<p>#{html}</p>", doc.root.to_s)
+    if Gem::Version.new(LibXML::XML::LIBXML_VERSION) >= Gem::Version.new("2.14")
+      assert_nil(doc.root)
+    else
+      assert_equal("<p>#{html}</p>", doc.root.to_s)
+    end
   end
 
   def test_comment

data/test/test_html_parser_context.rb

@@ -1,23 +1,23 @@
-# encoding: UTF-8
-
-require_relative './test_helper'
-
-
-class TestHtmlParserContext < Minitest::Test
-  def test_default_options
-    context = LibXML::XML::HTMLParser::Context.new
-    assert_equal(0, context.options)
-  end
-
-  def test_no_options
-    context = LibXML::XML::HTMLParser::Context.new
-    context.options = 0
-    assert_equal(0, context.options)
-  end
-
-  def test_options
-    context = LibXML::XML::HTMLParser::Context.new
-    context.options = LibXML::XML::HTMLParser::Options::NOERROR
-    assert_equal(LibXML::XML::HTMLParser::Options::NOERROR, context.options)
-  end
+# encoding: UTF-8
+
+require_relative './test_helper'
+
+
+class TestHtmlParserContext < Minitest::Test
+  def test_default_options
+    context = LibXML::XML::HTMLParser::Context.new
+    assert_equal(0, context.options)
+  end
+
+  def test_no_options
+    context = LibXML::XML::HTMLParser::Context.new
+    context.options = 0
+    assert_equal(0, context.options)
+  end
+
+  def test_options
+    context = LibXML::XML::HTMLParser::Context.new
+    context.options = LibXML::XML::HTMLParser::Options::NOERROR
+    assert_equal(LibXML::XML::HTMLParser::Options::NOERROR, context.options)
+  end
 end

data/test/test_input_callbacks.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+require_relative './test_helper'
+
+class InputCallbacksGCStressRepro
+  def run
+    scheme_name = 'input-callback-gc://'
+
+    callback_class = Class.new do
+      def self.document_query(_uri)
+        '<root/>'
+      end
+    end
+    LibXML::XML::InputCallbacks.add_scheme(scheme_name, callback_class)
+    callback_class = nil
+
+    document = LibXML::XML::Document.file("#{scheme_name}fixture.xml")
+    document.root.name
+  ensure
+    LibXML::XML::InputCallbacks.remove_scheme(scheme_name)
+  end
+end
+
+class TestInputCallbacks < Minitest::Test
+  def setup
+    GC.stress = true
+  end
+
+  def teardown
+    GC.stress = false
+  end
+
+  def test_add_scheme_auto_registers_and_survives_gc_stress
+    assert_equal('root', InputCallbacksGCStressRepro.new.run)
+  end
+end

data/test/test_namespace.rb

@@ -31,7 +31,7 @@ class TestNS < Minitest::Test
     error = assert_raises(TypeError) do
       LibXML::XML::Namespace.new(nil, 'my_namepace', 'http://www.mynamespace.com')
     end
-    assert_equal('wrong argument type nil (expected Data)', error.to_s)
+    assert_match(/wrong argument type nil/, error.to_s)
   end
 
   def test_duplicate_ns