nokogiri 1.4.7 → 1.5.0.beta.1

data/test/html/test_node.rb

@@ -127,15 +127,6 @@ module Nokogiri
         assert_equal 'foo&bar&baz', node['href']
       end
 
-      def test_parse_config_option
-        node = @html.at('div')
-        options = nil
-        node.parse("<div></div>") do |config|
-          options = config
-        end
-        assert_equal Nokogiri::XML::ParseOptions::DEFAULT_HTML, options.to_i
-      end
-
       def test_fragment_handler_does_not_regurge_on_invalid_attributes
         iframe = %Q{<iframe style="width: 0%; height: 0px" src="http://someurl" allowtransparency></iframe>}
         assert_nothing_raised { @html.at('div').fragment(iframe) }

data/test/test_memory_leak.rb

@@ -1,38 +1,16 @@
 require "helper"
 
 class TestMemoryLeak < Nokogiri::TestCase
-
   if ENV['NOKOGIRI_GC'] # turning these off by default for now
-
     def test_dont_hurt_em_why
       content = File.open("#{File.dirname(__FILE__)}/files/dont_hurt_em_why.xml").read
       ndoc = Nokogiri::XML(content)
       2.times do
-        ndoc.search('status text').first.inner_text
-        ndoc.search('user name').first.inner_text
+        info = ndoc.search('status text').first.inner_text
+        url = ndoc.search('user name').first.inner_text
         GC.start
       end
     end
-    
-    class BadIO
-      def read(*args)
-        raise 'hell'
-      end
-      
-      def write(*args)
-        raise 'chickens'
-      end
-    end
-  
-    def test_for_mem_leak_on_io_callbacks
-      io = File.open SNUGGLES_FILE
-      reader = Nokogiri::XML.parse(io)
-
-      (10**10).times do
-        Nokogiri::XML.parse(BadIO.new) rescue nil
-        doc.write BadIO.new rescue nil
-      end
-    end
 
     def test_for_memory_leak
       begin
@@ -62,39 +40,6 @@ class TestMemoryLeak < Nokogiri::TestCase
         puts "\ndike is not installed, skipping memory leak test"
       end
     end
-
-    if Nokogiri.ffi?
-      [ ['Node', 'p', nil],
-        ['CDATA', nil, 'content'],
-        ['Comment', nil, 'content'],
-        ['DocumentFragment', nil],
-        ['EntityReference', nil, 'p'],
-        ['ProcessingInstruction', nil, 'p', 'content'] ].each do |klass, *args|
-
-        define_method "test_for_leaked_#{klass}_nodes" do
-          Nokogiri::LibXML.expects(:xmlAddChild).at_least(1) # more than once shows we're GCing properly
-          10.times {
-            xml = Nokogiri::XML("<root></root>")
-            2.times { Nokogiri::XML.const_get(klass).new(*(args.collect{|arg| arg || xml})) }
-            GC.start
-          }
-          GC.start
-        end
-
-      end
-
-      def test_for_leaked_attr_nodes
-        Nokogiri::LibXML.expects(:xmlFreePropList).at_least(1) # more than once shows we're GCing properly
-        10.times {
-          xml = Nokogiri::XML("<root></root>")
-          2.times { Nokogiri::XML::Attr.new(xml, "p") }
-          GC.start
-        }
-        GC.start
-      end
-
-    end # if ffi
-
   end # if NOKOGIRI_GC
 
   private

data/test/test_nokogiri.rb

@@ -4,34 +4,28 @@ class TestNokogiri < Nokogiri::TestCase
   def test_versions
     version_match = /\d+\.\d+\.\d+/
     assert_match version_match, Nokogiri::VERSION
-    assert_match version_match, Nokogiri::LIBXML_VERSION
-
-    if defined?(FFI) && defined?(Nokogiri::LibXML)
-      assert_equal 'ffi', Nokogiri::VERSION_INFO['libxml']['binding']
-      if RUBY_PLATFORM =~ /java/
-        assert_equal 'jruby', Nokogiri::VERSION_INFO['libxml']['platform']
-      else
-        assert_equal 'ruby', Nokogiri::VERSION_INFO['libxml']['platform']
-      end
-      assert Nokogiri.ffi?
-    else
+
+    assert_equal Nokogiri::VERSION_INFO['ruby']['version'], ::RUBY_VERSION
+    assert_equal Nokogiri::VERSION_INFO['ruby']['platform'], ::RUBY_PLATFORM
+
+    if Nokogiri.uses_libxml?
+      assert_match version_match, Nokogiri::LIBXML_VERSION
       assert_equal 'extension', Nokogiri::VERSION_INFO['libxml']['binding']
 
       assert_match version_match, Nokogiri::VERSION_INFO['libxml']['compiled']
       assert_equal Nokogiri::LIBXML_VERSION, Nokogiri::VERSION_INFO['libxml']['compiled']
