libxml-ruby 2.8.0 → 3.2.1

data/test/test_deprecated_require.rb

@@ -0,0 +1,12 @@
+# encoding: UTF-8
+
+require 'xml/libxml'
+
+class TestDeprecatedRequire < Minitest::Test
+  def test_basic
+    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(LibXML::XML::Document, @doc)
+  end
+end

data/test/{tc_document.rb → test_document.rb}

@@ -1,13 +1,12 @@
 # encoding: UTF-8
-require './test_helper'
-require 'test/unit'
+require_relative './test_helper'
 
-class TestDocument < Test::Unit::TestCase
+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
@@ -15,24 +14,24 @@ class TestDocument < Test::Unit::TestCase
   end
 
   def test_klass
-    assert_instance_of(XML::Document, @doc)
+    assert_instance_of(LibXML::XML::Document, @doc)
   end
 
   def test_context
     context = @doc.context
-    assert_instance_of(XML::XPath::Context, context)
+    assert_instance_of(LibXML::XML::XPath::Context, context)
   end
 
   def test_find
     set = @doc.find('/ruby_array/fixnum')
-    assert_instance_of(XML::XPath::Object, set)
-    assert_raise(NoMethodError) {
-      xpt = set.xpath
+    assert_instance_of(LibXML::XML::XPath::Object, set)
+    assert_raises(NoMethodError) {
+      set.xpath
     }
   end
 
   def test_compression
-    if XML.enabled_zlib?
+    if LibXML::XML.enabled_zlib?
       0.upto(9) do |i|
         assert_equal(i, @doc.compression = i)
         assert_equal(i, @doc.compression)
@@ -60,41 +59,41 @@ class TestDocument < Test::Unit::TestCase
   def test_version
     assert_equal('1.0', @doc.version)
 
-    doc = XML::Document.new('6.9')
+    doc = LibXML::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)
+    @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(XML::Node::DOCUMENT_NODE, XML::Document.new.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', XML::Document.new.node_type_name)
+    assert_equal('document_xml', LibXML::XML::Document.new.node_type_name)
   end
 
   def test_xhtml
-		doc = XML::Document.new
+		doc = LibXML::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
+    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
+  end
 
   def test_document_root
     doc1 = LibXML::XML::Document.string("<one/>")
     doc2 = LibXML::XML::Document.string("<two/>")
 
-    error = assert_raise(XML::Error) do
+    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 XML::Document.import.",
+    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)
@@ -106,16 +105,16 @@ class TestDocument < Test::Unit::TestCase
   end
 
   def test_import_node
-    doc1 = XML::Parser.string('<nums><one></one></nums>').parse
-    doc2 = XML::Parser.string('<nums><two></two></nums>').parse
+    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_raise(XML::Error) do
+    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 XML::Document.import.",
+    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)
@@ -123,4 +122,10 @@ class TestDocument < Test::Unit::TestCase
     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

@@ -0,0 +1,146 @@
+# encoding: UTF-8
+
+require_relative './test_helper'
+require 'tmpdir'
+
+class TestDocumentWrite < Minitest::Test
+  def setup
+    @file_name = "model/bands.utf-8.xml"
+
+    # Strip spaces to make testing easier
+    LibXML::XML.default_keep_blanks = false
+    file = File.join(File.dirname(__FILE__), @file_name)
+    @doc = LibXML::XML::Document.file(file)
+  end
+
+  def teardown
+    LibXML::XML.default_keep_blanks = true
+    @doc = nil
+  end
+
+  # ---  to_s tests  ---
+  def test_to_s_default
+    # Default to_s has indentation
+    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
+    LibXML::XML.indent_tree_output = false
+    value = @doc.to_s
+
+    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
+    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)
+    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
+    # Test encodings
+
+    # UTF8:
+    # ö - c3 b6 in hex, \303\266 in octal
+    # ü - c3 bc in hex, \303\274 in octal
+    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 => 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
+      @doc.to_s(:encoding => -9999)
+    end
+    assert_equal('Unknown encoding value: -9999', error.to_s)
+  end
+
+  # --- save tests -----
+  def test_save_utf8
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8.xml")
+
+    bytes = @doc.save(temp_filename)
+    assert_equal(305, bytes)
+
+    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
+
+  def test_save_utf8_no_indents
+    temp_filename = File.join(Dir.tmpdir, "tc_document_write_test_save_utf8_no_indents.xml")
+
+    bytes = @doc.save(temp_filename, :indent => false)
+    assert_equal(298, bytes)
+
+    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 => LibXML::XML::Encoding::ISO_8859_1)
+    assert_equal(304, bytes)
+
+    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 => LibXML::XML::Encoding::ISO_8859_1)
+    assert_equal(297, bytes)
+
+    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
+
+  def test_thread_set_root
+    # Previously a segmentation fault occurred when running libxml in
+    # background threads.
+    thread = Thread.new do
+      100000.times do |i|
+        document = LibXML::XML::Document.new
+        node = LibXML::XML::Node.new('test')
+        document.root = node
+      end
+    end
+    thread.join
+    assert(true)
+  end
+
+  # --- Debug ---
+  def test_debug
+    assert(@doc.debug)
+  end
+end

