nokogiri 1.1.1-java → 1.2.0-java

data/test/helper.rb

@@ -34,6 +34,7 @@ module Nokogiri
         attr_reader :start_elements, :start_document_called
         attr_reader :end_elements, :end_document_called
         attr_reader :data, :comments, :cdata_blocks
+        attr_reader :errors, :warnings
 
         def start_document
           @start_document_called = true
@@ -45,6 +46,16 @@ module Nokogiri
           super
         end
 
+        def error error
+          (@errors ||= []) << error
+          super
+        end
+
+        def warning warning
+          (@warning ||= []) << warning
+          super
+        end
+
         def start_element *args
           (@start_elements ||= []) << args
           super

data/test/hpricot/test_builder.rb

@@ -5,7 +5,7 @@ class TestBuilder < Nokogiri::TestCase
   # Modified
   def test_escaping_text
     doc = Nokogiri.Hpricot() { b "<a\"b>" }
-    assert_equal "<b>&lt;a\"b&gt;</b>", doc.to_html.chomp
+    assert_match "<b>&lt;a\"b&gt;</b>", doc.to_html.chomp
     assert_equal %{&lt;a\"b&gt;}, doc.at("text()").to_s
   end
 
@@ -13,15 +13,8 @@ class TestBuilder < Nokogiri::TestCase
   # Modified
   def test_no_escaping_text
     doc = Nokogiri.Hpricot() { div.test.me! { text "<a\"b>" } }
-    assert_equal %{<div class="test" id="me">&lt;a"b&gt;</div>},
+    assert_match %{<div class="test" id="me">&lt;a"b&gt;</div>},
       doc.to_html.chomp
     assert_equal %{&lt;a\"b&gt;}, doc.at("text()").to_s
   end
-
-  ####
-  # Modified
-  def test_latin1_entities
-    doc = Nokogiri.Hpricot() { b "\200\225" }
-    assert_equal "<b>&#21;</b>", doc.to_html.chomp
-  end
 end

data/test/hpricot/test_parser.rb

@@ -206,11 +206,11 @@ class TestParser < Nokogiri::TestCase
     #  MODIFIED:
     #  hpricot has an off-by-one bug eith eq-and-friends.
     assert_equal "<p>The third paragraph</p>",
-        @basic.search('p:eq(3)').to_html # under Hpricot this was eq(2)
+        @basic.search('p:eq(3)').to_html.chomp # under Hpricot this was eq(2)
     ##
     #  MODIFIED: to be blank-agnostic, because Nokogiri's to_html is slightly different compared to Hpricot.
     assert_equal '<p class="last final"><b>THE FINAL PARAGRAPH</b></p>',
-        @basic.search('p:last').to_html.gsub(/\s+/,' ')
+        @basic.search('p:last').to_html.gsub(/\s+/,' ').gsub(/>\s*</, '><')
     assert_equal 'last final', @basic.search('p:last-of-type').first.get_attribute('class') # MODIFIED to not have '//' prefix
   end
 
@@ -220,7 +220,7 @@ class TestParser < Nokogiri::TestCase
       element.after('<p>Paragraph 1</p><p>Paragraph 2</p>')
     end
     assert_match '<div id="a-div"></div><p>Paragraph 1</p><p>Paragraph 2</p>',
-      doc.to_html.gsub(/\n/, '')
+      doc.to_html.gsub(/\n/, '').gsub(/>\s*</, '><')
   end
 
   def test_insert_before # ticket #61
@@ -229,7 +229,7 @@ class TestParser < Nokogiri::TestCase
       element.before('<p>Paragraph 1</p><p>Paragraph 2</p>')
     end
     assert_match '<p>Paragraph 1</p><p>Paragraph 2</p><div id="a-div"></div>',
-      doc.to_html.gsub(/\n/, '')
+      doc.to_html.gsub(/\n/, '').gsub(/>\s*</, '><')
   end
 
   def test_many_paths

data/test/html/test_builder.rb

@@ -10,7 +10,7 @@ module Nokogiri
           }
         end
         assert_equal('<div id="awesome"><h1>america</h1></div>',
-                     builder.to_html.gsub(/\n/, ''))
+                     builder.doc.root.to_html.gsub(/\n/, '').gsub(/>\s*</, '><'))
       end
 
       def test_has_ampersand
@@ -22,7 +22,7 @@ module Nokogiri
         end
         assert_equal(
           '<div class="rad" id="thing">&lt;awe&amp;some&gt;<b>hello &amp; world</b></div>',
-                     builder.to_html.gsub(/\n/, ''))
+                     builder.doc.root.to_html.gsub(/\n/, ''))
       end
 
       def test_multi_tags
@@ -34,7 +34,7 @@ module Nokogiri
         end
         assert_equal(
           '<div class="rad" id="thing">&lt;awesome&gt;<b>hello</b></div>',
-                     builder.doc.to_html.gsub(/\n/, ''))
+                     builder.doc.root.to_html.gsub(/\n/, ''))
       end
 
       def test_attributes_plus_block
