RubyGems - libxml-ruby - Versions diffs - 2.8.0 → 3.2.1 - Mend

libxml-ruby 2.8.0 → 3.2.1

Files changed (204) hide show

checksums.yaml +5 -5
data/HISTORY +842 -775
data/LICENSE +20 -20
data/MANIFEST +166 -166
data/README.rdoc +217 -184
data/Rakefile +90 -78
data/ext/libxml/extconf.h +3 -0
data/ext/libxml/extconf.rb +61 -116
data/ext/libxml/libxml.c +80 -76
data/ext/libxml/ruby_libxml.h +67 -75
data/ext/libxml/ruby_xml.c +933 -893
data/ext/libxml/ruby_xml.h +10 -10
data/ext/libxml/ruby_xml_attr.c +333 -333
data/ext/libxml/ruby_xml_attr.h +12 -12
data/ext/libxml/ruby_xml_attr_decl.c +153 -153
data/ext/libxml/ruby_xml_attr_decl.h +11 -11
data/ext/libxml/ruby_xml_attributes.c +275 -275
data/ext/libxml/ruby_xml_attributes.h +15 -15
data/ext/libxml/ruby_xml_cbg.c +85 -85
data/ext/libxml/ruby_xml_document.c +1123 -1147
data/ext/libxml/ruby_xml_document.h +11 -11
data/ext/libxml/ruby_xml_dtd.c +248 -268
data/ext/libxml/ruby_xml_dtd.h +9 -9
data/ext/libxml/ruby_xml_encoding.c +250 -260
data/ext/libxml/ruby_xml_encoding.h +16 -19
data/ext/libxml/ruby_xml_error.c +996 -996
data/ext/libxml/ruby_xml_error.h +12 -12
data/ext/libxml/ruby_xml_html_parser.c +89 -92
data/ext/libxml/ruby_xml_html_parser.h +10 -10
data/ext/libxml/ruby_xml_html_parser_context.c +337 -338
data/ext/libxml/ruby_xml_html_parser_context.h +10 -10
data/ext/libxml/ruby_xml_html_parser_options.c +46 -46
data/ext/libxml/ruby_xml_html_parser_options.h +10 -10
data/ext/libxml/ruby_xml_input_cbg.c +191 -191
data/ext/libxml/ruby_xml_input_cbg.h +20 -20
data/ext/libxml/ruby_xml_io.c +47 -50
data/ext/libxml/ruby_xml_io.h +10 -10
data/ext/libxml/ruby_xml_namespace.c +153 -153
data/ext/libxml/ruby_xml_namespace.h +10 -10
data/ext/libxml/ruby_xml_namespaces.c +293 -293
data/ext/libxml/ruby_xml_namespaces.h +9 -9
data/ext/libxml/ruby_xml_node.c +1402 -1452
data/ext/libxml/ruby_xml_node.h +13 -11
data/ext/libxml/ruby_xml_parser.c +91 -94
data/ext/libxml/ruby_xml_parser.h +12 -12
data/ext/libxml/ruby_xml_parser_context.c +999 -1001
data/ext/libxml/ruby_xml_parser_context.h +10 -10
data/ext/libxml/ruby_xml_parser_options.c +66 -66
data/ext/libxml/ruby_xml_parser_options.h +12 -12
data/ext/libxml/ruby_xml_reader.c +1239 -1228
data/ext/libxml/ruby_xml_reader.h +17 -17
data/ext/libxml/ruby_xml_relaxng.c +110 -111
data/ext/libxml/ruby_xml_relaxng.h +10 -10
data/ext/libxml/ruby_xml_sax2_handler.c +326 -328
data/ext/libxml/ruby_xml_sax2_handler.h +10 -10
data/ext/libxml/ruby_xml_sax_parser.c +116 -120
data/ext/libxml/ruby_xml_sax_parser.h +10 -10
data/ext/libxml/ruby_xml_schema.c +278 -301
data/ext/libxml/ruby_xml_schema.h +809 -809
data/ext/libxml/ruby_xml_schema_attribute.c +109 -109
data/ext/libxml/ruby_xml_schema_attribute.h +15 -15
data/ext/libxml/ruby_xml_schema_element.c +95 -94
data/ext/libxml/ruby_xml_schema_element.h +14 -14
data/ext/libxml/ruby_xml_schema_facet.c +52 -52
data/ext/libxml/ruby_xml_schema_facet.h +13 -13
data/ext/libxml/ruby_xml_schema_type.c +232 -259
data/ext/libxml/ruby_xml_schema_type.h +9 -9
data/ext/libxml/ruby_xml_version.h +9 -9
data/ext/libxml/ruby_xml_writer.c +1133 -1137
data/ext/libxml/ruby_xml_writer.h +10 -10
data/ext/libxml/ruby_xml_xinclude.c +16 -16
data/ext/libxml/ruby_xml_xinclude.h +11 -11
data/ext/libxml/ruby_xml_xpath.c +194 -188
data/ext/libxml/ruby_xml_xpath.h +13 -13
data/ext/libxml/ruby_xml_xpath_context.c +360 -361
data/ext/libxml/ruby_xml_xpath_context.h +9 -9
data/ext/libxml/ruby_xml_xpath_expression.c +81 -81
data/ext/libxml/ruby_xml_xpath_expression.h +10 -10
data/ext/libxml/ruby_xml_xpath_object.c +338 -335
data/ext/libxml/ruby_xml_xpath_object.h +17 -17
data/ext/libxml/ruby_xml_xpointer.c +99 -99
data/ext/libxml/ruby_xml_xpointer.h +11 -11
data/ext/vc/libxml_ruby.sln +17 -15
data/lib/libxml-ruby.rb +30 -0
data/lib/libxml.rb +3 -33
data/lib/libxml/node.rb +2 -78
data/lib/libxml/parser.rb +0 -266
data/lib/libxml/sax_parser.rb +0 -17
data/lib/libxml/schema.rb +47 -66
data/lib/libxml/schema/attribute.rb +19 -19
data/lib/libxml/schema/element.rb +19 -27
data/lib/libxml/schema/type.rb +21 -29
data/libxml-ruby.gemspec +48 -44
data/script/benchmark/depixelate +634 -634
data/script/benchmark/hamlet.xml +9054 -9054
data/script/benchmark/parsecount +170 -170
data/script/benchmark/throughput +41 -41
data/script/test +6 -6
data/setup.rb +0 -1
data/test/c14n/given/example-1.xml +14 -14
data/test/c14n/given/example-2.xml +11 -11
data/test/c14n/given/example-3.xml +18 -18
data/test/c14n/given/example-4.xml +9 -9
data/test/c14n/given/example-5.xml +12 -12
data/test/c14n/given/example-6.xml +2 -2
data/test/c14n/given/example-7.xml +11 -11
data/test/c14n/given/example-8.xml +11 -11
data/test/c14n/given/example-8.xpath +9 -9
data/test/c14n/result/1-1-without-comments/example-1 +3 -3
data/test/c14n/result/1-1-without-comments/example-2 +10 -10
data/test/c14n/result/1-1-without-comments/example-3 +13 -13
data/test/c14n/result/1-1-without-comments/example-4 +8 -8
data/test/c14n/result/1-1-without-comments/example-5 +2 -2
data/test/c14n/result/with-comments/example-1 +5 -5
data/test/c14n/result/with-comments/example-2 +10 -10
data/test/c14n/result/with-comments/example-3 +13 -13
data/test/c14n/result/with-comments/example-4 +8 -8
data/test/c14n/result/with-comments/example-5 +3 -3
data/test/c14n/result/without-comments/example-1 +3 -3
data/test/c14n/result/without-comments/example-2 +10 -10
data/test/c14n/result/without-comments/example-3 +13 -13
data/test/c14n/result/without-comments/example-4 +8 -8
data/test/c14n/result/without-comments/example-5 +2 -2
data/test/model/atom.xml +12 -12
data/test/model/bands.iso-8859-1.xml +4 -4
data/test/model/bands.utf-8.xml +4 -4
data/test/model/bands.xml +4 -4
data/test/model/books.xml +153 -153
data/test/model/cwm_1_0.xml +11336 -0
data/test/model/merge_bug_data.xml +58 -58
data/test/model/ruby-lang.html +238 -238
data/test/model/rubynet.xml +79 -79
data/test/model/shiporder.rnc +28 -28
data/test/model/shiporder.rng +86 -86
data/test/model/shiporder.xml +22 -22
data/test/model/shiporder.xsd +39 -39
data/test/model/soap.xml +27 -27
data/test/model/xinclude.xml +4 -4
data/test/test.xml +2 -0
data/test/{tc_attr.rb → test_attr.rb} +23 -25
data/test/{tc_attr_decl.rb → test_attr_decl.rb} +13 -14
data/test/{tc_attributes.rb → test_attributes.rb} +11 -18
data/test/{tc_canonicalize.rb → test_canonicalize.rb} +36 -41
data/test/test_deprecated_require.rb +12 -0
data/test/{tc_document.rb → test_document.rb} +32 -27
data/test/test_document_write.rb +146 -0
data/test/{tc_dtd.rb → test_dtd.rb} +28 -29
data/test/{tc_encoding.rb → test_encoding.rb} +129 -126
data/test/{tc_encoding_sax.rb → test_encoding_sax.rb} +7 -6
data/test/test_error.rb +178 -0
data/test/test_helper.rb +3 -10
data/test/test_html_parser.rb +162 -0
data/test/test_html_parser_context.rb +23 -0
data/test/test_namespace.rb +60 -0
data/test/{tc_namespaces.rb → test_namespaces.rb} +34 -44
data/test/{tc_node.rb → test_node.rb} +68 -47
data/test/{tc_node_cdata.rb → test_node_cdata.rb} +12 -13
data/test/{tc_node_comment.rb → test_node_comment.rb} +7 -8
data/test/{tc_node_copy.rb → test_node_copy.rb} +4 -6
data/test/{tc_node_edit.rb → test_node_edit.rb} +23 -41
data/test/{tc_node_pi.rb → test_node_pi.rb} +37 -40
data/test/{tc_node_text.rb → test_node_text.rb} +10 -12
data/test/{tc_node_write.rb → test_node_write.rb} +18 -29
data/test/test_node_xlink.rb +28 -0
data/test/test_parser.rb +324 -0
data/test/{tc_parser_context.rb → test_parser_context.rb} +41 -42
data/test/{tc_properties.rb → test_properties.rb} +6 -7
data/test/test_reader.rb +363 -0
data/test/test_relaxng.rb +53 -0
data/test/{tc_sax_parser.rb → test_sax_parser.rb} +36 -37
data/test/{tc_schema.rb → test_schema.rb} +43 -37
data/test/test_suite.rb +38 -40
data/test/{tc_traversal.rb → test_traversal.rb} +5 -6
data/test/{tc_writer.rb → test_writer.rb} +468 -448
data/test/{tc_xinclude.rb → test_xinclude.rb} +4 -5
data/test/test_xml.rb +262 -0
data/test/{tc_xpath.rb → test_xpath.rb} +31 -32
data/test/{tc_xpath_context.rb → test_xpath_context.rb} +8 -9
data/test/test_xpath_expression.rb +37 -0
data/test/{tc_xpointer.rb → test_xpointer.rb} +16 -18
metadata +117 -95
data/lib/libxml/ns.rb +0 -22
data/lib/libxml/properties.rb +0 -23
data/lib/libxml/reader.rb +0 -29
data/lib/libxml/xpath_object.rb +0 -16
data/test/etc_doc_to_s.rb +0 -21
data/test/ets_doc_file.rb +0 -17
data/test/ets_doc_to_s.rb +0 -23
data/test/ets_gpx.rb +0 -28
data/test/ets_node_gc.rb +0 -23
data/test/ets_test.xml +0 -2
data/test/ets_tsr.rb +0 -11
data/test/tc_deprecated_require.rb +0 -13
data/test/tc_document_write.rb +0 -196
data/test/tc_error.rb +0 -180
data/test/tc_html_parser.rb +0 -153
data/test/tc_html_parser_context.rb +0 -24
data/test/tc_namespace.rb +0 -62
data/test/tc_node_xlink.rb +0 -29
data/test/tc_parser.rb +0 -381
data/test/tc_reader.rb +0 -400
data/test/tc_relaxng.rb +0 -54
data/test/tc_xml.rb +0 -226
data/test/tc_xpath_expression.rb +0 -38