data/test/{tc_dtd.rb → test_dtd.rb}

@@ -1,12 +1,11 @@
 # encoding: UTF-8
 
-require './test_helper'
+require_relative './test_helper'
 
-require 'test/unit'
 
-class TestDtd < Test::Unit::TestCase
+class TestDtd < Minitest::Test
   def setup
-    xp = XML::Parser.string(<<-EOS)
+    xp = LibXML::XML::Parser.string(<<-EOS)
       <root>
         <head a="ee" id="1">Colorado</head>
         <descr>Lots of nice mountains</descr>
@@ -20,7 +19,7 @@ class TestDtd < Test::Unit::TestCase
   end
   
   def dtd
-    XML::Dtd.new(<<-EOS)
+    LibXML::XML::Dtd.new(<<-EOS)
       <!ELEMENT root (head, descr)>
       <!ELEMENT head (#PCDATA)>
       <!ATTLIST head
@@ -32,64 +31,64 @@ class TestDtd < Test::Unit::TestCase
   end
   
   def test_internal_subset
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, nil, true
+    xhtml_dtd = LibXML::XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil, nil, true
 		assert xhtml_dtd.name.nil?
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
 
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1", nil, true
+    xhtml_dtd = LibXML::XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1", nil, true
 		assert_equal "xhtml1", xhtml_dtd.name
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
+  end
 
   def test_external_subset
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", nil
+    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?
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
 
-    xhtml_dtd = XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1"
+    xhtml_dtd = LibXML::XML::Dtd.new "-//W3C//DTD XHTML 1.0 Transitional//EN", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", "xhtml1"
 		assert_equal "xhtml1", xhtml_dtd.name
 		assert_equal "-//W3C//DTD XHTML 1.0 Transitional//EN", xhtml_dtd.external_id
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.uri
 		assert_equal "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd", xhtml_dtd.system_id
-	end
+  end
 
   def test_valid
     assert(@doc.validate(dtd))
   end
 
   def test_node_type
-    assert_equal(XML::Node::DTD_NODE, dtd.node_type)
+    assert_equal(LibXML::XML::Node::DTD_NODE, dtd.node_type)
   end
 
   def test_invalid
-    new_node = XML::Node.new('invalid', 'this will mess up validation')
+    new_node = LibXML::XML::Node.new('invalid', 'this will mess up validation')
     @doc.root << new_node
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       @doc.validate(dtd)
     end
 
     # Check the error worked
-    assert_not_nil(error)
-    assert_kind_of(XML::Error, error)
+    refute_nil(error)
+    assert_kind_of(LibXML::XML::Error, error)
     assert_equal("Error: No declaration for element invalid.", error.message)
-    assert_equal(XML::Error::VALID, error.domain)
-    assert_equal(XML::Error::DTD_UNKNOWN_ELEM, error.code)
-    assert_equal(XML::Error::ERROR, error.level)
+    assert_equal(LibXML::XML::Error::VALID, error.domain)
+    assert_equal(LibXML::XML::Error::DTD_UNKNOWN_ELEM, error.code)
+    assert_equal(LibXML::XML::Error::ERROR, error.level)
     assert_nil(error.file)
     assert_nil(error.line)
     assert_equal('invalid', error.str1)
-    assert_equal('invalid', error.str2)
+    assert_nil(error.str2)
     assert_nil(error.str3)
     assert_equal(0, error.int1)
     assert_equal(0, error.int2)
-    assert_not_nil(error.node)
+    refute_nil(error.node)
     assert_equal('invalid', error.node.name)
   end
 
@@ -102,28 +101,28 @@ class TestDtd < Test::Unit::TestCase
     EOS
 
     errors = Array.new
-    XML::Error.set_handler do |error|
+    LibXML::XML::Error.set_handler do |error|
       errors << error
     end
 
-    XML.default_load_external_dtd = false
-    doc = XML::Parser.string(xml).parse
+    LibXML::XML.default_load_external_dtd = false
+    LibXML::XML::Parser.string(xml).parse
     assert_equal(0, errors.length)
 
     errors.clear
-    XML.default_load_external_dtd = true
-    doc = XML::Parser.string(xml).parse
+    LibXML::XML.default_load_external_dtd = true
+    LibXML::XML::Parser.string(xml).parse
     assert_equal(1, errors.length)
     assert_equal("Warning: failed to load external entity \"test.dtd\" at :1.",
                  errors[0].to_s)
 
     errors = Array.new
-    doc = XML::Parser.string(xml, :options => XML::Parser::Options::DTDLOAD).parse
+    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)
   ensure
