Test cleanup

Author: cfis

test/test_canonicalize.rb

@@ -24,8 +24,7 @@ def test_canonicalize_with_w3c_c14n_3_1
     expected_1_1_without_comments = IO.read(self.path('c14n/result/1-1-without-comments/example-1'))
     mode = LibXML::XML::Document::XML_C14N_1_1
     assert_equal(expected_1_1_without_comments, given_doc.canonicalize(:mode => mode))
-  end#test_canonicalize_with_w3c_c14n_3_1
-
+  end
 
   # (www.w3.org) 3.2 Whitespace in Document Content
   # http://www.w3.org/TR/xml-c14n#Example-WhitespaceInContent
@@ -106,15 +105,15 @@ def test_canonicalize_with_w3c_c14n_3_6
   # http://www.w3.org/TR/xml-c14n#Example-DocSubsets
   def test_canonicalize_with_w3c_c14n_3_7
     # Non Canonicalized Document
-    # given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-7.xml'))
-    #expected = IO.read(self.path('c14n/result/without-comments/example-7'))
+    given_doc = LibXML::XML::Document.file(self.path('c14n/given/example-7.xml'))
+    expected = IO.read(self.path('c14n/result/without-comments/example-7'))
 
-    # e1_node = given_doc.find_first('ietf:e1', 'ietf:http://www.ietf.org')
+    e1_node = given_doc.find_first('ietf:e1', 'ietf:http://www.ietf.org')
 
     # Select current node, all child nodes, all attributes and namespace nodes
-    #subdoc_nodes = e1_node.find("(.//.|.//@id|namespace::*)")
+    subdoc_nodes = e1_node.find("(.//.|.//@id|namespace::*)")
 
     # TODO - This fails because the namespace nodes aren't taken into account
-    # assert_equal(expected, given_doc.canonicalize(:nodes => subdoc_nodes))
+    assert_equal(expected, given_doc.canonicalize(:nodes => subdoc_nodes))
   end
 end

test/test_deprecated_require.rb

@@ -49,8 +49,6 @@ def test_compression
       end
 
       -1.downto(-10) do |i|
-        # assert_equal(0, @doc.compression = i)
-        assert_equal(i, @doc.compression = i) # FIXME This bug should get fixed ASAP
         assert_equal(0, @doc.compression)
       end
     end

test/test_document.rb

@@ -138,11 +138,14 @@ def test_parse
   end
 
   def test_no_implied
-    skip("NOIMPLIED behavior changed in libxml2 2.14+") if Gem::Version.new(LibXML::XML::LIBXML_VERSION) >= Gem::Version.new("2.14")
     html = "hello world"
     parser = LibXML::XML::HTMLParser.string(html, :options => LibXML::XML::HTMLParser::Options::NOIMPLIED)
     doc = parser.parse
-    assert_equal("<p>#{html}</p>", doc.root.to_s)
+    if Gem::Version.new(LibXML::XML::LIBXML_VERSION) >= Gem::Version.new("2.14")
+      assert_nil(doc.root)
+    else
+      assert_equal("<p>#{html}</p>", doc.root.to_s)
+    end
   end
 
   def test_comment

test/test_html_parser.rb

@@ -220,38 +220,7 @@ def test_string_encoding
     assert_equal(Encoding::UTF_8, node.content.encoding)
     assert_equal("m\303\266tley_cr\303\274e", node.content)
   end
-
-  def test_fd_gc
-    skip
-    # Test opening # of documents up to the file limit for the OS.
-    # Ideally it should run until libxml emits a warning,
-    # thereby knowing we've done a GC sweep. For the time being,
-    # re-open the same doc `limit descriptors` times.
-    # If we make it to the end, then we've succeeded,
-    # otherwise an exception will be thrown.
-    LibXML::XML::Error.set_handler {|error|}
-
-    max_fd = if RUBY_PLATFORM.match(/mswin32|mswin64|mingw/i)
-      500
-    else
-      Process.getrlimit(Process::RLIMIT_NOFILE)[0] + 1
-    end
-
-    file = File.join(File.dirname(__FILE__), 'model/rubynet.xml')
-    max_fd.times do
-       LibXML::XML::Parser.file(file).parse
-    end
-    LibXML::XML::Error.reset_handler {|error|}
-  end
-
-  def test_open_many_files
-    file = File.expand_path(File.join(File.dirname(__FILE__), 'model/atom.xml'))
-    1000.times do
-      LibXML::XML::Parser.file(file).parse
-    end
-  end
-
-  # -----  Errors  ------
+  
   def test_error
     error = assert_raises(LibXML::XML::Error) do
       LibXML::XML::Parser.string('<foo><bar/></foz>').parse