data/test/{tc_node_comment.rb → test_node_comment.rb} RENAMED

@@ -1,31 +1,30 @@
 # encoding: UTF-8
-require './test_helper'
+require_relative './test_helper'
-require 'test/unit'
-class NodeCommentTest < Test::Unit::TestCase
+class NodeCommentTest < Minitest::Test
   def setup
-    xp = XML::Parser.string('<root></root>')
+    xp = LibXML::XML::Parser.string('<root></root>')
     @doc = xp.parse
-    assert_instance_of(XML::Document, @doc)
+    assert_instance_of(LibXML::XML::Document, @doc)
     @root = @doc.root
   end
   def test_libxml_node_add_comment_01
-    @root << XML::Node.new_comment('mycomment')
+    @root << LibXML::XML::Node.new_comment('mycomment')
     assert_equal '<root><!--mycomment--></root>',
       @root.to_s.gsub(/\n\s*/,'')
   end
   def test_libxml_node_add_comment_02
-    @root << XML::Node.new_comment('mycomment')
+    @root << LibXML::XML::Node.new_comment('mycomment')
     assert_equal 'comment',
     @root.child.node_type_name
   end
   def test_libxml_node_add_comment_03
-    @root << el = XML::Node.new_comment('mycomment')
+    @root << el = LibXML::XML::Node.new_comment('mycomment')
     el << "_this_is_added"
     assert_equal '<root><!--mycomment_this_is_added--></root>',
     @root.to_s.gsub(/\n\s*/,'')

