nokogiri 1.4.7 → 1.5.0.beta.1

data/test/xml/test_attribute_decl.rb

@@ -9,7 +9,7 @@ module Nokogiri
 <?xml version="1.0"?><?TEST-STYLE PIDATA?>
 <!DOCTYPE staff SYSTEM "staff.dtd" [
    <!ATTLIST br width CDATA "0">
-   <!ATTLIST a width CDATA >
+   <!ATTLIST a width CDATA "0">
    <!ATTLIST payment type (check|cash) "cash">
 ]>
 <root />
@@ -64,12 +64,16 @@ module Nokogiri
       end
 
       def test_attribute_type
-        assert_equal 1, @attr_decl.attribute_type
+        if Nokogiri.uses_libxml?
+          assert_equal 1, @attr_decl.attribute_type
+        else
+          assert_equal 'CDATA', @attr_decl.attribute_type
+        end
       end
 
       def test_default
         assert_equal '0', @attr_decl.default
-        assert_nil @attrs[1].default
+        assert_equal '0', @attrs[1].default
       end
 
       def test_enumeration

data/test/xml/test_builder.rb

@@ -83,8 +83,8 @@ module Nokogiri
           end
         }
         doc = b.doc
-        assert_equal 'bar', doc.at('foo|bar', 'foo' => 'bar').namespace.href
-        assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
       def test_specify_namespace_nested
@@ -100,12 +100,12 @@ module Nokogiri
           end
         }
         doc = b.doc