-      assert ! Nokogiri.ffi?
-    end
 
-    assert_match version_match, Nokogiri::VERSION_INFO['libxml']['loaded']
-    Nokogiri::LIBXML_PARSER_VERSION =~ /(\d)(\d{2})(\d{2})/
-    major = $1.to_i
-    minor = $2.to_i
-    bug   = $3.to_i
-    assert_equal "#{major}.#{minor}.#{bug}", Nokogiri::VERSION_INFO['libxml']['loaded']
+      assert_match version_match, Nokogiri::VERSION_INFO['libxml']['loaded']
+      Nokogiri::LIBXML_PARSER_VERSION =~ /(\d)(\d{2})(\d{2})/
+      major = $1.to_i
+      minor = $2.to_i
+      bug   = $3.to_i
+      assert_equal "#{major}.#{minor}.#{bug}", Nokogiri::VERSION_INFO['libxml']['loaded']
+    end
   end
 
   def test_libxml_iconv
-    assert Nokogiri.const_defined?(:LIBXML_ICONV_ENABLED)
+    assert Nokogiri.const_defined?(:LIBXML_ICONV_ENABLED) if Nokogiri.uses_libxml?
   end
 
   def test_parse_with_io

data/test/test_reader.rb

@@ -8,32 +8,6 @@ class TestReader < Nokogiri::TestCase
     assert_equal io, reader.source
   end
 
-  def test_empty_element?
-    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
-<xml><city>Paris</city><state/></xml>
-    eoxml
-
-    results = reader.map do |node|
-      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
-        node.empty_element?
-      end
-    end
-    assert_equal [false, false, nil, nil, true, nil], results
-  end
-
-  def test_self_closing?
-    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
-<xml><city>Paris</city><state/></xml>
-    eoxml
-
-    results = reader.map do |node|
-      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
-        node.self_closing?
-      end
-    end
-    assert_equal [false, false, nil, nil, true, nil], results
-  end
-
   def test_reader_takes_block
     options = nil
     Nokogiri::XML::Reader(File.read(XML_FILE), XML_FILE) do |cfg|
@@ -81,22 +55,9 @@ class TestReader < Nokogiri::TestCase
     assert_equal [false, false, false, false, false, false, false],
       reader.map { |x| x.default? }
   end
-  
-  class ReallyBadIO
-    def read(size)
-      'a' * size ** 10
-    end
-  end
-
-  unless Nokogiri.ffi?
-    def test_io_that_reads_too_much
-      io = ReallyBadIO.new
-      Nokogiri::XML::Reader(io)
-    end
-  end
 
   def test_in_memory
-    assert Nokogiri::XML::Reader(<<-eoxml)
+    reader = Nokogiri::XML::Reader(<<-eoxml)
     <x xmlns:tenderlove='http://tenderlovemaking.com/'>
       <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
     </x>
@@ -110,12 +71,7 @@ class TestReader < Nokogiri::TestCase
     </x>
     eoxml
     reader = Nokogiri::XML::Reader(xml)
-    if Nokogiri.ffi?
-      assert_not_nil reader.source
-      assert reader.source.is_a?(FFI::MemoryPointer)
-    else
-      assert_equal xml, reader.source
-    end
+    assert_equal xml, reader.source
   end
 
   def test_default?
@@ -147,9 +103,13 @@ class TestReader < Nokogiri::TestCase
       <foo>
     </x>
     eoxml
-    assert_raises(Nokogiri::XML::SyntaxError) do
+    error_happened = false
+    begin
       reader.each { |node| }
+    rescue Nokogiri::XML::SyntaxError => ex
+      error_happened = true
     end
+    assert error_happened
     assert 1, reader.errors.length
   end
 

data/test/test_xslt_transforms.rb

@@ -1,11 +1,13 @@
 require "helper"
 
 class TestXsltTransforms < Nokogiri::TestCase