data/test/{tc_node_copy.rb → test_node_copy.rb} RENAMED

@@ -1,13 +1,12 @@
 # encoding: UTF-8
-require './test_helper'
-require 'test/unit'
+require_relative './test_helper'
 # see mailing list archive
 # [libxml-devel] Segmentation fault when add the cloned/copied node
 # 2007/11/27 20:51
-class TestNodeCopy < Test::Unit::TestCase
+class TestNodeCopy < Minitest::Test
   def setup
     str = <<-STR
       <html><body>
@@ -16,7 +15,7 @@ class TestNodeCopy < Test::Unit::TestCase
       </body></html>
     STR
-    doc = XML::Parser.string(str).parse
+    doc = LibXML::XML::Parser.string(str).parse
     xpath = "//div"
     @div1 = doc.find(xpath).to_a[0]
@@ -38,5 +37,4 @@ class TestNodeCopy < Test::Unit::TestCase
     end
     assert @div1.to_s =~ /foo/
   end
-end # TC_XML_Node_Copy
+end

data/test/{tc_node_edit.rb → test_node_edit.rb} RENAMED

@@ -1,11 +1,10 @@
 # encoding: UTF-8
-require './test_helper'
-require 'test/unit'
+require_relative './test_helper'
-class TestNodeEdit < Test::Unit::TestCase
+class TestNodeEdit < Minitest::Test
   def setup
