libxml-ruby 3.1.0 → 3.2.0

data/test/test_relaxng.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 
 class TestRelaxNG < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
-    @doc = XML::Document.file(file)
+    @doc = LibXML::XML::Document.file(file)
   end
   
   def teardown
@@ -14,12 +14,12 @@ class TestRelaxNG < Minitest::Test
   end
   
   def relaxng
-    document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.rng'))
-    XML::RelaxNG.document(document)
+    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(XML::RelaxNG, relaxng)
+    assert_instance_of(LibXML::XML::RelaxNG, relaxng)
   end
   
   def test_valid
@@ -27,19 +27,19 @@ class TestRelaxNG < Minitest::Test
   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_raises(XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       @doc.validate_relaxng(relaxng)
     end
 
     refute_nil(error)
-    assert_kind_of(XML::Error, error)
+    assert_kind_of(LibXML::XML::Error, error)
     assert(error.message.match(/Error: Did not expect element invalid there/))
-    assert_equal(XML::Error::RELAXNGV, error.domain)
-    assert_equal(XML::Error::LT_IN_ATTRIBUTE, error.code)
-    assert_equal(XML::Error::ERROR, error.level)
+    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)

data/test/test_sax_parser.rb

@@ -1,16 +1,16 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 require 'stringio'
 
 class DocTypeCallback
-  include XML::SaxParser::Callbacks
+  include LibXML::XML::SaxParser::Callbacks
   def on_start_element(element, attributes)
   end
 end
 
 class TestCaseCallbacks
-  include XML::SaxParser::Callbacks
+  include LibXML::XML::SaxParser::Callbacks
 
   attr_accessor :result
 
@@ -119,20 +119,20 @@ class TestSaxParser < Minitest::Test
   end
 
   def test_file
-    parser = XML::SaxParser.file(saxtest_file)
+    parser = LibXML::XML::SaxParser.file(saxtest_file)
     parser.callbacks = TestCaseCallbacks.new
     parser.parse
     verify(parser)
   end
 
   def test_file_no_callbacks
-    parser = XML::SaxParser.file(saxtest_file)
+    parser = LibXML::XML::SaxParser.file(saxtest_file)
     assert_equal true, parser.parse
   end
 
   def test_noexistent_file
-    error = assert_raises(XML::Error) do
-      XML::SaxParser.file('i_dont_exist.xml')
+    error = assert_raises(LibXML::XML::Error) do
+      LibXML::XML::SaxParser.file('i_dont_exist.xml')
     end
 
     assert_equal('Warning: failed to load external entity "i_dont_exist.xml".', error.to_s)
@@ -140,7 +140,7 @@ class TestSaxParser < Minitest::Test
 
   def test_nil_file
     error = assert_raises(TypeError) do
-      XML::SaxParser.file(nil)
+      LibXML::XML::SaxParser.file(nil)
     end
 
     assert_match(/nil into String/, error.to_s)
@@ -148,7 +148,7 @@ class TestSaxParser < Minitest::Test
 
   def test_io
     File.open(saxtest_file) do |file|
-      parser = XML::SaxParser.io(file)
+      parser = LibXML::XML::SaxParser.io(file)
       parser.callbacks = TestCaseCallbacks.new
       parser.parse
       verify(parser)
@@ -157,7 +157,7 @@ class TestSaxParser < Minitest::Test
 
   def test_nil_io
     error = assert_raises(TypeError) do
-      XML::HTMLParser.io(nil)
+      LibXML::XML::HTMLParser.io(nil)
     end
 
     assert_equal("Must pass in an IO object", error.to_s)
@@ -165,13 +165,13 @@ class TestSaxParser < Minitest::Test
 
   def test_string_no_callbacks
     xml = File.read(saxtest_file)
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     assert_equal true, parser.parse
   end
 
   def test_string
     xml = File.read(saxtest_file)
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
     parser.parse
     verify(parser)
@@ -180,7 +180,7 @@ class TestSaxParser < Minitest::Test
   def test_string_io
     xml = File.read(saxtest_file)
     io = StringIO.new(xml)
-    parser = XML::SaxParser.io(io)
+    parser = LibXML::XML::SaxParser.io(io)
     
     parser.callbacks = TestCaseCallbacks.new
     parser.parse
@@ -189,7 +189,7 @@ class TestSaxParser < Minitest::Test
 
   def test_nil_string
     error = assert_raises(TypeError) do
-      XML::SaxParser.string(nil)
+      LibXML::XML::SaxParser.string(nil)
     end
 
     assert_equal("wrong argument type nil (expected String)", error.to_s)
