libxml-ruby 3.1.0 → 3.2.0

data/test/test_attributes.rb

@@ -1,10 +1,10 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class AttributesTest < Minitest::Test
   def setup
-    xp = XML::Parser.string(<<-EOS)
+    xp = LibXML::XML::Parser.string(<<-EOS)
     <CityModel name="value"
       xmlns="http://www.opengis.net/examples"
       xmlns:city="http://www.opengis.net/examples"
@@ -33,14 +33,14 @@ class AttributesTest < Minitest::Test
 
   def test_attributes
     attributes = city_member.attributes
-    assert_instance_of(XML::Attributes, attributes)
+    assert_instance_of(LibXML::XML::Attributes, attributes)
     assert_equal(5, attributes.length)
   end
 
   def test_each
     attributes = city_member.attributes
     length = attributes.inject(0) do |result, attr|
-      assert_instance_of(XML::Attr, attr)
+      assert_instance_of(LibXML::XML::Attr, attr)
       result + 1
     end
     assert_equal(5, length)
@@ -50,25 +50,25 @@ class AttributesTest < Minitest::Test
     attributes = city_member.attributes
 
     attr = attributes.get_attribute('name')
-    assert_instance_of(XML::Attr, attr)
+    assert_instance_of(LibXML::XML::Attr, attr)
 
     attr = attributes.get_attribute('does_not_exist')
     assert_nil(attr)
 
     attr = attributes.get_attribute('name')
-    assert_instance_of(XML::Attr, attr)
+    assert_instance_of(LibXML::XML::Attr, attr)
 
     attr = attributes.get_attribute('href')
-    assert_instance_of(XML::Attr, attr)
-    assert_instance_of(XML::Namespace, attr.ns)
+    assert_instance_of(LibXML::XML::Attr, attr)
+    assert_instance_of(LibXML::XML::Namespace, attr.ns)
     assert_equal('xlink', attr.ns.prefix)
     assert_equal('http://www.w3.org/1999/xlink', attr.ns.href)
 
     attr = attributes.get_attribute_ns('http://www.w3.org/1999/xlink', 'href')
-    assert_instance_of(XML::Attr, attr)
+    assert_instance_of(LibXML::XML::Attr, attr)
 
     attr = attributes.get_attribute_ns('http://www.opengis.net/gml', 'remoteSchema')
-    assert_instance_of(XML::Attr, attr)
+    assert_instance_of(LibXML::XML::Attr, attr)
 
     attr = attributes.get_attribute_ns('http://i.dont.exist', 'nor do i')
     assert_nil(attr)

data/test/test_canonicalize.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class TestCanonicalize < Minitest::Test
   def path(file)
@@ -9,7 +9,7 @@ class TestCanonicalize < Minitest::Test
   # (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 = XML::Document.file(self.path('c14n/given/example-1.xml'))
+    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'))
@@ -22,7 +22,7 @@ class TestCanonicalize < Minitest::Test
 
     # Without Comments (XML_C14N_1_1)
     expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-1'))
-    mode = XML::Document::XML_C14N_1_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
 
@@ -30,12 +30,12 @@ class TestCanonicalize < Minitest::Test
   # (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 = XML::Document.file(self.path('c14n/given/example-2.xml'))
+    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 = XML::Document::XML_C14N_1_1
+    mode = LibXML::XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end
 
@@ -45,24 +45,24 @@ class TestCanonicalize < Minitest::Test
   #   - 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 = XML::Document.file(self.path('c14n/given/example-3.xml'))
+    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 = XML::Document::XML_C14N_1_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.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 = XML::Document.file(self.path('c14n/given/example-4.xml'))
+    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 = XML::Document::XML_C14N_1_1
+    mode = LibXML::XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
   end
 
@@ -71,7 +71,7 @@ class TestCanonicalize < Minitest::Test
   # (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 = XML::Document.file(self.path('c14n/given/example-5.xml'))