-    xp = XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
+    xp = LibXML::XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
     @doc = xp.parse
   end
@@ -26,37 +25,37 @@ class TestNodeEdit < Test::Unit::TestCase
   end
   def test_add_next_01
-    first_node.next = XML::Node.new('num', 'one-and-a-half')
+    first_node.next = LibXML::XML::Node.new('num', 'one-and-a-half')
     assert_equal('<test><num>one</num><num>one-and-a-half</num><num>two</num><num>three</num></test>',
                  @doc.root.to_s.gsub(/\n\s*/,''))
   end
   def test_add_next_02
-    second_node.next = XML::Node.new('num', 'two-and-a-half')
+    second_node.next = LibXML::XML::Node.new('num', 'two-and-a-half')
     assert_equal('<test><num>one</num><num>two</num><num>two-and-a-half</num><num>three</num></test>',
                  @doc.root.to_s.gsub(/\n\s*/,''))
   end
   def test_add_next_03
-    third_node.next = XML::Node.new('num', 'four')
+    third_node.next = LibXML::XML::Node.new('num', 'four')
     assert_equal '<test><num>one</num><num>two</num><num>three</num><num>four</num></test>',
       @doc.root.to_s.gsub(/\n\s*/,'')
   end
   def test_add_prev_01
-    first_node.prev = XML::Node.new('num', 'half')
+    first_node.prev = LibXML::XML::Node.new('num', 'half')
     assert_equal '<test><num>half</num><num>one</num><num>two</num><num>three</num></test>',
       @doc.root.to_s.gsub(/\n\s*/,'')
   end
   def test_add_prev_02
