libxml-ruby 2.8.0 → 2.9.0

data/test/tc_node_xlink.rb

@@ -3,9 +3,8 @@
 # $Id$
 require './test_helper'
 
-require 'test/unit'
 
-class TC_XML_Node_XLink < Test::Unit::TestCase
+class TC_XML_Node_XLink < Minitest::Test
   def setup()
     xp = XML::Parser.string('<ruby_array xmlns:xlink="http://www.w3.org/1999/xlink/namespace/"><fixnum xlink:type="simple">one</fixnum></ruby_array>')
     doc = xp.parse

data/test/tc_parser.rb

@@ -1,20 +1,13 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 require 'stringio'
 
-class TestParser < Test::Unit::TestCase
+class TestParser < Minitest::Test
   def setup
     XML::Error.set_handler(&XML::Error::QUIET_HANDLER)
   end
 
-  def teardown
-    GC.start
-    GC.start
-    GC.start
-  end
-      
   # -----  Sources  -------
   def test_document
     file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.utf-8.xml'))
@@ -30,7 +23,7 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_nil_document
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Parser.document(nil)
     end
 
@@ -47,7 +40,7 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_noexistent_file
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       XML::Parser.file('i_dont_exist.xml')
     end
 
@@ -55,7 +48,7 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_nil_file
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Parser.file(nil)
     end
 
@@ -66,7 +59,7 @@ class TestParser < Test::Unit::TestCase
     file = File.expand_path(File.join(File.dirname(__FILE__), 'model/bands.utf-8.xml'))
     parser = XML::Parser.file(file, :encoding => XML::Encoding::ISO_8859_1)
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc = parser.parse
     end
 
@@ -74,7 +67,7 @@ class TestParser < Test::Unit::TestCase
 
     parser = XML::Parser.file(file, :encoding => XML::Encoding::UTF_8)
     doc = parser.parse
-    assert_not_nil(doc)
+    refute_nil(doc)
   end
 
   def test_file_base_uri
@@ -111,7 +104,7 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_nil_io
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Parser.io(nil)
     end
 
@@ -141,8 +134,9 @@ class TestParser < Test::Unit::TestCase
 
     thread.join
     assert(true)
+    puts 'Thread completed'
   end
-  
+
   def test_string
     str = '<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>'
 
@@ -155,7 +149,7 @@ class TestParser < Test::Unit::TestCase
   end
 
   def test_nil_string
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Parser.string(nil)
     end
 
@@ -215,7 +209,7 @@ class TestParser < Test::Unit::TestCase
     # Parse as UTF_8
     parser = XML::Parser.string(xml, :encoding => XML::Encoding::UTF_8)
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc = parser.parse
     end
 
@@ -246,7 +240,7 @@ class TestParser < Test::Unit::TestCase
     max_fd = if RUBY_PLATFORM.match(/mswin32|mingw/i)
       500
     else
-      (`ulimit -n`.chomp.to_i) + 1
+      Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 1
     end
 
     file = File.join(File.dirname(__FILE__), 'model/rubynet.xml')
@@ -264,11 +258,11 @@ class TestParser < Test::Unit::TestCase
 
   # -----  Errors  ------
   def test_error
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       XML::Parser.string('<foo><bar/></foz>').parse
     end
 
-    assert_not_nil(error)
+    refute_nil(error)
     assert_kind_of(XML::Error, error)
     assert_equal("Fatal error: Opening and ending tag mismatch: foo line 1 and foz at :1.", error.message)
     assert_equal(XML::Error::PARSER, error.domain)