+    #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'))
@@ -84,7 +84,7 @@ class TestCanonicalize < Minitest::Test
     # 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 = XML::Document::XML_C14N_1_1
+    #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))
@@ -93,20 +93,12 @@ class TestCanonicalize < Minitest::Test
   # (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 = XML::Document.file(self.path('c14n/given/example-6.xml'))
-    if defined?(Encoding)
-      expected = IO.read(self.path('c14n/result/without-comments/example-6'), :encoding => Encoding::UTF_8)
-    else
-      expected = IO.read(self.path('c14n/result/without-comments/example-6'))
-    end
+    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)
 
-    if defined?(Encoding)
-      expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'), :encoding => Encoding::UTF_8)
-    else
-      expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-6'))
-    end
-    mode = XML::Document::XML_C14N_1_1
+    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
 
@@ -114,7 +106,7 @@ class TestCanonicalize < Minitest::Test
   # http://www.w3.org/TR/xml-c14n#Example-DocSubsets
   def test_canonicalize_with_w3c_c14n_3_7
     # Non Canonicalized Document
-    # given_doc = XML::Document.file(self.path('c14n/given/example-7.xml'))
+    # 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')

data/test/test_deprecated_require.rb

@@ -4,9 +4,9 @@ require 'xml/libxml'
 
 class TestDeprecatedRequire < Minitest::Test
   def test_basic
-    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
-    assert_instance_of(XML::Parser, xp)
+    xp = LibXML::XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
+    assert_instance_of(LibXML::XML::Parser, xp)
     @doc = xp.parse
-    assert_instance_of(XML::Document, @doc)
+    assert_instance_of(LibXML::XML::Document, @doc)
   end
 end

data/test/test_document.rb

@@ -1,125 +1,131 @@
 # encoding: UTF-8
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class TestDocument < Minitest::Test
   def setup
-    xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
-    assert_instance_of(XML::Parser, xp)
+    xp = LibXML::XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
+    assert_instance_of(LibXML::XML::Parser, xp)
     @doc = xp.parse
-    assert_instance_of(XML::Document, @doc)
+    assert_instance_of(LibXML::XML::Document, @doc)
   end
 
   def teardown
     @doc = nil
   end
 