-    second_node.prev = XML::Node.new('num', 'one-and-a-half')
+    second_node.prev = LibXML::XML::Node.new('num', 'one-and-a-half')
     assert_equal '<test><num>one</num><num>one-and-a-half</num><num>two</num><num>three</num></test>',
       @doc.root.to_s.gsub(/\n\s*/,'')
   end
   def test_add_prev_03
-    third_node.prev = XML::Node.new('num', 'two-and-a-half')
+    third_node.prev = LibXML::XML::Node.new('num', 'two-and-a-half')
     assert_equal '<test><num>one</num><num>two</num><num>two-and-a-half</num><num>three</num></test>',
       @doc.root.to_s.gsub(/\n\s*/,'')
   end
@@ -67,28 +66,12 @@ class TestNodeEdit < Test::Unit::TestCase
                  @doc.root.to_s.gsub(/\n\s*/,''))
   end
-  def test_freed_node
-    root = XML::Node.new("root")
-    a = XML::Node.new("a")
-    root << a
-    a.parent.remove!
-    # Node a has now been freed from under us
-    error = assert_raise(RuntimeError) do
-      a.to_s
-    end
-    assert_equal('This node has already been freed.', error.to_s)
-  end
   def test_remove_node_gc
-    xp = XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
+    xp = LibXML::XML::Parser.string('<test><num>one</num><num>two</num><num>three</num></test>')
     doc = xp.parse
-    node = doc.root.child.remove!
-    node = nil
+    doc.root.child.remove!
     GC.start
-    assert_not_nil(doc)
+    refute_nil(doc)
   end
   def test_remove_node_iteration
@@ -105,7 +88,7 @@ class TestNodeEdit < Test::Unit::TestCase
   def test_reuse_removed_node
     # Remove the node
     node = @doc.root.first.remove!
-    assert_not_nil(node)
+    refute_nil(node)
     # Add it to the end of the document
     @doc.root.last.next = node
@@ -115,7 +98,7 @@ class TestNodeEdit < Test::Unit::TestCase
   end
   def test_append_existing_node
-    doc = XML::Parser.string('<top>a<bottom>b<one>first</one><two>second</two>c</bottom>d</top>').parse
+    doc = LibXML::XML::Parser.string('<top>a<bottom>b<one>first</one><two>second</two>c</bottom>d</top>').parse
     node1 = doc.find_first('//two')
     doc.root << node1
@@ -124,18 +107,17 @@ class TestNodeEdit < Test::Unit::TestCase
   end
   def test_wrong_doc
-    puts 333333
-    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
     GC.start
-    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)
   end
@@ -145,11 +127,12 @@ class TestNodeEdit < Test::Unit::TestCase
     # Read in 500 documents
     500.times do
-      documents << XML::Parser.string(File.read(File.join(File.dirname(__FILE__), 'model', 'merge_bug_data.xml'))).parse
+      documents << LibXML::XML::Parser.string(File.read(File.join(File.dirname(__FILE__), 'model', 'merge_bug_data.xml'))).parse
     end
     master_doc = documents.shift
-    documents.inject(master_doc) do |master_doc, child_doc|
+    documents.each do |child_doc|
       master_body = master_doc.find("//body").first
       child_body = child_doc.find("//body").first
@@ -158,12 +141,11 @@ class TestNodeEdit < Test::Unit::TestCase
       end
       master_body << child_element.copy(true)
-      master_doc
     end
   end
   def test_append_chain
-    node = XML::Node.new('foo') << XML::Node.new('bar') << "bars contents"
+    node = LibXML::XML::Node.new('foo') << LibXML::XML::Node.new('bar') << "bars contents"
     assert_equal('<foo><bar/>bars contents</foo>',
                  node.to_s)
   end