+
   def setup
     @doc = Nokogiri::XML(File.open(XML_FILE))
   end
 
-  if Nokogiri.uses_libxml?
+  if Nokogiri.uses_libxml? && Nokogiri::VERSION_INFO['libxml']['loaded'] > '2.6.16'
+
     def test_class_methods
       style = Nokogiri::XSLT(File.read(XSLT_FILE))
 
@@ -157,7 +159,7 @@ encoding="iso-8859-1" indent="yes"/>
             Nokogiri::XSLT.quote_params(params.to_a.flatten)))
         check_params result_doc, params
       end
-    end
+     end
 
     def test_xslt_parse_error
       xslt_str = <<-EOX
@@ -178,16 +180,11 @@ encoding="iso-8859-1" indent="yes"/>
       assert_raises(RuntimeError) { Nokogiri::XSLT.parse(xslt_str) }
     end
 
-    def test_passing_a_non_document_to_transform
-      xsl = Nokogiri::XSLT('<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"></xsl:stylesheet>')
-      assert_raises(ArgumentError) { xsl.transform("<div></div>") }
-      assert_raises(ArgumentError) { xsl.transform(Nokogiri::HTML("").css("body")) }
-    end
-
     def check_params result_doc, params
       result_doc.xpath('/root/params/*').each do  |p|
         assert_equal p.content, params[p.name.intern]
       end
     end
+
   end
 end

data/test/xml/sax/test_parser.rb

@@ -24,7 +24,7 @@ module Nokogiri
 
           assert block_called
 
-          assert_equal [['foo', [['a', '&b']]]], doc.start_elements
+          assert_equal ['a', '&b'], doc.start_elements.first.last
         end
 
         def test_parser_context_yielded_in_memory
@@ -40,7 +40,7 @@ module Nokogiri
 
           assert block_called
 
-          assert_equal [['foo', [['a', '&b']]]], doc.start_elements
+          assert_equal ['a', '&b'], doc.start_elements.first.last
         end
 
         def test_xml_decl
@@ -95,6 +95,7 @@ module Nokogiri
   <foo:bar>hello world</foo:bar>
 </root>
           eoxml
+
           assert @parser.document.start_elements_namespace.length > 0
           el = @parser.document.start_elements_namespace[1]
           assert_equal 'a', el.first
@@ -144,8 +145,12 @@ module Nokogiri
         end
 
         def test_start_is_called_without_namespace
-          @parser.parse('<foo:f><bar></foo:f>')
-          assert_equal ['foo:f', 'bar'],
+          @parser.parse(<<-eoxml)
+<root xmlns:foo='http://foo.example.com/' xmlns='http://example.com/'>
+<foo:f><bar></foo:f>
+</root>
+          eoxml
+          assert_equal ['root', 'foo:f', 'bar'],
             @parser.document.start_elements.map { |x| x.first }
         end
 
@@ -291,39 +296,17 @@ module Nokogiri
           @parser.parse_memory(<<-eoxml)
             <p id="asdfasdf">Paragraph 1</p>
           eoxml
-          assert_equal [["p", [["id", "asdfasdf"]]]],
-                       @parser.document.start_elements
-        end
-
-        def test_start_element_attrs_include_namespaces
-          @parser.parse_memory(<<-eoxml)
-            <p xmlns:foo='http://foo.example.com/'>Paragraph 1</p>
-          eoxml
-          assert_equal [["p", [['xmlns:foo', 'http://foo.example.com/']]]],
+          assert_equal [["p", ["id", "asdfasdf"]]],
                        @parser.document.start_elements
         end
 
-        def test_parse_document
-          @parser.parse_memory(<<-eoxml)
-            <p>Paragraph 1</p>
-            <p>Paragraph 2</p>
-          eoxml
-        end
-
-        def test_parser_attributes
-          xml = <<-eoxml
-<?xml version="1.0" ?><root><foo a="&amp;b" c="&gt;d" /></root>
-          eoxml
-
-          block_called = false
-          @parser.parse(xml) { |ctx|
-            block_called = true
-            ctx.replace_entities = true
-          }
-
-          assert block_called
-
-          assert_equal [['root', []], ['foo', [['a', '&b'], ['c', '>d']]]], @parser.document.start_elements
+        if Nokogiri.uses_libxml? # JRuby SAXParser only parses well-formed XML documents
+          def test_parse_document
+            @parser.parse_memory(<<-eoxml)
+              <p>Paragraph 1</p>
+              <p>Paragraph 2</p>
+            eoxml
+          end
         end
       end
     end