@@ -44,7 +44,7 @@ module Nokogiri
           }
         end
         assert_equal('<div class="rad" id="thing">&lt;awesome&gt;</div>',
-                     builder.doc.to_html.chomp)
+                     builder.doc.root.to_html.chomp)
       end
 
       def test_builder_adds_attributes
@@ -52,14 +52,14 @@ module Nokogiri
           div.rad.thing! "tender div"
         end
         assert_equal('<div class="rad" id="thing">tender div</div>',
-                     builder.doc.to_html.chomp)
+                     builder.doc.root.to_html.chomp)
       end
 
       def test_bold_tag
         builder = Nokogiri::HTML::Builder.new do
           b "bold tag"
         end
-        assert_equal('<b>bold tag</b>', builder.doc.to_html.chomp)
+        assert_equal('<b>bold tag</b>', builder.doc.root.to_html.chomp)
       end
 
       def test_html_then_body_tag
@@ -71,7 +71,7 @@ module Nokogiri
           }
         end
         assert_equal('<html><body><b>bold tag</b></body></html>',
-                     builder.doc.to_html.chomp)
+                     builder.doc.root.to_html.chomp.gsub(/>\s*</, '><'))
       end
       
       def test_instance_eval_with_delegation_to_block_context

data/test/html/test_document.rb

@@ -12,6 +12,41 @@ module Nokogiri
         assert html.html?
       end
 
+      def test_parse_io
+        assert doc = File.open(HTML_FILE, 'rb') { |f|
+          Document.read_io(f, nil, 'UTF-8', PARSE_NOERROR | PARSE_NOWARNING)
+        }
+      end
+
+      def test_to_xhtml
+        assert_match 'XHTML', @html.to_xhtml
+        assert_match 'XHTML', @html.to_xhtml('UTF-8')
+        assert_match 'UTF-8', @html.to_xhtml('UTF-8')
+      end
+
+      def test_no_xml_header
+        html = Nokogiri::HTML(<<-eohtml)
+        <html>
+        </html>
+        eohtml
+        assert html.to_html.length > 0, 'html length is too short'
+        assert_no_match(/^<\?xml/, html.to_html)
+      end
+
+      def test_document_has_error
+        html = Nokogiri::HTML(<<-eohtml)
+        <html>
+          <body>
+            <div awesome="asdf>
+              <p>inside div tag</p>
+            </div>
+            <p>outside div tag</p>
+          </body>
+        </html>
+        eohtml
+        assert html.errors.length > 0
+      end
+
       def test_relative_css
         html = Nokogiri::HTML(<<-eohtml)
         <html>
@@ -60,6 +95,48 @@ module Nokogiri
         assert_equal('Hello world!', node.inner_text.strip)
       end
 