@@ -203,7 +203,7 @@ class TestSaxParser < Minitest::Test
 <a>a1</a>
 </Results>
 EOS
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     parser.callbacks = DocTypeCallback.new
     doc = parser.parse
     refute_nil(doc)
@@ -217,7 +217,7 @@ EOS
 <Test/>
 EOS
 
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
 
     parser.parse
@@ -239,10 +239,10 @@ EOS
     xml = <<-EOS
       <Results>
     EOS
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
 
-    error = assert_raises(XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       parser.parse
     end
 
@@ -254,21 +254,21 @@ EOS
     assert_equal("start_element: Results, attr: {}", result[i+=1])
     assert_equal("start_element_ns: Results, attr: {}, prefix: , uri: , ns: {}", result[i+=1])
     assert_equal("characters: \n", result[i+=1])
-    assert_equal("error: Fatal error: Premature end of data in tag Results line 1 at :2.", result[i+=1])
+    assert_equal("error: Fatal error: EndTag: '</' not found at :2.", result[i+=1])
     assert_equal("end_document", result[i+=1])
 
     refute_nil(error)
-    assert_kind_of(XML::Error, error)
-    assert_equal("Fatal error: Premature end of data in tag Results line 1 at :2.", error.message)
-    assert_equal(XML::Error::PARSER, error.domain)
-    assert_equal(XML::Error::TAG_NOT_FINISHED, error.code)
-    assert_equal(XML::Error::FATAL, error.level)
+    assert_kind_of(LibXML::XML::Error, error)
+    assert_equal("Fatal error: EndTag: '</' not found at :2.", error.message)
+    assert_equal(LibXML::XML::Error::PARSER, error.domain)
+    assert_equal(LibXML::XML::Error::LTSLASH_REQUIRED, error.code)
+    assert_equal(LibXML::XML::Error::FATAL, error.level)
     assert_nil(error.file)
     assert_equal(2, error.line)
-    assert_equal('Results', error.str1)
+    assert_nil(error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)
-    assert_equal(1, error.int1)
+    assert_equal(0, error.int1)
     assert_equal(1, error.int2)
     assert_nil(error.node)
   end
@@ -305,10 +305,10 @@ EOS
       </Products>
     EOS
 
-    parser = XML::SaxParser.string(xml)
+    parser = LibXML::XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
 
-    error = assert_raises(XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       parser.parse
     end
     assert_equal("Fatal error: xmlParseEntityRef: no name at :5.", error.to_s)

data/test/test_schema.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class TestSchema < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
-    @doc = XML::Document.file(file)
+    @doc = LibXML::XML::Document.file(file)
   end
 
   def teardown
@@ -13,17 +13,17 @@ class TestSchema < Minitest::Test
   end
 
   def schema
-    document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
-    XML::Schema.document(document)
+    document = LibXML::XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
+    LibXML::XML::Schema.document(document)
   end
 
   def check_error(error)
     refute_nil(error)
     assert(error.message.match(/Error: Element 'invalid': This element is not expected. Expected is \( item \)/))
-    assert_kind_of(XML::Error, error)
-    assert_equal(XML::Error::SCHEMASV, error.domain)
-    assert_equal(XML::Error::SCHEMAV_ELEMENT_CONTENT, error.code)
-    assert_equal(XML::Error::ERROR, error.level)
+    assert_kind_of(LibXML::XML::Error, error)
+    assert_equal(LibXML::XML::Error::SCHEMASV, error.domain)
+    assert_equal(LibXML::XML::Error::SCHEMAV_ELEMENT_CONTENT, error.code)
+    assert_equal(LibXML::XML::Error::ERROR, error.level)
     assert(error.file.match(/shiporder.xml/)) if error.file
     assert_nil(error.str1)
     assert_nil(error.str2)
@@ -33,7 +33,7 @@ class TestSchema < Minitest::Test
   end
 
   def test_load_from_doc
-    assert_instance_of(XML::Schema, schema)
+    assert_instance_of(LibXML::XML::Schema, schema)
   end
 
   def test_doc_valid
@@ -41,10 +41,10 @@ class TestSchema < Minitest::Test
   end
 
   def test_doc_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_raises(XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       @doc.validate_schema(schema)
     end
 
@@ -55,7 +55,7 @@ class TestSchema < Minitest::Test
   end
 
   def test_reader_valid
-    reader = XML::Reader.string(@doc.to_s)
+    reader = LibXML::XML::Reader.string(@doc.to_s)
     assert(reader.schema_validate(schema))
 
     while reader.read
@@ -65,13 +65,13 @@ class TestSchema < Minitest::Test
   def test_reader_invalid
     # Set error handler
     errors = Array.new
-    XML::Error.set_handler do |error|
+    LibXML::XML::Error.set_handler do |error|
       errors << error
     end
 
-    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
-    reader = XML::Reader.string(@doc.to_s)
+    reader = LibXML::XML::Reader.string(@doc.to_s)
 
     # Set a schema
     assert(reader.schema_validate(schema))
@@ -85,7 +85,7 @@ class TestSchema < Minitest::Test
     check_error(error)
     assert_equal(21, error.line)
   ensure
-    XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
+    LibXML::XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
   end
 
 
@@ -93,19 +93,19 @@ class TestSchema < Minitest::Test
   def test_elements
     assert_instance_of(Hash, schema.elements)
     assert_equal(1, schema.elements.length)
-    assert_instance_of(XML::Schema::Element, schema.elements['shiporder'])
+    assert_instance_of(LibXML::XML::Schema::Element, schema.elements['shiporder'])
   end
 
   def test_types
     assert_instance_of(Hash, schema.types)
     assert_equal(1, schema.types.length)
-    assert_instance_of(XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
   end
 
   def test_imported_types
     assert_instance_of(Hash, schema.imported_types)
     assert_equal(1, schema.imported_types.length)
-    assert_instance_of(XML::Schema::Type, schema.types['shiporder'])
+    assert_instance_of(LibXML::XML::Schema::Type, schema.types['shiporder'])
   end
 
   def test_namespaces
@@ -119,11 +119,11 @@ class TestSchema < Minitest::Test
     assert_equal('shiporder', type.name)
     assert_nil(type.namespace)
     assert_equal("Shiporder type documentation", type.annotation)
-    assert_instance_of(XML::Node, type.node)
-    assert_equal(XML::Schema::Types::XML_SCHEMA_TYPE_COMPLEX, type.kind)
-    assert_instance_of(XML::Schema::Type, type.base)
+    assert_instance_of(LibXML::XML::Node, type.node)
+    assert_equal(LibXML::XML::Schema::Types::XML_SCHEMA_TYPE_COMPLEX, type.kind)
+    assert_instance_of(LibXML::XML::Schema::Type, type.base)
     assert_equal("anyType", type.base.name)
-    assert_equal(XML::Schema::Types::XML_SCHEMA_TYPE_BASIC, type.base.kind)
+    assert_equal(LibXML::XML::Schema::Types::XML_SCHEMA_TYPE_BASIC, type.base.kind)
 
     assert_instance_of(Hash, type.elements)
     assert_equal(3, type.elements.length)
@@ -149,7 +149,7 @@ class TestSchema < Minitest::Test
 
     assert_instance_of(Array, type.attributes)
     assert_equal(2, type.attributes.length)
-    assert_instance_of(XML::Schema::Attribute, type.attributes.first)
+    assert_instance_of(LibXML::XML::Schema::Attribute, type.attributes.first)
   end
 
   def test_schema_attribute

data/test/test_suite.rb

@@ -40,10 +40,9 @@ require './test_xpath_context'
 require './test_xpath_expression'
 require './test_xpointer'
 
-if defined?(Encoding)
-  require './test_encoding'
-  require './test_encoding_sax'
-end
+require './test_encoding'
+require './test_encoding_sax'
+
 # Compatibility
 require './test_properties'
 require './test_deprecated_require'

data/test/test_traversal.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 
 class TestTranversal < Minitest::Test
   ROOT_NODES_LENGTH = 27
@@ -8,7 +8,7 @@ class TestTranversal < Minitest::Test
   
   def setup
     filename = File.join(File.dirname(__FILE__), 'model/books.xml')
-    @doc = XML::Document.file(filename)
+    @doc = LibXML::XML::Document.file(filename)
   end
   
   def teardown
@@ -143,10 +143,10 @@ class TestTranversal < Minitest::Test
   end
 
   def test_doc_class
-    assert_instance_of(XML::Document, @doc)
+    assert_instance_of(LibXML::XML::Document, @doc)
   end
   
   def test_root_class
-    assert_instance_of(XML::Node, @doc.root)
+    assert_instance_of(LibXML::XML::Node, @doc.root)
   end
 end

data/test/test_writer.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require File.expand_path('../test_helper', __FILE__)
+require_relative './test_helper'
 require 'stringio'
 
 class TestWriter < Minitest::Test
@@ -8,32 +8,32 @@ class TestWriter < Minitest::Test
   XSL_URI = 'http://www.w3.org/1999/XSL/Transform'
 
   def test_generic_failure
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     writer.start_document
     assert(!writer.end_element)
     writer.end_document
   end
 
   def test_empty_doc
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer
     assert_equal(writer.result.strip!, '<?xml version="1.0"?>')
 
-    writer = XML::Writer.string
-    document writer, { :encoding => XML::Encoding::ISO_8859_1 }
+    writer = LibXML::XML::Writer.string
+    document writer, { :encoding => LibXML::XML::Encoding::ISO_8859_1 }
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1"?>')
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer, { :standalone => 1 }
     assert_equal(writer.result.strip!, '<?xml version="1.0" standalone="yes"?>')
 
-    writer = XML::Writer.string
-    document writer, { :standalone => 1, :encoding => XML::Encoding::ISO_8859_1, :foo => :bar }
+    writer = LibXML::XML::Writer.string
+    document writer, { :standalone => 1, :encoding => LibXML::XML::Encoding::ISO_8859_1, :foo => :bar }
     assert_equal(writer.result.strip!, '<?xml version="1.0" encoding="ISO-8859-1" standalone="yes"?>')
   end
 
   def test_single_root
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root'
     end
@@ -44,7 +44,7 @@ class TestWriter < Minitest::Test
   def test_pi
     expected = "<?xml version=\"1.0\"?>\n<?php echo \"foo\";?>"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_pi('php'))
       assert(writer.write_string('echo "foo";'))
@@ -52,7 +52,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.write_pi('php', 'echo "foo";'))
     end
@@ -62,7 +62,7 @@ class TestWriter < Minitest::Test
   def test_comment
     expected = "<?xml version=\"1.0\"?>\n<!--foo-->"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_comment)
       assert(writer.write_string 'foo')
@@ -70,7 +70,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.write_comment 'foo')
     end