-        assert_equal 'bar', doc.at('foo|bar', 'foo' => 'bar').namespace.href
-        assert_equal 'bar', doc.at('foo|baz', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|bar', 'foo' => 'bar').namespace.href
+        assert_equal 'bar', b.doc.at('foo|baz', 'foo' => 'bar').namespace.href
       end
 
       def test_specified_namespace_undeclared
-        Nokogiri::XML::Builder.new { |xml|
+        b = Nokogiri::XML::Builder.new { |xml|
           xml.root do
             assert_raises(ArgumentError) do
               xml[:foo]

data/test/xml/test_cdata.rb

@@ -29,9 +29,9 @@ module Nokogiri
       end
 
       def test_lots_of_new_cdata
-        assert_nothing_raised do
-          100.times { CDATA.new(@xml, "asdfasdf") }
-        end
+        100.times {
+          node = CDATA.new(@xml, "asdfasdf")
+        }
       end
 
       def test_content=

data/test/xml/test_document.rb

@@ -21,6 +21,12 @@ module Nokogiri
         assert_equal nil, @xml.root
       end
 
+      def test_parse_should_not_exist
+        assert_raises(NoMethodError) do
+          @xml.parse("foo")
+        end
+      end
+
       def test_collect_namespaces
         doc = Nokogiri::XML(<<-eoxml)
         <xml>
@@ -217,7 +223,12 @@ module Nokogiri
       end
 
       def test_validate
-        assert_equal 44, @xml.validate.length
+        if Nokogiri.uses_libxml?
+          assert_equal 44, @xml.validate.length
+        else
+          xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) {|cfg| cfg.dtdvalid}
+          assert_equal 37, xml.validate.length
+        end
       end
 
       def test_validate_no_internal_subset
@@ -329,12 +340,12 @@ module Nokogiri
       end
 
       def test_non_existant_function
-        # WTF.  I don't know why this is different between MRI and ffi.
+        # WTF.  I don't know why this is different between MRI and Jruby
         # They should be the same...  Either way, raising an exception
         # is the correct thing to do.
         exception = RuntimeError
 
-        if Nokogiri::VERSION_INFO['libxml']['platform'] == 'jruby'
+        if !Nokogiri.uses_libxml? || (Nokogiri.uses_libxml? && Nokogiri::VERSION_INFO['libxml']['platform'] == 'jruby')
           exception = Nokogiri::XML::XPath::SyntaxError
         end
 
@@ -406,7 +417,7 @@ module Nokogiri
       end
 
       # wtf...  osx's libxml sucks.
-      unless Nokogiri::LIBXML_VERSION =~ /^2\.6\./
+      unless !Nokogiri.uses_libxml? || Nokogiri::LIBXML_VERSION =~ /^2\.6\./
         def test_encoding
           xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
           assert_equal 'UTF-8', xml.encoding
@@ -606,31 +617,23 @@ module Nokogiri
             <a:foo>hello from a</a:foo>
             <b:foo>hello from b</b:foo>
             <container xmlns:c="http://c.flavorjon.es/">
-              <c:foo c:attr='attr-value'>hello from c</c:foo>
+              <c:foo>hello from c</c:foo>
             </container>
           </root>
         EOX
 
-        namespaces = doc.root.namespaces
-
         # assert on setup
-        assert_equal 2, doc.root.namespaces.length
-        assert_equal 3, doc.at_xpath("//container").namespaces.length
         assert_equal 0, doc.xpath("//foo").length
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
-        assert_match %r{foo c:attr}, doc.to_xml
 
         doc.remove_namespaces!
 
-        assert_equal 0, doc.root.namespaces.length
-        assert_equal 0, doc.at_xpath("//container").namespaces.length
         assert_equal 3, doc.xpath("//foo").length
-        assert_equal 0, doc.xpath("//a:foo", namespaces).length
-        assert_equal 0, doc.xpath("//a:foo", namespaces).length
+        assert_equal 0, doc.xpath("//a:foo").length
+        assert_equal 0, doc.xpath("//a:foo").length
         assert_equal 0, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
-        assert_match %r{foo attr}, doc.to_xml
       end
 
       def test_subset_is_decorated

data/test/xml/test_document_fragment.rb

@@ -15,21 +15,29 @@ module Nokogiri
         hello    = fragment.child
 
         assert_equal 'hello', hello.name
-        assert_equal doc.root.child.namespace, hello.namespace
+        if Nokogiri.uses_libxml?
+          assert_equal doc.root.child.namespace, hello.namespace
+        else
+          assert_equal doc.root.child.namespace.href, hello.namespace.href
+        end
       end
 
       def test_node_fragment_is_relative
         doc      = Nokogiri::XML('<root><a xmlns="blah" /></root>')
-        assert doc.root.child
+        ctx      = doc.root.child
         fragment = doc.root.child.fragment('<hello />')
         hello    = fragment.child
 
         assert_equal 'hello', hello.name
-        assert_equal doc.root.child.namespace, hello.namespace
+        if Nokogiri.uses_libxml?
+           assert_equal doc.root.child.namespace, hello.namespace
+        else
+           assert_equal doc.root.child.namespace.href, hello.namespace.href
+        end
       end
 
       def test_new
-        assert Nokogiri::XML::DocumentFragment.new(@xml)
+        fragment = Nokogiri::XML::DocumentFragment.new(@xml)
       end
 
       def test_fragment_should_have_document
@@ -100,13 +108,13 @@ module Nokogiri
       def test_xml_fragment_with_leading_whitespace
         doc = "     <div>b</div>  "
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "     <div>b</div>  ", fragment.to_s
+        assert_equal "<div>b</div>", fragment.to_s
       end
 
       def test_xml_fragment_with_leading_whitespace_and_newline
         doc = "     \n<div>b</div>  "
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "     \n<div>b</div>  ", fragment.to_s
+        assert_equal "<div>b</div>", fragment.to_s
       end
 
       def test_fragment_children_search
@@ -147,7 +155,12 @@ module Nokogiri
 
         frag = doc.fragment "<bar:newnode></bar:newnode>"
         assert frag.children.first.namespace
-        assert_equal ns, frag.children.first.namespace
+        if Nokogiri.uses_libxml?
+            assert_equal ns, frag.children.first.namespace
+        else
+            assert_equal ns.href, frag.children.first.namespace.href
+            assert_equal ns.prefix, frag.children.first.namespace.prefix
+        end
       end
 
       def test_fragment_invalid_namespace_is_silently_ignored
@@ -175,18 +188,6 @@ module Nokogiri
         end
         assert fragment.children.respond_to?(:awesome!), fragment.children.class
       end
-
-      def test_for_libxml_in_context_fragment_parsing_bug_workaround
-        10.times do
-          begin
-            fragment = Nokogiri::XML.fragment("<div></div>")
-            parent = fragment.children.first
-            child = parent.parse("<h1></h1>").first
-            parent.add_child child
-          end
-          GC.start
-        end
-      end
     end
   end
 end

data/test/xml/test_dtd.rb

@@ -14,7 +14,11 @@ module Nokogiri
       end
 
       def test_external_id
-        xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ><foo />')
+        if Nokogiri.uses_libxml?
+          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar"><foo />')
+        else
+          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ""><foo />')
+        end
         assert dtd = xml.internal_subset
         assert_equal 'bar', dtd.external_id
       end
@@ -25,26 +29,11 @@ module Nokogiri
         end
       end
 
-      def test_empty_attributes
-        dtd = Nokogiri::HTML("<html></html>").internal_subset
-        assert_equal Hash.new, dtd.attributes
-      end
-
       def test_attributes
         assert_equal ['width'], @dtd.attributes.keys
         assert_equal '0', @dtd.attributes['width'].default
       end
 
-      def test_keys
-        assert_equal ['width'], @dtd.keys
-      end
-
-      def test_each
-        hash = {}
-        @dtd.each { |key, value| hash[key] = value }
-        assert_equal @dtd.attributes, hash
-      end
-
       def test_namespace
         assert_raise NoMethodError do
           @dtd.namespace
@@ -64,8 +53,14 @@ module Nokogiri
       end
 
       def test_validate
-        list = @xml.internal_subset.validate @xml
-        assert_equal 44, list.length
+        if Nokogiri.uses_libxml?
+          list = @xml.internal_subset.validate @xml
+          assert_equal 44, list.length
+        else
+          xml = Nokogiri::XML(File.open(XML_FILE)) {|cfg| cfg.dtdvalid}
+          list = xml.internal_subset.validate xml
+          assert_equal 37, list.length
+        end
       end
 
       def test_external_subsets

data/test/xml/test_element_content.rb

@@ -12,7 +12,7 @@ module Nokogiri
    <!ELEMENT div1 (head, (p | list | note)*, div2*)>
    <!ELEMENT div2 (tender:love)>
 ]>
-</root>
+<root/>
         eoxml
         @elements = @xml.internal_subset.children.find_all { |x|
           x.type == 15

data/test/xml/test_element_decl.rb

@@ -14,7 +14,7 @@ module Nokogiri
    <!ATTLIST br width CDATA "0">
    <!ATTLIST br height CDATA "0">
 ]>
-</root>
+<root/>
         eoxml
         @elements = @xml.internal_subset.children.find_all { |x|
           x.type == 15

data/test/xml/test_entity_decl.rb

@@ -9,7 +9,7 @@ module Nokogiri
 <?xml version="1.0"?><?TEST-STYLE PIDATA?>
 <!DOCTYPE staff SYSTEM "staff.dtd" [
    <!ENTITY ent1 "es">
-   <!ENTITY nocontent >
+   <!ENTITY nocontent "">
 ]>
 <root />
         eoxml
@@ -18,19 +18,13 @@ module Nokogiri
         @entity_decl = @entities.first
       end
 
-      def test_constants # for libffi implementation. *sigh* sorry Mike. :-(
+      def test_constants
         assert_equal 1, EntityDecl::INTERNAL_GENERAL
         assert_equal 2, EntityDecl::EXTERNAL_GENERAL_PARSED
         assert_equal 3, EntityDecl::EXTERNAL_GENERAL_UNPARSED
         assert_equal 4, EntityDecl::INTERNAL_PARAMETER
         assert_equal 5, EntityDecl::EXTERNAL_PARAMETER
         assert_equal 6, EntityDecl::INTERNAL_PREDEFINED
-
-        # While I'm here, another problem with libffi comes to mind.  If someone
-        # upgrades their version of any particular C library, and the constants
-        # change values, the client using Ruby code is fucked.  That sucks.
-        # Basically anything to do with the preprocessor fucks someone using
-        # libffi.  :-(
       end
 
       def test_create_typed_entity
@@ -69,12 +63,20 @@ module Nokogiri
 
       def test_original_content
         assert_equal "es", @entity_decl.original_content
-        assert_nil @entities[1].original_content
+        if Nokogiri.jruby?
+          assert_nil @entities[1].original_content
+        else
+          assert_equal "", @entities[1].original_content
+        end
       end
 
       def test_content
         assert_equal "es", @entity_decl.content
-        assert_nil @entities[1].content
+        if Nokogiri.jruby?
+          assert_nil @entities[1].content
+        else
+          assert_equal "", @entities[1].content
+        end
       end
 
       def test_type

data/test/xml/test_namespace.rb

@@ -12,6 +12,13 @@ module Nokogiri
         eoxml
       end
 
+      if Nokogiri.uses_libxml?
+        def test_namespace_is_in_node_cache
+          node = @xml.root.namespace
+          assert @xml.instance_variable_get(:@node_cache).include?(node)
+        end
+      end
+
       def test_built_nodes_keep_namespace_decls
         doc = Document.new
         e   = Node.new 'element', doc
@@ -31,11 +38,6 @@ module Nokogiri
         assert_equal "#<#{ns.class.name}:#{sprintf("0x%x", ns.object_id)} href=#{ns.href.inspect}>", ns.inspect
       end
 
-      def test_namespace_is_in_node_cache
-        node = @xml.root.namespace
-        assert @xml.instance_variable_get(:@node_cache).include?(node)
-      end
-
       def test_namespace_node_prefix
         namespaces = @xml.root.namespace_definitions
         assert_equal [nil, 'foo'], namespaces.map { |x| x.prefix }

data/test/xml/test_node.rb

@@ -82,47 +82,18 @@ module Nokogiri
         assert_equal 0, list.length
       end
 
-      def test_parse_config_option
-        node = @xml.root
-        options = nil
-        node.parse("<item></item>") do |config|
-          options = config
-        end
-        assert_equal Nokogiri::XML::ParseOptions::DEFAULT_XML, options.to_i
-      end
-
       # descriptive, not prescriptive.
       def test_parse_invalid_html_markup_results_in_empty_nodeset
         doc = Nokogiri::HTML("<html></html>")
         nodeset = doc.root.parse "<div><div>a</div><snippet>b</snippet></div>"
         assert_equal 1, doc.errors.length # "Tag snippet invalid"
-        assert_equal 1, nodeset.length
-      end
-
-      def test_node_context_parsing_of_malformed_html_fragment_with_recover_is_corrected
-        doc = HTML.parse "<html><body><div></div></body></html>"
-        context_node = doc.at_css "div"
-        nodeset = context_node.parse("<div </div>") do |options|
-          options.recover
-        end
-        assert_equal "<div></div>", nodeset.to_s
-        assert_equal 1, doc.errors.length
-        assert_equal 1, nodeset.length
-      end
-
-      def test_node_context_parsing_of_malformed_html_fragment_without_recover_is_not_corrected
-        doc = HTML.parse "<html><body><div></div></body></html>"
-        context_node = doc.at_css "div"
-        nodeset = context_node.parse("<div </div>") do |options|
-          options.strict
-        end
-        assert_equal 1, doc.errors.length
         assert_equal 0, nodeset.length
       end
 
       def test_parse_error_list
         error_count = @xml.errors.length
-        @xml.root.parse('<hello>')
+        list = @xml.root.parse('<hello>')
+        assert_equal 0, list.length
         assert(error_count < @xml.errors.length, "errors should have increased")
       end
 
@@ -414,7 +385,7 @@ module Nokogiri
       def test_add_namespace_does_not_associate_node
         node = @xml.at('address')
         assert_nil node.namespace
-        assert node.add_namespace_definition 'foo', 'http://tlm.com/'
+        definition = node.add_namespace_definition 'foo', 'http://tlm.com/'
         assert_nil node.namespace
       end
 
@@ -497,9 +468,7 @@ module Nokogiri
         end
         io.rewind
         assert called
-        string = io.read
-        assert_equal @xml.serialize(nil, conf.options), string
-        assert_equal @xml.serialize(nil, conf), string
+        assert_equal @xml.serialize(nil, conf.options), io.read
       end
 
       %w{ xml html xhtml }.each do |type|
@@ -521,7 +490,6 @@ module Nokogiri
         end
         assert called
         assert_equal @xml.serialize(nil, conf.options), string
-        assert_equal @xml.serialize(nil, conf), string
       end
 
       def test_hold_refence_to_subnode
@@ -699,15 +667,6 @@ module Nokogiri
         assert_equal('/staff/employee[1]', node.path)
       end
 
-      def test_parent_xpath
-        assert set = @xml.search('//employee')
-        assert node = set.first
-        assert parent_set = node.search('..')
-        assert parent_node = parent_set.first
-        assert_equal '/staff', parent_node.path
-        assert_equal node.parent, parent_node
-      end
-
       def test_search_by_symbol
         assert set = @xml.search(:employee)
         assert 5, set.length
@@ -855,17 +814,19 @@ module Nokogiri
         assert_equal nil, set[3].namespace
       end
 
-      def test_namespace_without_an_href_on_html_node
-        # because microsoft word's HTML formatting does this. ick.
-        xml = Nokogiri::HTML.parse <<-EOF
-          <div><o:p>foo</o:p></div>
-        EOF
+      if Nokogiri.uses_libxml?
+        def test_namespace_without_an_href_on_html_node
+          # because microsoft word's HTML formatting does this. ick.
+          xml = Nokogiri::HTML.parse <<-EOF
+            <div><o:p>foo</o:p></div>
+          EOF
 
-        assert_not_nil(node = xml.at('p'))
+          assert_not_nil(node = xml.at('p'))
 
-        assert_equal 1, node.namespaces.keys.size
-        assert       node.namespaces.has_key?('xmlns:o')
-        assert_equal nil, node.namespaces['xmlns:o']
+          assert_equal 1, node.namespaces.keys.size
+          assert       node.namespaces.has_key?('xmlns:o')
+          assert_equal nil, node.namespaces['xmlns:o']
+        end
       end
 
       def test_line