+      def test_find_by_xpath
+        found = @html.xpath('//div/a')
+        assert_equal 3, found.length
+      end
+
+      def test_find_by_css
+        found = @html.css('div > a')
+        assert_equal 3, found.length
+      end
+
+      def test_dup_shallow
+        found = @html.search('//div/a').first
+        dup = found.dup(0)
+        assert dup
+        assert_equal '', dup.content
+      end
+
+      def test_search_can_handle_xpath_and_css
+        found = @html.search('//div/a', 'div > p')
+        length = @html.xpath('//div/a').length +
+          @html.css('div > p').length
+        assert_equal length, found.length
+      end
+
+      def test_dup_document
+        assert dup = @html.dup
+        assert_not_equal dup, @html
+      end
+
+      def test_dup_document_shallow
+        assert dup = @html.dup(0)
+        assert_not_equal dup, @html
+      end
+
+      def test_dup
+        found = @html.search('//div/a').first
+        dup = found.dup
+        assert dup
+        assert_equal found.content, dup.content
+        assert_equal found.document, dup.document
+      end
+
       def test_inner_html
         html = Nokogiri::HTML(<<-eohtml)
         <html>
@@ -76,15 +153,24 @@ module Nokogiri
         assert_equal('<p>Helloworld!</p>', node.inner_html.gsub(/\s/, ''))
       end
 
+      def test_fragment_includes_two_tags
+        assert_equal 2, Nokogiri::HTML.fragment("<br/><hr/>").children.length
+      end
+
       def test_fragment
-        node_set = Nokogiri::HTML.fragment(<<-eohtml)
+        fragment = Nokogiri::HTML.fragment(<<-eohtml)
           <div>
             <b>Hello World</b>
           </div>
         eohtml
-        assert_equal 1, node_set.length
-        assert_equal 'div', node_set.first.name
-        assert_match(/Hello World/, node_set.to_html)
+        assert_equal 1, fragment.children.length
+        assert_equal 'div', fragment.children.first.name
+        assert_match(/Hello World/, fragment.to_html)
+
+        # libxml2 is broken in 2.6.16 and 2.6.17
+        unless [16, 17].include?(Nokogiri::LIBXML_VERSION.split('.').last.to_i)
+          assert_equal 1, fragment.css('div').length
+        end
       end
 
       def test_relative_css_finder

data/test/html/test_node.rb

@@ -13,6 +13,7 @@ module Nokogiri
         </body></html>
         EOH
         nokogiri = Nokogiri::HTML.parse(html)
+
         assert_equal "<p>testparagraph\r\nfoobar</p>",
           nokogiri.at("p").to_html.gsub(/ /, '')
       end

data/test/test_css_cache.rb

@@ -27,14 +27,12 @@ class TestCssCache < Nokogiri::TestCase
 
   [ false, true ].each do |cache_setting|
     define_method "test_css_cache_#{cache_setting ? "true" : "false"}" do
-      times = cache_setting ? 6 : nil
+      times = cache_setting ? 4 : nil
 
       Nokogiri::CSS::Parser.set_cache cache_setting
       
       Nokogiri::CSS.xpath_for(@css)
       Nokogiri::CSS.xpath_for(@css)
-      Nokogiri::CSS::Parser.xpath_for(@css)
-      Nokogiri::CSS::Parser.xpath_for(@css)
       Nokogiri::CSS::Parser.new.xpath_for(@css)
       Nokogiri::CSS::Parser.new.xpath_for(@css)
 

data/test/test_reader.rb

@@ -24,6 +24,23 @@ class TestReader < Nokogiri::TestCase
       reader.map { |x| x.value? }
   end
 
+  def test_read_error_document
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+      <foo>
+    </x>
+    eoxml
+    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
+
   def test_attributes?
     reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
     <x xmlns:tenderlove='http://tenderlovemaking.com/'>
@@ -112,12 +129,13 @@ class TestReader < Nokogiri::TestCase
   end
 
   def test_encoding