@@ -80,7 +80,7 @@ class TestWriter < Minitest::Test
   def test_cdata
     expected = "<?xml version=\"1.0\"?>\n<root><![CDATA[<?php echo $foo; ?>]]></root>"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         assert(writer.start_cdata)
@@ -90,7 +90,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         assert(writer.write_cdata '<?php echo $foo; ?>')
@@ -100,13 +100,13 @@ class TestWriter < Minitest::Test
   end
 
   def test_write_empty_elements
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.write_element 'foo')
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<foo/>")
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.write_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
     end
@@ -116,7 +116,7 @@ class TestWriter < Minitest::Test
   def test_valued_element
     expected = "<?xml version=\"1.0\"?>\n<abc>123<def>456<ghi>789</ghi>cueillir des cerises</def>nous irons au bois</abc>"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
@@ -132,7 +132,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_element 'abc')
         assert(writer.write_string '123')
@@ -156,7 +156,7 @@ class TestWriter < Minitest::Test
       "</xsl:attribute-set>" +
       "</xsl:stylesheet>"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
@@ -171,7 +171,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       assert(writer.start_element_ns XSL_PREFIX, 'stylesheet', XSL_URI)
         assert(writer.start_element_ns XSL_PREFIX, 'attribute-set')
@@ -184,7 +184,7 @@ class TestWriter < Minitest::Test
   end
 
   def test_attribute
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         element writer, 'child' do
@@ -196,7 +196,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<root><child foo=\"bar\"/></root>")
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         element writer, 'child' do
@@ -211,7 +211,7 @@ class TestWriter < Minitest::Test
   def test_attribute_ns
     expected = "<?xml version=\"1.0\"?>\n<root><link xlink:href=\"abc\" xhtml:class=\"def\"/></root>"
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         element writer, 'link' do
@@ -222,7 +222,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result.strip!, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     document writer do
       element writer, 'root' do
         element writer, 'link' do