data/test/xml/sax/test_parser_context.rb

@@ -6,56 +6,6 @@ module Nokogiri
   module XML
     module SAX
       class TestParserContext < Nokogiri::SAX::TestCase
-        def setup
-          @xml = '<hello>
-
-world
-<inter>
-    <net>
-    </net>
-</inter>
-
-</hello>'
-        end
-
-        class Counter < Nokogiri::XML::SAX::Document
-          attr_accessor :context, :lines, :columns
-          def initialize
-            @context = nil
-            @lines   = []
-            @columns = []
-          end
-
-          def start_element name, attrs = []
-            @lines << [name, context.line]
-            @columns << [name, context.column]
-          end
-        end
-
-        def test_line_numbers
-          sax_handler = Counter.new
-
-          parser = Nokogiri::XML::SAX::Parser.new(sax_handler)
-          parser.parse(@xml) do |ctx|
-            sax_handler.context = ctx
-          end
-
-          assert_equal [["hello", 1], ["inter", 4], ["net", 5]],
-            sax_handler.lines
-        end
-
-        def test_column_numbers
-          sax_handler = Counter.new
-
-          parser = Nokogiri::XML::SAX::Parser.new(sax_handler)
-          parser.parse(@xml) do |ctx|
-            sax_handler.context = ctx
-          end
-
-          assert_equal [["hello", 7], ["inter", 7], ["net", 9]],
-            sax_handler.columns
-        end
-
         def test_replace_entities
           pc = ParserContext.new StringIO.new('<root />'), 'UTF-8'
           pc.replace_entities = false

data/test/xml/sax/test_push_parser.rb

@@ -38,24 +38,7 @@ module Nokogiri
             <p id="asdfasdf">
           eoxml
 
-          assert_equal [["p", [["id", "asdfasdf"]]]],
-            @parser.document.start_elements
-
-          @parser.<<(<<-eoxml)
-              <!-- This is a comment -->
-              Paragraph 1
-            </p>
-          eoxml
-          assert_equal [' This is a comment '], @parser.document.comments
-          @parser.finish
-        end
-
-        def test_start_element_with_namespaces
-          @parser.<<(<<-eoxml)
-            <p xmlns:foo="http://foo.example.com/">
-          eoxml
-
-          assert_equal [["p", [["xmlns:foo", "http://foo.example.com/"]]]],
+          assert_equal [["p", ["id", "asdfasdf"]]],
             @parser.document.start_elements
 
           @parser.<<(<<-eoxml)

data/test/xml/test_attr.rb

@@ -4,12 +4,10 @@ module Nokogiri
   module XML
     class TestAttr < Nokogiri::TestCase
       def test_new
-        assert_nothing_raised do
-          100.times {
-            doc = Nokogiri::XML::Document.new
-            Nokogiri::XML::Attr.new(doc, 'foo')
-          }
-        end
+        100.times {
+          doc = Nokogiri::XML::Document.new
+          attribute = Nokogiri::XML::Attr.new(doc, 'foo')
+        }
       end
 
       def test_content=
@@ -35,31 +33,6 @@ module Nokogiri
         address.attribute_nodes.first.unlink
         assert_nil address['domestic']
       end
-
-      def test_parsing_attribute_namespace
-        doc = Nokogiri::XML <<-EOXML
-<root xmlns='http://google.com/' xmlns:f='http://flavorjon.es/'>
-  <div f:myattr='foo'></div>
-</root>
-        EOXML
-
-        node = doc.at_css "div"
-        attr = node.attributes["myattr"]
-        assert_equal "http://flavorjon.es/", attr.namespace.href
-      end
-
-      def test_setting_attribute_namespace
-        doc = Nokogiri::XML <<-EOXML
-<root xmlns='http://google.com/' xmlns:f='http://flavorjon.es/'>
-  <div f:myattr='foo'></div>
-</root>
-        EOXML
-
-        node = doc.at_css "div"
-        attr = node.attributes["myattr"]
-        attr.add_namespace("fizzle", "http://fizzle.com/")
-        assert_equal "http://fizzle.com/", attr.namespace.href
-      end
     end
   end
 end