-    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+    string = <<-eoxml
     <awesome>
       <p xml:lang="en">The quick brown fox jumps over the lazy dog.</p>
       <p xml:lang="ja">日本語が上手です</p>
     </awesome>
     eoxml
+    reader = Nokogiri::XML::Reader.from_memory(string, nil, 'UTF-8')
     assert_nil reader.encoding
     assert_equal [nil], reader.map { |x| x.encoding }.uniq
   end

data/test/test_xslt_transforms.rb

@@ -73,7 +73,7 @@ class TestXsltTransforms < Nokogiri::TestCase
     assert_equal 'func-result', result_doc.at('/root/function').content
     assert_equal 3, result_doc.at('/root/max').content.to_i
     assert_match(
-      /\d{4}-\d\d-\d\d-\d\d:\d\d/, 
+      /\d{4}-\d\d-\d\d[-|+]\d\d:\d\d/,
       result_doc.at('/root/date').content
       )
     result_doc.xpath('/root/params/*').each do  |p|

data/test/xml/node/test_save_options.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..',"helper"))
+
+module Nokogiri
+  module XML
+    class Node
+      class TestSaveOptions < Nokogiri::TestCase
+        SaveOptions.constants.each do |constant|
+          class_eval %{
+            def test_predicate_#{constant.downcase}
+              options = SaveOptions.new(SaveOptions::#{constant})
+              assert options.#{constant.downcase}?
+
+              assert SaveOptions.new.#{constant.downcase}.#{constant.downcase}?
+            end
+          }
+        end
+      end
+    end
+  end
+end

data/test/xml/sax/test_parser.rb

@@ -8,6 +8,23 @@ module Nokogiri
           @parser = XML::SAX::Parser.new(Doc.new)
         end
 
+        def test_bad_document_calls_error_handler
+          @parser.parse('<foo><bar></foo>')
+          assert @parser.document.errors
+          assert @parser.document.errors.length > 0
+        end
+
+        def test_errors_set_after_parsing_bad_dom
+          doc = Nokogiri::XML('<foo><bar></foo>')
+          assert doc.errors
+
+          @parser.parse('<foo><bar></foo>')
+          assert @parser.document.errors
+          assert @parser.document.errors.length > 0
+
+          assert_equal doc.errors.length, @parser.document.errors.length
+        end
+
         def test_parse
           File.open(XML_FILE, 'rb') { |f|
             @parser.parse(f)

data/test/xml/sax/test_push_parser.rb

@@ -0,0 +1,67 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "helper"))
+
+module Nokogiri
+  module XML
+    module SAX
+      class TestPushParser < Nokogiri::SAX::TestCase
+        def setup
+          @parser = XML::SAX::PushParser.new(Doc.new)
+        end
+
+        def test_end_document_called
+          @parser.<<(<<-eoxml)
+            <p id="asdfasdf">
+              <!-- This is a comment -->
+              Paragraph 1
+            </p>
+          eoxml
+          assert ! @parser.document.end_document_called
+          @parser.finish
+          assert @parser.document.end_document_called
+        end
+
+        def test_start_element
+          @parser.<<(<<-eoxml)
+            <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_chevron_partial_xml
+          @parser.<<(<<-eoxml)
+            <p id="asdfasdf">
+          eoxml
+
+          @parser.<<(<<-eoxml)
+              <!-- This is a comment -->
+              Paragraph 1
+            </p>
+          eoxml
+          assert_equal [' This is a comment '], @parser.document.comments
+          @parser.finish
+        end
+
+        def test_chevron
+          @parser.<<(<<-eoxml)
+            <p id="asdfasdf">
+              <!-- This is a comment -->
+              Paragraph 1
+            </p>
+          eoxml
+          @parser.finish
+          assert_equal [' This is a comment '], @parser.document.comments
+        end
+      end
+    end
+  end
+end