@@ -239,8 +239,8 @@ class TestWriter < Minitest::Test
   end
 
   def test_quote_char
-    if XML::Writer.method_defined? :set_quote_char
-      writer = XML::Writer.string
+    if LibXML::XML::Writer.method_defined? :set_quote_char
+      writer = LibXML::XML::Writer.string
       writer.set_quote_char "'"
       document writer do
         element writer, 'root' do
@@ -254,8 +254,8 @@ class TestWriter < Minitest::Test
   end
 
   def test_indentation_on
-    if XML::Writer.method_defined? :set_indent
-      writer = XML::Writer.string
+    if LibXML::XML::Writer.method_defined? :set_indent
+      writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
       document writer do
         element writer, 'root' do
@@ -271,8 +271,8 @@ class TestWriter < Minitest::Test
   end
 
   def test_indentation_string
-    if XML::Writer.method_defined? :set_indent_string
-      writer = XML::Writer.string
+    if LibXML::XML::Writer.method_defined? :set_indent_string
+      writer = LibXML::XML::Writer.string
       assert(writer.set_indent true)
       assert(writer.set_indent_string ' ' * 4)
       document writer do
@@ -289,11 +289,11 @@ class TestWriter < Minitest::Test
   end
 
   def test_dtd_declaration
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html'
     assert_equal(writer.result, '<!DOCTYPE html>')
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html', '-//W3C//DTD XHTML 1.0 Strict//EN', 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'
     assert_equal(writer.result, '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">')
   end