@@ -286,11 +280,11 @@ class TestParser < Test::Unit::TestCase
 
   def test_bad_xml
     parser = XML::Parser.string('<ruby_array uga="booga" foo="bar"<fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
-    error = assert_raise(XML::Error) do
-      assert_not_nil(parser.parse)
+    error = assert_raises(XML::Error) do
+      refute_nil(parser.parse)
     end
 
-    assert_not_nil(error)
+    refute_nil(error)
     assert_kind_of(XML::Error, error)
     assert_equal("Fatal error: Extra content at the end of the document at :1.", error.message)
     assert_equal(XML::Error::PARSER, error.domain)
@@ -302,7 +296,7 @@ class TestParser < Test::Unit::TestCase
     assert_nil(error.str2)
     assert_nil(error.str3)
     assert_equal(0, error.int1)
-    assert_equal(20, error.int2)
+    assert_equal(34, error.int2)
     assert_nil(error.node)
   end
 

data/test/tc_parser_context.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestParserContext < Test::Unit::TestCase
+class TestParserContext < Minitest::Test
   def test_string
     # UTF8
     xml = <<-EOS
@@ -44,7 +43,7 @@ class TestParserContext < Test::Unit::TestCase
 
     context = XML::Parser::Context.string(xml)
 
-    error = assert_raise(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       context.encoding = -999
     end
     assert_equal("Unknown encoding: -999", error.to_s)
@@ -66,12 +65,12 @@ class TestParserContext < Test::Unit::TestCase
   end
 
   def test_string_empty
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::Parser::Context.string(nil)
     end
     assert_equal("wrong argument type nil (expected String)", error.to_s)
 
-    error = assert_raise(ArgumentError) do
+    error = assert_raises(ArgumentError) do
       XML::Parser::Context.string('')
     end
     assert_equal("Must specify a string with one or more characters", error.to_s)
@@ -85,7 +84,7 @@ class TestParserContext < Test::Unit::TestCase
 
   def test_not_well_formed
     parser = XML::Parser.string("<abc>")
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       parser.parse
     end
     assert(!parser.context.well_formed?)
@@ -166,7 +165,7 @@ class TestParserContext < Test::Unit::TestCase
   def test_parse_error
     xp = XML::Parser.string('<foo><bar/></foz>')
 
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       xp.parse
     end
 

data/test/tc_properties.rb

@@ -2,12 +2,11 @@
 
 require './test_helper'
 
-require 'test/unit'
 
 # attributes is deprecated - use attributes instead.
 # Tests for backwards compatibility
 
-class Testattributes < Test::Unit::TestCase
+class Testattributes < Minitest::Test
   def setup()
     xp = XML::Parser.string('<ruby_array uga="booga" foo="bar"><fixnum>one</fixnum><fixnum>two</fixnum></ruby_array>')
     @doc = xp.parse

data/test/tc_reader.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require 'stringio'
-require 'test/unit'
 
-class TestReader < Test::Unit::TestCase
+class TestReader < Minitest::Test
   XML_FILE = File.join(File.dirname(__FILE__), 'model/atom.xml')
 
   def verify_simple(reader)
@@ -61,7 +60,7 @@ class TestReader < Test::Unit::TestCase
   end
 
   def test_invalid_file
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       XML::Reader.file('/does/not/exist')
     end
   end
@@ -98,7 +97,7 @@ class TestReader < Test::Unit::TestCase
   def test_error
     reader = XML::Reader.string('<foo blah')
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       reader.read
     end
     assert_equal("Fatal error: Couldn't find end of Start Tag foo at :1.", error.to_s)
@@ -111,7 +110,7 @@ class TestReader < Test::Unit::TestCase
       called = true
     end
 
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       reader.read
     end
 
@@ -126,7 +125,7 @@ class TestReader < Test::Unit::TestCase
     end
     reader.reset_error_handler
 
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       reader.read
     end
 
@@ -224,7 +223,7 @@ class TestReader < Test::Unit::TestCase
     node = reader.expand
 
     # Try to access the document
-    assert_not_nil(node.doc)
+    refute_nil(node.doc)
   end
 
   def test_expand_find
@@ -246,7 +245,7 @@ class TestReader < Test::Unit::TestCase
     reader = XML::Reader.file(XML_FILE)
 
     # Expand a node before one has been read
-    error = assert_raise(RuntimeError) do
+    error = assert_raises(RuntimeError) do
       reader.expand
     end
     assert_equal("The reader does not have a document.  Did you forget to call read?", error.to_s)
@@ -267,7 +266,7 @@ class TestReader < Test::Unit::TestCase
     reader.next
 
     # The previous node is now invalid
-    error = assert_raise(RuntimeError) do
+    error = assert_raises(RuntimeError) do
       assert_equal('feed', node.name)
     end
     assert_equal("This node has already been freed.", error.to_s)
@@ -370,7 +369,7 @@ class TestReader < Test::Unit::TestCase
     xml = "<bands genre=\"metal\">\n  <m\366tley_cr\374e country=\"us\">An American heavy metal band formed in Los Angeles, California in 1981.</m\366tley_cr\374e>\n  <iron_maiden country=\"uk\">British heavy metal band formed in 1975.</iron_maiden>\n</bands>"
 
     reader = XML::Reader.string(xml)
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       node = reader.read
     end
 

data/test/tc_relaxng.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestRelaxNG < Test::Unit::TestCase
+class TestRelaxNG < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
     @doc = XML::Document.file(file)
@@ -31,11 +30,11 @@ class TestRelaxNG < Test::Unit::TestCase
     new_node = XML::Node.new('invalid', 'this will mess up validation')
     @doc.root << new_node
     
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       @doc.validate_relaxng(relaxng)
     end
 
-    assert_not_nil(error)
+    refute_nil(error)
     assert_kind_of(XML::Error, error)
     assert(error.message.match(/Error: Did not expect element invalid there/))
     assert_equal(XML::Error::RELAXNGV, error.domain)
@@ -48,7 +47,7 @@ class TestRelaxNG < Test::Unit::TestCase
     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
 end

data/test/tc_sax_parser.rb

@@ -2,7 +2,6 @@
 
 require './test_helper'
 require 'stringio'
-require 'test/unit'
 
 class DocTypeCallback
   include XML::SaxParser::Callbacks
@@ -68,7 +67,7 @@ class TestCaseCallbacks
   end
 end
 
-class TestSaxParser < Test::Unit::TestCase
+class TestSaxParser < Minitest::Test
   def saxtest_file
     File.join(File.dirname(__FILE__), 'model/atom.xml')
   end
@@ -132,7 +131,7 @@ class TestSaxParser < Test::Unit::TestCase
   end
 
   def test_noexistent_file
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       XML::SaxParser.file('i_dont_exist.xml')
     end
 
@@ -140,7 +139,7 @@ class TestSaxParser < Test::Unit::TestCase
   end
 
   def test_nil_file
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::SaxParser.file(nil)
     end
 
@@ -157,7 +156,7 @@ class TestSaxParser < Test::Unit::TestCase
   end
 
   def test_nil_io
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::HTMLParser.io(nil)
     end
 
@@ -189,7 +188,7 @@ class TestSaxParser < Test::Unit::TestCase
   end
 
   def test_nil_string
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       XML::SaxParser.string(nil)
     end
 
@@ -207,7 +206,7 @@ EOS
     parser = XML::SaxParser.string(xml)
     parser.callbacks = DocTypeCallback.new
     doc = parser.parse
-    assert_not_nil(doc)
+    refute_nil(doc)
   end
 
   def test_parse_warning
@@ -243,7 +242,7 @@ EOS
     parser = XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       doc = parser.parse
     end
 
@@ -258,7 +257,7 @@ EOS
     assert_equal("error: Fatal error: Premature end of data in tag Results line 1 at :2.", result[i+=1])
     assert_equal("end_document", result[i+=1])
 
-    assert_not_nil(error)
+    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)
@@ -309,7 +308,7 @@ EOS
     parser = XML::SaxParser.string(xml)
     parser.callbacks = TestCaseCallbacks.new
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       parser.parse
     end
     assert_equal("Fatal error: xmlParseEntityRef: no name at :5.", error.to_s)

data/test/tc_schema.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestSchema < Test::Unit::TestCase
+class TestSchema < Minitest::Test
   def setup
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
     @doc = XML::Document.file(file)
@@ -19,7 +18,7 @@ class TestSchema < Test::Unit::TestCase
   end
 
   def check_error(error)
-    assert_not_nil(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)
@@ -45,13 +44,13 @@ class TestSchema < Test::Unit::TestCase
     new_node = XML::Node.new('invalid', 'this will mess up validation')
     @doc.root << new_node
 
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       @doc.validate_schema(schema)
     end
 
     check_error(error)
     assert_nil(error.line)
-    assert_not_nil(error.node)
+    refute_nil(error.node)
     assert_equal('invalid', error.node.name)
   end