-    XML.default_load_external_dtd = false
-    XML::Error.reset_handler
+    LibXML::XML.default_load_external_dtd = false
+    LibXML::XML::Error.reset_handler
   end
 end

data/test/{tc_encoding.rb → test_encoding.rb}

@@ -1,126 +1,129 @@
-# encoding: UTF-8
-
-require './test_helper'
-require 'test/unit'
-
-# Code  UTF8        Latin1      Hex
-# m      109          109        6D
-# ö      195 182      246        C3 B6 / F6
-# t      116          116        74
-# l      108          108        6C
-# e      101          101        65
-# y      121          121        79
-# _       95           95        5F
-# c       99           99        63
-# r      114          114        72
-# ü      195 188      252        C3 BC / FC
-# e      101          101        65
-
-# See:
-#  http://en.wikipedia.org/wiki/ISO/IEC_8859-1
-#  http://en.wikipedia.org/wiki/List_of_Unicode_characters
-
-class TestEncoding < Test::Unit::TestCase
-  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 load_encoding(encoding)
-    @encoding = encoding
-    file = file_for_encoding(encoding)
-
-    # Strip spaces to make testing easier
-    XML.default_keep_blanks = false
-    @doc = XML::Document.file(file)
-  end
-
-  def test_encoding
-    doc = XML::Document.new
-    assert_equal(XML::Encoding::NONE, doc.encoding)
-    assert_equal(Encoding::ASCII_8BIT, doc.rb_encoding) if defined?(Encoding)
-
-    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.xml'))
-    doc = XML::Document.file(file)
-    assert_equal(XML::Encoding::UTF_8, doc.encoding)
-    assert_equal(Encoding::UTF_8, doc.rb_encoding) if defined?(Encoding)
-
-    doc.encoding = XML::Encoding::ISO_8859_1
-    assert_equal(XML::Encoding::ISO_8859_1, doc.encoding)
-    assert_equal(Encoding::ISO8859_1, doc.rb_encoding) if defined?(Encoding)
-  end
-
-  def test_no_internal_encoding_iso_8859_1
-    Encoding.default_internal = nil
-    load_encoding(Encoding::ISO_8859_1)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::UTF_8, name.encoding)
-    assert_equal("m\u00F6tley_cr\u00FCe", name)
-    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.",
-                 node.content)
-
-    name = name.encode(Encoding::ISO_8859_1)
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
-                node.content.encode(Encoding::ISO_8859_1))
-  end
-
-  def test_internal_encoding_iso_8859_1
-    Encoding.default_internal = Encoding::ISO_8859_1
-    load_encoding(Encoding::ISO_8859_1)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
-                node.content.encode(Encoding::ISO_8859_1))
-  end
-
-  def test_no_internal_encoding_utf_8
-    Encoding.default_internal = nil
-    load_encoding(Encoding::UTF_8)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(@encoding, name.encoding)
-    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
-                 name.bytes.to_a.join(" "))
-
-    name = name.encode(Encoding::ISO_8859_1)
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-  end
-
-  def test_internal_encoding_utf_8
-    Encoding.default_internal = Encoding::ISO_8859_1
-    load_encoding(Encoding::UTF_8)
-    node = @doc.root.children.first
-
-    name = node.name
-    assert_equal(Encoding::ISO_8859_1, name.encoding)
-    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
-                 name.bytes.to_a.join(" "))
-  end
-
-  def test_encoding_conversions
-    assert_equal("UTF-8", XML::Encoding.to_s(XML::Encoding::UTF_8))
-    assert_equal(XML::Encoding::UTF_8, XML::Encoding.from_s("UTF-8"))
-  end
-end
+# encoding: UTF-8
+
+require_relative './test_helper'
+
+# Code  UTF8        Latin1      Hex
+# m      109          109        6D
+# ö      195 182      246        C3 B6 / F6
+# t      116          116        74
+# l      108          108        6C
+# e      101          101        65
+# y      121          121        79
+# _       95           95        5F
+# c       99           99        63
+# r      114          114        72
+# ü      195 188      252        C3 BC / FC
+# e      101          101        65
+
+# See:
+#  http://en.wikipedia.org/wiki/ISO/IEC_8859-1
+#  http://en.wikipedia.org/wiki/List_of_Unicode_characters
+
+class TestEncoding < Minitest::Test
+  def setup
+    @original_encoding = Encoding.default_internal
+    Encoding.default_internal = nil
+  end
+
+  def teardown
+    Encoding.default_internal = @original_encoding
+  end
+
+  def file_for_encoding(encoding)
+    file_name = "model/bands.#{encoding.name.downcase}.xml"
+    File.join(File.dirname(__FILE__), file_name)
+  end
+
+  def load_encoding(encoding)
+    @encoding = encoding
+    file = file_for_encoding(encoding)
+
+    # Strip spaces to make testing easier
+    LibXML::XML.default_keep_blanks = false
+    @doc = LibXML::XML::Document.file(file)
+    LibXML::XML.default_keep_blanks = true
+  end
+
+  def test_encoding
+    doc = LibXML::XML::Document.new
+    assert_equal(LibXML::XML::Encoding::NONE, doc.encoding)
+    assert_equal(Encoding::ASCII_8BIT, doc.rb_encoding)
+
+    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.xml'))
+    doc = LibXML::XML::Document.file(file)
+    assert_equal(LibXML::XML::Encoding::UTF_8, doc.encoding)
+    assert_equal(Encoding::UTF_8, doc.rb_encoding)
+
+    doc.encoding = LibXML::XML::Encoding::ISO_8859_1
+    assert_equal(LibXML::XML::Encoding::ISO_8859_1, doc.encoding)
+    assert_equal(Encoding::ISO8859_1, doc.rb_encoding)
+  end
+
+  def test_no_internal_encoding_iso_8859_1
+    load_encoding(Encoding::ISO_8859_1)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::UTF_8, name.encoding)
+    assert_equal("m\u00F6tley_cr\u00FCe", name)
+    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\u00F6tley Cr\u00FCe is an American heavy metal band formed in Los Angeles, California in 1981.",
+                 node.content)
+
+    name = name.encode(Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
+                node.content.encode(Encoding::ISO_8859_1))
+  end
+
+  def test_internal_encoding_iso_8859_1
+    Encoding.default_internal = Encoding::ISO_8859_1
+    load_encoding(Encoding::ISO_8859_1)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("m\xF6tley_cr\xFCe".force_encoding(Encoding::ISO_8859_1), name)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+    assert_equal("M\xF6tley Cr\xFCe is an American heavy metal band formed in Los Angeles, California in 1981.".force_encoding(Encoding::ISO_8859_1),
+                node.content.encode(Encoding::ISO_8859_1))
+  end
+
+  def test_no_internal_encoding_utf_8
+    load_encoding(Encoding::UTF_8)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(@encoding, name.encoding)
+    assert_equal("109 195 182 116 108 101 121 95 99 114 195 188 101",
+                 name.bytes.to_a.join(" "))
+
+    name = name.encode(Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+  end
+
+  def test_internal_encoding_utf_8
+    Encoding.default_internal = Encoding::ISO_8859_1
+    load_encoding(Encoding::UTF_8)
+    node = @doc.root.children.first
+
+    name = node.name
+    assert_equal(Encoding::ISO_8859_1, name.encoding)
+    assert_equal("109 246 116 108 101 121 95 99 114 252 101",
+                 name.bytes.to_a.join(" "))
+  end
+
+  def test_encoding_conversions
+    assert_equal("UTF-8", LibXML::XML::Encoding.to_s(LibXML::XML::Encoding::UTF_8))
+    assert_equal(LibXML::XML::Encoding::UTF_8, LibXML::XML::Encoding.from_s("UTF-8"))
+  end
+end