libxml-ruby 5.0.6 → 6.0.0

data/test/test_reader.rb

@@ -172,11 +172,42 @@ class TestReader < Minitest::Test
 
     # Read a node
     node = reader.expand
-    refute_nil(node.doc)
+    # node.doc is nil until reader.doc is called to wrap the document
+    assert_nil(node.doc)
     assert_equal('feed', node.name)
     assert_equal(::Encoding::UTF_8, node.name.encoding) if defined?(::Encoding)
   end
 
+  def test_expand_attribute_doc_requires_reader_doc
+    reader = LibXML::XML::Reader.string('<root a="1"/>')
+    reader.read
+
+    node = reader.expand
+    attr = node.attributes.get_attribute('a')
+
+    assert_nil(node.doc)
+    assert_nil(attr.doc)
+
+    doc = reader.doc
+    assert_same(doc, node.doc)
+    assert_same(doc, attr.doc)
+  ensure
+    begin
+      reader.doc if reader
+    rescue StandardError
+    end
+  end
+
+  def test_expand_attribute_doc
+    reader = LibXML::XML::Reader.string('<root a="1"/>')
+    reader.read
+
+    node = reader.expand
+    attr = node.attributes.get_attribute('a')
+
+    assert_nil(attr.doc)
+  end
+
   def test_expand_find
     reader = LibXML::XML::Reader.file(XML_FILE)
     reader.read.to_s
@@ -229,7 +260,6 @@ class TestReader < Minitest::Test
     while reader.read
       node = reader.expand
       refute_nil(node)
-      refute_nil(node.doc)
 
       # NOTE - DO NOT do this in real code, these nodes are invalid after the next read. This *will* cause
       # a segmentation fault next time the garbage collector runs.  The reason is the parent node will be
@@ -338,8 +368,7 @@ class TestReader < Minitest::Test
       reader.read
     end
 
-    assert_equal("Fatal error: Input is not proper UTF-8, indicate encoding !\nBytes: 0xF6 0x74 0x6C 0x65 at :2.",
-                 error.to_s)
+    assert_match(/Fatal error:.*at :2\./m, error.to_s)
 
   end
 
@@ -358,7 +387,27 @@ class TestReader < Minitest::Test
     reader = LibXML::XML::Reader.string(xml, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     reader.read
 
-    encoding = windows? ? LibXML::XML::Encoding::ISO_8859_1 : LibXML::XML::Encoding::NONE
-    assert_equal(reader.encoding, encoding)
+    if Gem::Version.new(LibXML::XML::LIBXML_VERSION) >= Gem::Version.new("2.12")
+      assert_equal(LibXML::XML::Encoding::ISO_8859_1, reader.encoding)
+    else
+      assert_equal(LibXML::XML::Encoding::NONE, reader.encoding)
+    end
+  end
+
+  def test_expand_gc_after_advance
+    GC.stress = true
+    expand_and_advance
+  ensure
+    GC.stress = false
+  end
+
+  private
+
+  def expand_and_advance
+    reader = LibXML::XML::Reader.string("<root><a/><b/></root>")
+    reader.read # root
+    reader.read # a
+    reader.expand
+    reader.next
   end
 end

data/test/test_relaxng.rb

@@ -1,53 +1,59 @@
-# encoding: UTF-8
-
-require_relative './test_helper'
-
-
-class TestRelaxNG < Minitest::Test
-  def setup
-    file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
-    @doc = LibXML::XML::Document.file(file)
-  end
-  
-  def teardown
-    @doc = nil
-  end
-  
-  def relaxng
-    document = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.rng'))
-    LibXML::XML::RelaxNG.document(document)
-  end
-
-  def test_from_doc
-    assert_instance_of(LibXML::XML::RelaxNG, relaxng)
-  end
-  
-  def test_valid
-    assert(@doc.validate_relaxng(relaxng))
-  end
-  
-  def test_invalid
-    new_node = LibXML::XML::Node.new('invalid', 'this will mess up validation')
-    @doc.root << new_node
-    
-    error = assert_raises(LibXML::XML::Error) do
-      @doc.validate_relaxng(relaxng)
-    end
-
-    refute_nil(error)
-    assert_kind_of(LibXML::XML::Error, error)
-    assert(error.message.match(/Error: Did not expect element invalid there/))
-    assert_equal(LibXML::XML::Error::RELAXNGV, error.domain)
-    assert_equal(LibXML::XML::Error::LT_IN_ATTRIBUTE, error.code)
-    assert_equal(LibXML::XML::Error::ERROR, error.level)
-    assert(error.file.match(/shiporder\.xml/))
-    assert_nil(error.line)
-    assert_equal('invalid', error.str1)
-    assert_nil(error.str2)
-    assert_nil(error.str3)
-    assert_equal(0, error.int1)
-    assert_equal(0, error.int2)
-    refute_nil(error.node)
-    assert_equal('invalid', error.node.name)
-  end
-end
+# encoding: UTF-8
+
+require_relative './test_helper'
+
+
+class TestRelaxNG < Minitest::Test
+  def setup
+    file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
+    @doc = LibXML::XML::Document.file(file)
+  end
+  
+  def teardown
+    @doc = nil
+  end
+  
+  def relaxng
+    document = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.rng'))
+    LibXML::XML::RelaxNG.document(document)
+  end
+
+  def test_from_doc
+    assert_instance_of(LibXML::XML::RelaxNG, relaxng)
+  end
+  
+  def test_valid
+    assert(@doc.validate_relaxng(relaxng))
+  end
+  
+  def test_parse_failure_raises
+    assert_raises(LibXML::XML::Error) do
+      LibXML::XML::RelaxNG.new("<invalid/>")
+    end
+  end
+
+  def test_invalid
+    new_node = LibXML::XML::Node.new('invalid', 'this will mess up validation')
+    @doc.root << new_node
+    
+    error = assert_raises(LibXML::XML::Error) do
+      @doc.validate_relaxng(relaxng)
+    end
+
+    refute_nil(error)
+    assert_kind_of(LibXML::XML::Error, error)
+    assert(error.message.match(/Error: Did not expect element invalid there/))
+    assert_equal(LibXML::XML::Error::RELAXNGV, error.domain)
+    assert_equal(LibXML::XML::Error::LT_IN_ATTRIBUTE, error.code)
+    assert_equal(LibXML::XML::Error::ERROR, error.level)
+    assert(error.file.match(/shiporder\.xml/))
+    assert_nil(error.line)
+    assert_equal('invalid', error.str1)
+    assert_nil(error.str2)
+    assert_nil(error.str3)
+    assert_equal(0, error.int1)
+    assert_equal(0, error.int2)
+    refute_nil(error.node)
+    assert_equal('invalid', error.node.name)
+  end
+end