libxml-ruby 2.8.0 → 2.9.0

data/test/tc_encoding_sax.rb

@@ -1,12 +1,13 @@
 # encoding: UTF-8
 require './test_helper'
-require 'test/unit'
 
 class SaxEncodingCallbacks
   attr_reader :encoding
-  include Test::Unit::Assertions
+  attr_accessor :assertions
+  include Minitest::Assertions
 
   def initialize
+    @assertions = 0
     @encoding = Encoding::UTF_8
   end
 
@@ -90,7 +91,7 @@ class SaxEncodingCallbacks
   end
 end
 
-class TestEncodingSax < Test::Unit::TestCase
+class TestEncodingSax < Minitest::Test
   def setup
     Encoding.default_internal = nil
   end

data/test/tc_error.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 require 'stringio'
 
-class TestError < Test::Unit::TestCase
+class TestError < Minitest::Test
   def test_error_codes
     assert_equal(4, XML::Error::DTD)
     assert_equal(4, XML::Error.const_get('DTD'))
@@ -14,7 +13,7 @@ class TestError < Test::Unit::TestCase
   end
 
   def test_invalid_handler
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       XML::Error.set_handler
     end
   end
@@ -26,13 +25,13 @@ class TestError < Test::Unit::TestCase
     end
 
     # Raise the error
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       XML::Reader.string('<foo').read
     end
     assert_equal(exception, error)
 
     # Check the handler worked
-    assert_not_nil(exception)
+    refute_nil(exception)
     assert_kind_of(XML::Error, exception)
     assert_equal("Fatal error: Couldn't find end of Start Tag foo at :1.", exception.message)
     assert_equal(XML::Error::PARSER, exception.domain)
@@ -65,7 +64,7 @@ class TestError < Test::Unit::TestCase
 
     saved_handler = XML::Error.get_handler
     XML::Error.set_handler{ puts "New handler" }
-    assert_not_equal(XML::Error.get_handler, saved_handler)
+    refute_equal(XML::Error.get_handler, saved_handler)
 
     XML::Error.set_handler(&saved_handler)
     assert_equal(XML::Error.get_handler, saved_handler)
@@ -78,7 +77,7 @@ class TestError < Test::Unit::TestCase
 
     Object.const_set(:STDERR, output)
     begin
-      assert_raise(XML::Error) do
+      assert_raises(XML::Error) do
         XML::Parser.string('<foo><bar/></foz>').parse
       end
     ensure
@@ -94,7 +93,7 @@ class TestError < Test::Unit::TestCase
 
     Object.const_set(:STDERR, output)
     begin
-      assert_raise(XML::Error) do
+      assert_raises(XML::Error) do
         XML::Parser.string('<foo><bar/></foz>').parse
       end
     ensure
@@ -104,7 +103,7 @@ class TestError < Test::Unit::TestCase
   end
 
   def test_parse_error
-    exception = assert_raise(XML::Error) do
+    exception = assert_raises(XML::Error) do
       XML::Parser.string('<foo><bar/></foz>').parse
     end
 
@@ -120,7 +119,7 @@ class TestError < Test::Unit::TestCase
   def test_xpath_error
     doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
 
-    exception = assert_raise(XML::Error) do
+    exception = assert_raises(XML::Error) do
       doc.find('/foo[bar=test')
     end
 
@@ -138,7 +137,7 @@ class TestError < Test::Unit::TestCase
     parser = XML::Parser.string("<test>something</test>")
     parser.parse
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       # Try parsing a second time
       parser.parse
     end
@@ -149,19 +148,19 @@ class TestError < Test::Unit::TestCase
   def test_libxml_parser_empty_string
     xp = XML::Parser.new
 
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       xp.string = nil
     end
     assert_equal('wrong argument type nil (expected String)', error.to_s)
 
