libxml-ruby 2.7.0 → 2.9.0

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
 

data/test/tc_traversal.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestTranversal < Test::Unit::TestCase
+class TestTranversal < Minitest::Test
   ROOT_NODES_LENGTH = 27
   ROOT_ELEMENTS_LENGTH = 13
   

data/test/tc_writer.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require 'stringio'
-require 'test/unit'
 
-class TestWriter < Test::Unit::TestCase
+class TestWriter < Minitest::Test
   XSL_PREFIX = 'xsl'
   XSL_URI = 'http://www.w3.org/1999/XSL/Transform'
 

data/test/tc_xinclude.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 
-class TestXInclude < Test::Unit::TestCase
+class TestXInclude < Minitest::Test
   def setup
     @doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/xinclude.xml'))
     assert_instance_of(XML::Document, @doc)

data/test/tc_xml.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require './test_helper'
-require 'test/unit'
 require 'stringio'
 
-class TestXml < Test::Unit::TestCase
+class TestXml < Minitest::Test
   # -----  Constants  ------
   def test_lib_versions
     assert(XML.check_lib_versions)

data/test/tc_xpath.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require 'tempfile'
-require 'test/unit'
 
-class TestXPath < Test::Unit::TestCase
+class TestXPath < Minitest::Test
   def setup
     @doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
   end
@@ -109,17 +108,17 @@ class TestXPath < Test::Unit::TestCase
     doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/atom.xml'))
 
     # No namespace has been yet defined
-    assert_raise(XML::Error) do
+    assert_raises(XML::Error) do
       node = doc.find("atom:title")
     end
 
     node = doc.find('atom:title', 'atom:http://www.w3.org/2005/Atom')
-    assert_not_nil(node)
+    refute_nil(node)
 
     # Register namespace
     doc.root.namespaces.default_prefix = 'atom'
     node = doc.find("atom:title")
-    assert_not_nil(node)
+    refute_nil(node)
   end
 
   def test_node_find
@@ -145,7 +144,7 @@ class TestXPath < Test::Unit::TestCase
 
   def test_node_no_doc
     node = XML::Node.new('header', 'some content')
-    assert_raise(TypeError) do
+    assert_raises(TypeError) do
       node = node.find_first('/header')
     end
   end
@@ -201,20 +200,20 @@ class TestXPath < Test::Unit::TestCase
 	def test_xpath_empty_result
     doc = XML::Document.string('<html><body><p>Welcome to XHTML land!</p></body></html>')
 		nodes = doc.find("//object/param[translate(@name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = 'wmode']")
-		assert_not_nil nodes
+		refute_nil nodes
 	end
 
   def test_invalid_expression
     xml = LibXML::XML::Document.string('<a></a>')
 
     # Using the expression twice used to cause a Segmentation Fault
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       xml.find('//a/')
     end
     assert_equal("Error: Invalid expression.", error.to_s)
 
     # Try again - this used to cause a Segmentation Fault
-    error = assert_raise(XML::Error) do
+    error = assert_raises(XML::Error) do
       xml.find('//a/')
     end
     assert_equal("Error: Invalid expression.", error.to_s)

data/test/tc_xpath_context.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 require "tempfile"
-require "test/unit"
 
-class TestXPathContext < Test::Unit::TestCase
+class TestXPathContext < Minitest::Test
   SOAP_PREFIX = 'soap'
   SOAP_URI = 'http://schemas.xmlsoap.org/soap/envelope/'
   
@@ -21,7 +20,7 @@ class TestXPathContext < Test::Unit::TestCase
   end
   
   def test_no_ns
-    error = assert_raise(LibXML::XML::Error) do
+    error = assert_raises(LibXML::XML::Error) do
       @context.find('/soap:Envelope')
     end
     assert_equal("Error: Undefined namespace prefix.", error.to_s)
@@ -81,7 +80,7 @@ class TestXPathContext < Test::Unit::TestCase
 
   def test_require_doc
     doc = XML::Document.file(File.join(File.dirname(__FILE__), 'model/soap.xml'))
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       @context = XML::XPath::Context.new(doc.root)
     end
     assert_equal("Supplied argument must be a document or node.", error.to_s)

data/test/tc_xpath_expression.rb

@@ -2,9 +2,8 @@
 
 require './test_helper'
 
-require 'test/unit'
 
-class TestXPathExpression < Test::Unit::TestCase
+class TestXPathExpression < 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
@@ -29,10 +28,10 @@ class TestXPathExpression < Test::Unit::TestCase
   end
 
   def test_find_invalid
-    error = assert_raise(TypeError) do
+    error = assert_raises(TypeError) do
       set = @doc.find(999)
     end
-    assert_equal('Argument should be an intance of a String or XPath::Expression',
+    assert_equal('Argument should be an instance of a String or XPath::Expression',
                  error.to_s)
   end
 end

data/test/tc_xpointer.rb

@@ -1,9 +1,7 @@
 # encoding: UTF-8
-
 require './test_helper'
-require "test/unit"
 
-class TC_XML_XPointer < Test::Unit::TestCase
+class TC_XML_XPointer < Minitest::Test
   def setup()
     xp = XML::Parser.string('<!DOCTYPE ra [<!ELEMENT ra (foo+)><!ATTLIST ra id ID #IMPLIED><!ELEMENT foo (#PCDATA)><!ATTLIST foo id ID #IMPLIED>]><ra id="start"><foo id="one">one</foo><foo id="two">two</foo><foo id="three">three</foo></ra>')
     @doc = xp.parse

data/test/test_helper.rb

@@ -11,4 +11,6 @@ $LOAD_PATH << lib
 $LOAD_PATH << ext
 
 require 'xml'
-
+require 'minitest/autorun'
+# require 'minitest/reporters'
+# MiniTest::Reporters.use!

data/test/test_suite.rb

@@ -40,7 +40,6 @@ require './tc_xpath_context'
 require './tc_xpath_expression'
 require './tc_xpointer'
 
-
 if defined?(Encoding)
   require './tc_encoding'
   require './tc_encoding_sax'