@@ -301,7 +301,7 @@ class TestWriter < Minitest::Test
   def test_dtd_attlist
     expected = '<!DOCTYPE http [<!ATTLIST method (get|post) "get">]>'
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'http' do
       assert(writer.start_dtd_attlist 'method')
         assert(writer.write_string '(get|post) "get"')
@@ -309,7 +309,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'http' do
       assert(writer.write_dtd_attlist 'method', '(get|post) "get"')
     end
@@ -319,7 +319,7 @@ class TestWriter < Minitest::Test
   def test_dtd_element
     expected = '<!DOCTYPE html [<!ELEMENT dl (dt|dd)+>]>'
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.start_dtd_element 'dl')
         assert(writer.write_string '(dt|dd)+')
@@ -327,7 +327,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.write_dtd_element 'dl', '(dt|dd)+')
     end
@@ -338,7 +338,7 @@ class TestWriter < Minitest::Test
     # parameterized entity
     expected = '<!DOCTYPE html [<!ENTITY % special.pre "br | span | bdo | map"><!ENTITY % special "%special.pre; | object | img">]>'
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.start_dtd_entity 'special.pre', true)
         assert(writer.write_string 'br | span | bdo | map')
@@ -349,7 +349,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.write_dtd_internal_entity 'special.pre', 'br | span | bdo | map', true)
       assert(writer.write_dtd_internal_entity 'special', '%special.pre; | object | img', true)
@@ -359,7 +359,7 @@ class TestWriter < Minitest::Test
     # non parameterized entity
     expected = '<!DOCTYPE html [<!ENTITY Alpha "&#913;">]>'
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.start_dtd_entity 'Alpha')
         assert(writer.write_string '&#913;')
@@ -367,7 +367,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.start_dtd_entity 'Alpha', false)
         assert(writer.write_string '&#913;')
@@ -375,7 +375,7 @@ class TestWriter < Minitest::Test
     end
     assert_equal(writer.result, expected)
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.write_dtd_internal_entity 'Alpha', '&#913;', false)
     end
@@ -383,7 +383,7 @@ class TestWriter < Minitest::Test
   end
 
   def test_dtd_notation
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'pictures' do
       assert(writer.write_dtd_notation 'GIF89a', '-//Compuserve//NOTATION Graphics Interchange Format 89a//EN', nil)
       assert(writer.write_dtd_external_entity 'pictures', nil, 'images/plage.gif', 'GIF89a', false)
@@ -392,19 +392,17 @@ class TestWriter < Minitest::Test
   end
 
   def test_encoding
-    if defined?(Encoding)
-      iso = 'éloïse'.encode 'ISO-8859-1'
+    iso = 'éloïse'.encode 'ISO-8859-1'
 
-      writer = XML::Writer.string
-      document writer do
-        assert(writer.write_element iso)
-      end
-      assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<éloïse/>")
+    writer = LibXML::XML::Writer.string
+    document writer do
+      assert(writer.write_element iso)
     end
+    assert_equal(writer.result.strip!, "<?xml version=\"1.0\"?>\n<éloïse/>")
   end
 
   def test_flush
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     assert(writer.start_document)
     assert_equal(writer.flush.strip!, '<?xml version="1.0"?>')
     assert(writer.start_element 'foo')
@@ -417,7 +415,7 @@ class TestWriter < Minitest::Test
   def test_nil_pe_issue
     expected = '<!DOCTYPE html [<!ENTITY special.pre "br | span | bdo | map"><!ENTITY special "%special.pre; | object | img">]>'
 
-    writer = XML::Writer.string
+    writer = LibXML::XML::Writer.string
     dtd writer, 'html' do
       assert(writer.write_dtd_internal_entity 'special.pre', 'br | span | bdo | map', nil)
       assert(writer.write_dtd_internal_entity 'special', '%special.pre; | object | img', nil)