-    error = assert_raise(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       xp.string = ''
     end
     assert_equal('Must specify a string with one or more characters', error.to_s)
   end
 
   def test_error_domain_to_s
-    exception = assert_raise(XML::Error) do
+    exception = assert_raises(XML::Error) do
       XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
     end
 
@@ -170,7 +169,7 @@ class TestError < Test::Unit::TestCase
   end
 
   def test_error_code_to_s
-    exception = assert_raise(XML::Error) do
+    exception = assert_raises(XML::Error) do
       XML::Parser.string('<foo href="http://example.org/cgi?k1=v1&k2=v2"></foo>').parse
     end
     assert_equal(XML::Error::ENTITYREF_SEMICOL_MISSING, exception.code)

data/test/tc_html_parser.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require 'stringio'
-require 'test/unit'
 
-class HTMLParserTest < Test::Unit::TestCase
+class HTMLParserTest < Minitest::Test
   def html_file
     File.expand_path(File.join(File.dirname(__FILE__), 'model/ruby-lang.html'))
   end
@@ -14,11 +13,11 @@ class HTMLParserTest < Test::Unit::TestCase
     xp = XML::HTMLParser.file(html_file)
     assert_instance_of(XML::HTMLParser, xp)
     doc = xp.parse
-    assert_not_nil(doc)
+    refute_nil(doc)
   end
 
   def test_noexistent_file
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       XML::HTMLParser.file('i_dont_exist.xml')
     end
 
@@ -26,7 +25,7 @@ class HTMLParserTest < Test::Unit::TestCase
   end
 
   def test_nil_file
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::HTMLParser.file(nil)
     end
 
@@ -54,7 +53,7 @@ class HTMLParserTest < Test::Unit::TestCase
   end
 
   def test_nil_io
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::HTMLParser.io(nil)
     end
 
@@ -83,7 +82,7 @@ class HTMLParserTest < Test::Unit::TestCase
   end
 
   def test_nil_string
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::HTMLParser.string(nil)
     end
 
@@ -145,6 +144,15 @@ class HTMLParserTest < Test::Unit::TestCase
     assert_equal("<p>#{html}</p>", doc.root.to_s)
   end
 
+  def test_comment
+    doc = LibXML::XML::HTMLParser.string('<!-- stuff -->', :options => LibXML::XML::HTMLParser::Options::NOIMPLIED |
+                                                                       LibXML::XML::HTMLParser::Options::NOERROR |
+                                                                       LibXML::XML::HTMLParser::Options::NOWARNING |
+                                                                       LibXML::XML::HTMLParser::Options::RECOVER |
+                                                                       LibXML::XML::HTMLParser::Options::NONET)
+    assert(doc)
+  end
+
   def test_open_many_files
     1000.times do
       doc = XML::HTMLParser.file('model/ruby-lang.html').parse

data/test/tc_html_parser_context.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestHtmlParserContext < Test::Unit::TestCase
+class TestHtmlParserContext < Minitest::Test
   def test_default_options
     context = XML::HTMLParser::Context.new
     assert_equal(0, context.options)

data/test/tc_namespace.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestNS < Test::Unit::TestCase
+class TestNS < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/soap.xml')
     @doc = XML::Document.file(file)
@@ -29,7 +28,7 @@ class TestNS < Test::Unit::TestCase
   end
 
   def test_create_unbound_ns
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Namespace.new(nil, 'my_namepace', 'http://www.mynamespace.com')
     end
     assert_equal('wrong argument type nil (expected Data)', error.to_s)

data/test/tc_namespaces.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestNamespaces < Test::Unit::TestCase
+class TestNamespaces < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/soap.xml')
     @doc = XML::Document.file(file)
@@ -38,7 +37,7 @@ class TestNamespaces < Test::Unit::TestCase
 
     # Now put the node in the soap namespace
     node.namespaces.namespace = ns
-    assert_not_nil(node.namespaces.namespace)
+    refute_nil(node.namespaces.namespace)
     assert_equal("<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\"/>", node.to_s)
   end
 
@@ -60,13 +59,13 @@ class TestNamespaces < Test::Unit::TestCase
 
     # Now put the node in the soap namespace
     node.namespaces.namespace = ns
-    assert_not_nil(node.namespaces.namespace)
+    refute_nil(node.namespaces.namespace)
     assert_equal('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" encodingStyle="http://www.w3.org/2001/12/soap-encoding"/>',
                   node.to_s)
 
     # Now put the attribute in the soap namespace
     attr.namespaces.namespace = ns
-    assert_not_nil(node.namespaces.namespace)
+    refute_nil(node.namespaces.namespace)
     assert_equal('<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" soap:encodingStyle="http://www.w3.org/2001/12/soap-encoding"/>',
                   node.to_s)
   end
@@ -205,6 +204,6 @@ class TestNamespaces < Test::Unit::TestCase
     doc.root.namespaces.default_prefix = 'soap'
 
     node = doc.root.find_first('/soap:Envelope')
-    assert_not_nil(node)
+    refute_nil(node)
   end
 end

data/test/tc_node.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestNode < Test::Unit::TestCase
+class TestNode < Minitest::Test
   def setup
     @file_name = "model/bands.utf-8.xml"
 
@@ -112,7 +111,7 @@ class TestNode < Test::Unit::TestCase
   def test_equality_wrong_type
     node = @doc.root
 
-    assert_raise(TypeError) do
+    assert_raises(TypeError) do
       assert(node != 'abc')
     end
   end

data/test/tc_node_cdata.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class CDataCommentTest < Test::Unit::TestCase
+class CDataCommentTest < Minitest::Test
   def setup
     xp = XML::Parser.string('<root></root>')
     @doc = xp.parse
@@ -44,7 +43,7 @@ class CDataCommentTest < Test::Unit::TestCase
     cnode = XML::Node.new_cdata('test cdata')
     
     # Can't create attributes on non-element nodes
-    assert_raise(ArgumentError) do
+    assert_raises(ArgumentError) do
       cnode['attr'] = '123'
     end
   end

data/test/tc_node_comment.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class NodeCommentTest < Test::Unit::TestCase
+class NodeCommentTest < Minitest::Test
   def setup
     xp = XML::Parser.string('<root></root>')
     @doc = xp.parse

data/test/tc_node_copy.rb

@@ -1,13 +1,12 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
 # 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>

data/test/tc_node_edit.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-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>')
     @doc = xp.parse
@@ -76,7 +75,7 @@ class TestNodeEdit < Test::Unit::TestCase
     a.parent.remove!
 
     # Node a has now been freed from under us
-    error = assert_raise(RuntimeError) do
+    error = assert_raises(RuntimeError) do
       a.to_s
     end
     assert_equal('This node has already been freed.', error.to_s)
@@ -88,7 +87,7 @@ class TestNodeEdit < Test::Unit::TestCase
     node = doc.root.child.remove!
     node = nil
     GC.start
-    assert_not_nil(doc)
+    refute_nil(doc)
   end
 
   def test_remove_node_iteration
@@ -105,7 +104,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
@@ -124,13 +123,12 @@ 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
 
     node = doc1.root.child
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc2.root << node
     end
 

data/test/tc_node_pi.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class NodeCommentTest < Test::Unit::TestCase
+class NodeCommentTest < Minitest::Test
   def setup
     xp = XML::Parser.string('<root></root>')
     @doc = xp.parse

data/test/tc_node_text.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestTextNode < Test::Unit::TestCase
+class TestTextNode < Minitest::Test
   def test_content
     node = XML::Node.new_text('testdata')
     assert_instance_of(XML::Node, node)
@@ -11,7 +10,7 @@ class TestTextNode < Test::Unit::TestCase
   end
 
   def test_invalid_content
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       node = XML::Node.new_text(nil)
     end
     assert_equal('wrong argument type nil (expected String)', error.to_s)

data/test/tc_node_write.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestNodeWrite < Test::Unit::TestCase
+class TestNodeWrite < Minitest::Test
   def setup
     load_encoding("utf-8")
   end
@@ -81,7 +80,7 @@ class TestNodeWrite < Test::Unit::TestCase
     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)