@@ -173,4 +155,4 @@ class TestNodeEdit < Test::Unit::TestCase
     assert_equal("<test xml:base=\"http://www.rubynet.org/\">\n  <num>one</num>\n  <num>two</num>\n  <num>three</num>\n</test>",
                  @doc.root.to_s)
   end
-end
+end

data/test/{tc_node_pi.rb → test_node_pi.rb} RENAMED

@@ -1,40 +1,37 @@
-# encoding: UTF-8
-require './test_helper'
-require 'test/unit'
-class NodeCommentTest < Test::Unit::TestCase
-  def setup
-    xp = XML::Parser.string('<root></root>')
-    @doc = xp.parse
-    assert_instance_of(XML::Document, @doc)
-    @root = @doc.root
-  end
-  def test_libxml_node_add_pi_01
-    @root << XML::Node.new_pi('mypi')
-    assert_equal '<root><?mypi?></root>',
-      @root.to_s.gsub(/\n\s*/,'')
-  end
-  def test_libxml_node_add_pi_02
-    @root << XML::Node.new_pi('mypi')
-    assert_equal 'pi',
-    @root.child.node_type_name
-  end
-  def test_libxml_node_add_pi_03
-    @root << el = XML::Node.new_pi('mypi')
-    el << "_this_is_added"
-    assert_equal '<root><?mypi _this_is_added?></root>',
-    @root.to_s.gsub(/\n\s*/,'')
-  end
-  def test_libxml_node_add_pi_04
-    @root << XML::Node.new_pi('mypi','mycontent')
-    assert_equal '<root><?mypi mycontent?></root>',
-      @root.to_s.gsub(/\n\s*/,'')
-  end
-end
+# encoding: UTF-8
+require_relative './test_helper'
+class NodePiTest < Minitest::Test
+  def setup
+    xp = LibXML::XML::Parser.string('<root></root>')
+    @doc = xp.parse
+    assert_instance_of(LibXML::XML::Document, @doc)
+    @root = @doc.root
+  end
+  def test_libxml_node_add_pi_01
+    @root << LibXML::XML::Node.new_pi('mypi')
+    assert_equal '<root><?mypi?></root>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+  def test_libxml_node_add_pi_02
+    @root << LibXML::XML::Node.new_pi('mypi')
+    assert_equal 'pi',
+    @root.child.node_type_name
+  end
+  def test_libxml_node_add_pi_03
+    @root << el = LibXML::XML::Node.new_pi('mypi')
+    el << "_this_is_added"
+    assert_equal '<root><?mypi _this_is_added?></root>',
+    @root.to_s.gsub(/\n\s*/,'')
+  end
+  def test_libxml_node_add_pi_04
+    @root << LibXML::XML::Node.new_pi('mypi','mycontent')
+    assert_equal '<root><?mypi mycontent?></root>',
+      @root.to_s.gsub(/\n\s*/,'')
+  end
+end

data/test/{tc_node_text.rb → test_node_text.rb} RENAMED

@@ -1,18 +1,17 @@
 # encoding: UTF-8
-require './test_helper'
-require 'test/unit'
+require_relative './test_helper'
-class TestTextNode < Test::Unit::TestCase
+class TestTextNode < Minitest::Test
   def test_content
-    node = XML::Node.new_text('testdata')
-    assert_instance_of(XML::Node, node)
+    node = LibXML::XML::Node.new_text('testdata')
+    assert_instance_of(LibXML::XML::Node, node)
     assert_equal('testdata', node.content)
   end
   def test_invalid_content
-    error = assert_raise(TypeError) do
-      node = XML::Node.new_text(nil)
+    error = assert_raises(TypeError) do
+      LibXML::XML::Node.new_text(nil)
     end
     assert_equal('wrong argument type nil (expected String)', error.to_s)
   end
@@ -24,11 +23,11 @@ class TestTextNode < Test::Unit::TestCase
 	# in CDATA nodes.  Or if you are sanitizing existing HTML documents and want
 	# to preserve the content of any of the text nodes.
 	#
-	def test_output_escaping
+  def test_output_escaping
 		textnoenc = 'if (a < b || c > d) return "e";'
 		text = "if (a &lt; b || c &gt; d) return \"e\";"
-		node = XML::Node.new_text(textnoenc)
+		node = LibXML::XML::Node.new_text(textnoenc)
 		assert node.output_escaping?
 		assert_equal text, node.to_s