-  def test_klass
-    assert_instance_of(XML::Document, @doc)
-  end
-
-  def test_context
-    context = @doc.context
-    assert_instance_of(XML::XPath::Context, context)
-  end
-
-  def test_find
-    set = @doc.find('/ruby_array/fixnum')
-    assert_instance_of(XML::XPath::Object, set)
-    assert_raises(NoMethodError) {
-      set.xpath
-    }
-  end
-
-  def test_compression
-    if XML.enabled_zlib?
-      0.upto(9) do |i|
-        assert_equal(i, @doc.compression = i)
-        assert_equal(i, @doc.compression)
-      end
-
-      9.downto(0) do |i|
-        assert_equal(i, @doc.compression = i)
-        assert_equal(i, @doc.compression)
-      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(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
-        assert_equal(0, @doc.compression)
-      end
-    end
-  end
-
-  def test_version
-    assert_equal('1.0', @doc.version)
-
-    doc = XML::Document.new('6.9')
-    assert_equal('6.9', doc.version)
-  end
-
-  def test_write_root
-    @doc.root = XML::Node.new('rubynet')
-    assert_instance_of(XML::Node, @doc.root)
-    assert_instance_of(XML::Document, @doc.root.doc)
-    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n",
-                 @doc.to_s(:indent => false))
-  end
-
-  def test_doc_node_type
-    assert_equal(XML::Node::DOCUMENT_NODE, XML::Document.new.node_type)
-  end
-
-  def test_doc_node_type_name
-    assert_equal('document_xml', XML::Document.new.node_type_name)
-  end
-
-  def test_xhtml
-		doc = XML::Document.new
-		assert(!doc.xhtml?)
-    XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, doc, true
-		assert(doc.xhtml?)
-  end
-
-  def test_document_root
-    doc1 = LibXML::XML::Document.string("<one/>")
-    doc2 = LibXML::XML::Document.string("<two/>")
-
-    error = assert_raises(XML::Error) do
-      doc1.root = doc2.root
-    end
-    assert_equal(" Nodes belong to different documents.  You must first import the node by calling XML::Document.import.",
-                 error.to_s)
-
-    doc2.root << doc2.import(doc1.root)
-    assert_equal('<one/>', doc1.root.to_s)
-    assert_equal('<two><one/></two>', doc2.root.to_s(:indent => false))
-
-    assert(!doc1.root.equal?(doc2.root))
-    assert(doc1.root.doc != doc2.root.doc)
-  end
-
-  def test_import_node
-    doc1 = XML::Parser.string('<nums><one></one></nums>').parse
-    doc2 = XML::Parser.string('<nums><two></two></nums>').parse
-
-    node = doc1.root.child
-
-    error = assert_raises(XML::Error) do
-      doc2.root << node
-    end
-
-    assert_equal(" Nodes belong to different documents.  You must first import the node by calling XML::Document.import.",
-                 error.to_s)
-
-    doc2.root << doc2.import(node)
-
-    assert_equal("<nums><two/><one/></nums>",
-                 doc2.root.to_s(:indent => false))
+  # def test_klass
+  #   assert_instance_of(LibXML::XML::Document, @doc)
+  # end
+  #
+  # def test_context
+  #   context = @doc.context
+  #   assert_instance_of(LibXML::XML::XPath::Context, context)
+  # end
+  #
+  # def test_find
+  #   set = @doc.find('/ruby_array/fixnum')
+  #   assert_instance_of(LibXML::XML::XPath::Object, set)
+  #   assert_raises(NoMethodError) {
+  #     set.xpath
+  #   }
+  # end
+  #
+  # def test_compression
+  #   if LibXML::XML.enabled_zlib?
+  #     0.upto(9) do |i|
+  #       assert_equal(i, @doc.compression = i)
+  #       assert_equal(i, @doc.compression)
+  #     end
+  #
+  #     9.downto(0) do |i|
+  #       assert_equal(i, @doc.compression = i)
+  #       assert_equal(i, @doc.compression)
+  #     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(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
+  #       assert_equal(0, @doc.compression)
+  #     end
+  #   end
+  # end
+  #
+  # def test_version
+  #   assert_equal('1.0', @doc.version)
+  #
+  #   doc = LibXML::XML::Document.new('6.9')
+  #   assert_equal('6.9', doc.version)
+  # end
+  #
+  # def test_write_root
+  #   @doc.root = LibXML::XML::Node.new('rubynet')
+  #   assert_instance_of(LibXML::XML::Node, @doc.root)
+  #   assert_instance_of(LibXML::XML::Document, @doc.root.doc)
+  #   assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<rubynet/>\n",
+  #                @doc.to_s(:indent => false))
+  # end
+  #
+  # def test_doc_node_type
+  #   assert_equal(LibXML::XML::Node::DOCUMENT_NODE, LibXML::XML::Document.new.node_type)
+  # end
+  #
+  # def test_doc_node_type_name
+  #   assert_equal('document_xml', LibXML::XML::Document.new.node_type_name)
+  # end
+  #
+  # def test_xhtml
+	# 	doc = LibXML::XML::Document.new
+	# 	assert(!doc.xhtml?)
+  #   LibXML::XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, doc, true
+	# 	assert(doc.xhtml?)
+  # end
+  #
+  # def test_document_root
+  #   doc1 = LibXML::XML::Document.string("<one/>")
+  #   doc2 = LibXML::XML::Document.string("<two/>")
+  #
+  #   error = assert_raises(LibXML::XML::Error) do
+  #     doc1.root = doc2.root
+  #   end
+  #   assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
+  #                error.to_s)
+  #
+  #   doc2.root << doc2.import(doc1.root)
+  #   assert_equal('<one/>', doc1.root.to_s)
+  #   assert_equal('<two><one/></two>', doc2.root.to_s(:indent => false))
+  #
+  #   assert(!doc1.root.equal?(doc2.root))
+  #   assert(doc1.root.doc != doc2.root.doc)
+  # end
+  #
+  # def test_import_node
+  #   doc1 = LibXML::XML::Parser.string('<nums><one></one></nums>').parse
+  #   doc2 = LibXML::XML::Parser.string('<nums><two></two></nums>').parse
+  #
+  #   node = doc1.root.child
+  #
+  #   error = assert_raises(LibXML::XML::Error) do
+  #     doc2.root << node
+  #   end
+  #
+  #   assert_equal(" Nodes belong to different documents.  You must first import the node by calling LibXML::XML::Document.import.",
+  #                error.to_s)
+  #
+  #   doc2.root << doc2.import(node)
+  #
+  #   assert_equal("<nums><two/><one/></nums>",
+  #                doc2.root.to_s(:indent => false))
+  # end
+
+  def test_nonet
+    xml_string = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
+    xml = LibXML::XML::Document.string(xml_string, options: LibXML::XML::Parser::Options::NONET)
+    schema_document = LibXML::XML::Document.file('d:/src/libxml-ruby/test/model/atom.xml', options: LibXML::XML::Parser::Options::NONET)
   end
 end