@@ -46,8 +45,8 @@ class TestTextNode < Test::Unit::TestCase
   end
 	# Just a sanity check for output escaping.
-	def test_output_escaping_sanity
-		node = XML::Node.new_text('testdata')
+  def test_output_escaping_sanity
+		node = LibXML::XML::Node.new_text('testdata')
     assert_equal 'text', node.name
 		assert node.output_escaping?
@@ -67,5 +66,4 @@ class TestTextNode < Test::Unit::TestCase
     assert_equal 'text', node.name
 		assert node.output_escaping?
   end
 end

data/test/{tc_node_write.rb → test_node_write.rb} RENAMED

@@ -1,32 +1,31 @@
 # encoding: UTF-8
-require './test_helper'
-require 'test/unit'
+require_relative './test_helper'
-class TestNodeWrite < Test::Unit::TestCase
+class TestNodeWrite < Minitest::Test
   def setup
     load_encoding("utf-8")
   end
   def teardown
-    XML.default_keep_blanks = true
+    LibXML::XML.default_keep_blanks = true
     @doc = nil
   end
   def load_encoding(name)
-    @encoding = Encoding.find(name) if defined?(Encoding)
+    @encoding = Encoding.find(name)
     @file_name = "model/bands.#{name.downcase}.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 test_to_s_default
     # Default to_s has indentation
     node = @doc.root
-    assert_equal(Encoding::UTF_8, node.to_s.encoding) if defined?(Encoding)
+    assert_equal(Encoding::UTF_8, node.to_s.encoding)
     assert_equal("<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>",
                  node.to_s)
   end
@@ -34,11 +33,11 @@ class TestNodeWrite < Test::Unit::TestCase
   def test_to_s_no_global_indentation
     # No indentation due to global setting
     node = @doc.root
-    XML.indent_tree_output = false
+    LibXML::XML.indent_tree_output = false
     assert_equal("<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>",
                  node.to_s)
   ensure
-    XML.indent_tree_output = true
+    LibXML::XML.indent_tree_output = true
   end
   def test_to_s_no_indentation
@@ -62,26 +61,21 @@ class TestNodeWrite < Test::Unit::TestCase
     # UTF8:
     # ö - c3 b6 in hex, \303\266 in octal
     # ü - c3 bc in hex, \303\274 in octal
-    value = node.to_s(:encoding => XML::Encoding::UTF_8)
-    assert_equal(Encoding::UTF_8, node.to_s.encoding) if defined?(Encoding)
+    value = node.to_s(:encoding => LibXML::XML::Encoding::UTF_8)
+    assert_equal(Encoding::UTF_8, node.to_s.encoding)
     assert_equal("<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>",
                  value)
     # ISO_8859_1:
     # ö - f6 in hex, \366 in octal
     # ü - fc in hex, \374 in octal
-    value = node.to_s(:encoding => XML::Encoding::ISO_8859_1)
-    if defined?(Encoding)
-      assert_equal(Encoding::ISO8859_1, value.encoding)
-      assert_equal("<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>".force_encoding(Encoding::ISO8859_1),
-                   value)
-    else
-      assert_equal("<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>",
+    value = node.to_s(:encoding => LibXML::XML::Encoding::ISO_8859_1)
+    assert_equal(Encoding::ISO8859_1, value.encoding)
+    assert_equal("<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>".force_encoding(Encoding::ISO8859_1),
                  value)
-    end
     # Invalid encoding
-    error = assert_raise(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       node.to_s(:encoding => -9999)
     end
     assert_equal('Unknown encoding value: -9999', error.to_s)
@@ -91,14 +85,9 @@ class TestNodeWrite < Test::Unit::TestCase
     # Default to_s has indentation
     node = @doc.root
-    if defined?(Encoding)
-      assert_equal(Encoding::UTF_8, node.inner_xml.encoding)
-      assert_equal("<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>",
-                   node.inner_xml)
-    else
-      assert_equal("<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>",
-                   node.inner_xml)
-    end
+    assert_equal(Encoding::UTF_8, node.inner_xml.encoding)
+    assert_equal("<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>",
+                 node.inner_xml)
   end
   # --- Debug ---