data/test/test_document_write.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 require 'tmpdir'
 
 class TestDocumentWrite < Minitest::Test
@@ -8,56 +8,41 @@ class TestDocumentWrite < Minitest::Test
     @file_name = "model/bands.utf-8.xml"
 
     # Strip spaces to make testing easier
-    XML.default_keep_blanks = false
+    LibXML::XML.default_keep_blanks = false
     file = File.join(File.dirname(__FILE__), @file_name)
-    @doc = XML::Document.file(file)
+    @doc = LibXML::XML::Document.file(file)
   end
 
   def teardown
-    XML.default_keep_blanks = true
+    LibXML::XML.default_keep_blanks = true
     @doc = nil
   end
 
   # ---  to_s tests  ---
   def test_to_s_default
     # Default to_s has indentation
-    if defined?(Encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   @doc.to_s)
-    else
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   @doc.to_s)
-    end
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                 @doc.to_s)
   end
 
   def test_to_s_no_global_indentation
     # No indentation due to global setting
-    XML.indent_tree_output = false
+    LibXML::XML.indent_tree_output = false
     value = @doc.to_s
 
-    if defined?(Encoding)
-      assert_equal(Encoding::UTF_8, value.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n<iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   value)
-    else
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n<iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   value)
-    end
+    assert_equal(Encoding::UTF_8, value.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n<m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n<iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                 value)
   ensure
-    XML.indent_tree_output = true
+    LibXML::XML.indent_tree_output = true
   end
 
   def test_to_s_no_indentation
     # No indentation due to local setting
     value = @doc.to_s(:indent => false)
-    if defined?(Encoding)
-      assert_equal(Encoding::UTF_8, value.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                   value)
-    else
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                   value)
-    end
+    assert_equal(Encoding::UTF_8, value.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+                 value)
   end
 
   def test_to_s_encoding
@@ -66,28 +51,18 @@ class TestDocumentWrite < Minitest::Test
     # UTF8:
     # ö - c3 b6 in hex, \303\266 in octal
     # ü - c3 bc in hex, \303\274 in octal
-    value = @doc.to_s(:encoding => XML::Encoding::UTF_8)
-    if defined?(Encoding)
-      assert_equal(Encoding::UTF_8, value.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   value)
-    else
-      assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   value)
-    end
+    value = @doc.to_s(:encoding => LibXML::XML::Encoding::UTF_8)
+    assert_equal(Encoding::UTF_8, value.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                 value)
 
     # ISO_8859_1:
     # ö - f6 in hex, \366 in octal
     # ü - fc in hex, \374 in octal
-    value = @doc.to_s(:encoding => XML::Encoding::ISO_8859_1)
-    if defined?(Encoding)
-      assert_equal(Encoding::ISO8859_1, value.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
-                   @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
-    else
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">M\366tley Cr\374e is an American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                   @doc.to_s(:encoding => XML::Encoding::ISO_8859_1))
-    end
+    value = @doc.to_s(:encoding => LibXML::XML::Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO8859_1, value.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
+                 @doc.to_s(:encoding => LibXML::XML::Encoding::ISO_8859_1))
 
     # Invalid encoding
     error = assert_raises(ArgumentError) do
@@ -103,16 +78,10 @@ class TestDocumentWrite < Minitest::Test
     bytes = @doc.save(temp_filename)
     assert_equal(305, bytes)
 
-    if defined?(Encoding)
-      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
-      assert_equal(Encoding::UTF_8, contents.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                    contents)
-    else
-      contents = File.read(temp_filename)
-      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 contents)
-    end
+    contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
+    assert_equal(Encoding::UTF_8, contents.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\">\n  <m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
+                  contents)
   ensure
     File.delete(temp_filename)
   end
@@ -123,53 +92,35 @@ class TestDocumentWrite < Minitest::Test
     bytes = @doc.save(temp_filename, :indent => false)
     assert_equal(298, bytes)
 
-    if defined?(Encoding)
-      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
-      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                 contents)
-    else
-      contents = File.read(temp_filename)
-      assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\303\266tley_cr\303\274e country=\"us\">M\303\266tley Cr\303\274e is an American heavy metal band formed in Los Angeles, California in 1981.</m\303\266tley_cr\303\274e><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                 contents)
-    end
+    contents = File.read(temp_filename, nil, nil, :encoding => Encoding::UTF_8)
+    assert_equal("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<bands genre=\"metal\"><m\u00F6tley_cr\u00FCe country=\"us\">M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\u00F6tley_cr\u00FCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
+               contents)
   ensure
     File.delete(temp_filename)
   end
 
   def test_save_iso_8859_1
     temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1.xml")
-    bytes = @doc.save(temp_filename, :encoding => XML::Encoding::ISO_8859_1)
+    bytes = @doc.save(temp_filename, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     assert_equal(304, bytes)
 
-    if defined?(Encoding)
-      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
-      assert_equal(Encoding::ISO8859_1, contents.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
-                 contents)
-    else
-      contents = File.read(temp_filename)
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n",
-                 contents)
-    end
+    contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
+    assert_equal(Encoding::ISO8859_1, contents.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\">\n  <m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe>\n  <iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden>\n</bands>\n".force_encoding(Encoding::ISO8859_1),
+               contents)
   ensure
     File.delete(temp_filename)
   end
 
   def test_save_iso_8859_1_no_indent
     temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_iso_8859_1_no_indent.xml")
-    bytes = @doc.save(temp_filename, :indent => false, :encoding => XML::Encoding::ISO_8859_1)
+    bytes = @doc.save(temp_filename, :indent => false, :encoding => LibXML::XML::Encoding::ISO_8859_1)
     assert_equal(297, bytes)
 
-    if defined?(Encoding)
-      contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
-      assert_equal(Encoding::ISO8859_1, contents.encoding)
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n".force_encoding(Encoding::ISO8859_1),
-                   contents)
-    else
-      contents = File.read(temp_filename)
-      assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n",
-                   contents)
-    end
+    contents = File.read(temp_filename, nil, nil, :encoding => Encoding::ISO8859_1)
+    assert_equal(Encoding::ISO8859_1, contents.encoding)
+    assert_equal("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<bands genre=\"metal\"><m\xF6tley_cr\xFCe country=\"us\">M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.</m\xF6tley_cr\xFCe><iron_maiden country=\"uk\">Iron Maiden is a British heavy metal band formed in 1975.</iron_maiden></bands>\n".force_encoding(Encoding::ISO8859_1),
+                 contents)
   ensure
     File.delete(temp_filename)
   end