nokogiri 1.5.2-java → 1.5.3-java

data/test/test_xslt_transforms.rb

@@ -158,7 +158,9 @@ encoding="iso-8859-1" indent="yes"/>
     assert_equal  result_array, result_hash
   end
 
-  if Nokogiri.uses_libxml? # By now, cannot get it working on JRuby.
+  if Nokogiri.uses_libxml?
+    # By now, cannot get it working on JRuby, see:
+    #   http://yokolet.blogspot.com/2010/10/pure-java-nokogiri-xslt-extension.html
     def test_exslt
       assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
       assert doc.xml?

data/test/xml/sax/test_parser_context.rb

@@ -66,15 +66,12 @@ world
         end
 
         def test_from_io
-          assert_nothing_raised do
-            ParserContext.new StringIO.new('fo'), 'UTF-8'
-          end
+          ctx = ParserContext.new StringIO.new('fo'), 'UTF-8'
+          assert ctx
         end
 
         def test_from_string
-          assert_nothing_raised do
-            ParserContext.new 'blah blah'
-          end
+          assert ParserContext.new 'blah blah'
         end
 
         def test_parse_with
@@ -85,20 +82,16 @@ world
         end
 
         def test_parse_with_sax_parser
-          assert_nothing_raised do
-            xml = "<root />"
-            ctx = ParserContext.new xml
-            parser = Parser.new Doc.new
-            ctx.parse_with parser
-          end
+          xml = "<root />"
+          ctx = ParserContext.new xml
+          parser = Parser.new Doc.new
+          assert_nil ctx.parse_with parser
         end
 
         def test_from_file
-          assert_nothing_raised do
-            ctx = ParserContext.file XML_FILE
-            parser = Parser.new Doc.new
-            ctx.parse_with parser
-          end
+          ctx = ParserContext.file XML_FILE
+          parser = Parser.new Doc.new
+          assert_nil ctx.parse_with parser
         end
 
         def test_parse_with_returns_nil

data/test/xml/sax/test_push_parser.rb

@@ -142,6 +142,7 @@ module Nokogiri
         end
 
         def test_broken_encoding
+          skip("ultra hard to fix for pure Java version") if Nokogiri.jruby?
           @parser.options |= XML::ParseOptions::RECOVER
           # This is ISO_8859-1:
           @parser.<< "<?xml version='1.0' encoding='UTF-8'?><r>Gau\337</r>"

data/test/xml/test_attr.rb

@@ -4,12 +4,11 @@ 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
+          assert doc
+          assert Nokogiri::XML::Attr.new(doc, 'foo')
+        }
       end
 
       def test_content=

data/test/xml/test_builder.rb

@@ -47,14 +47,13 @@ module Nokogiri
       end
 
       def test_builder_with_unlink
-        assert_nothing_raised do
-          Nokogiri::XML::Builder.new do |xml|
-            xml.foo do
-              xml.bar { xml.parent.unlink }
-              xml.bar2
-            end
+        b = Nokogiri::XML::Builder.new do |xml|
+          xml.foo do
+            xml.bar { xml.parent.unlink }
+            xml.bar2
           end
         end
+        assert b
       end
 
       def test_with_root

data/test/xml/test_cdata.rb

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

data/test/xml/test_document.rb

@@ -124,9 +124,8 @@ module Nokogiri
 
       def test_pp
         out = StringIO.new('')
-        assert_nothing_raised do
-          ::PP.pp @xml, out
-        end
+        ::PP.pp @xml, out
+        assert_operator out.string.length, :>, 0
       end
 
       def test_create_internal_subset_on_existing_subset
@@ -295,9 +294,7 @@ module Nokogiri
       end
 
       def test_parse_handles_nil_gracefully
-        assert_nothing_raised do
-          @doc = Nokogiri::XML::Document.parse(nil)
-        end
+        @doc = Nokogiri::XML::Document.parse(nil)
         assert_instance_of Nokogiri::XML::Document, @doc
       end
 
@@ -358,13 +355,17 @@ module Nokogiri
       def test_subclass_parse
         klass = Class.new(Nokogiri::XML::Document)
         doc = klass.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, doc.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, doc.root.to_s
         assert_instance_of klass, doc
       end
 
       def test_document_parse_method
         xml = Nokogiri::XML::Document.parse(File.read(XML_FILE))
-        assert_equal @xml.to_s, xml.to_s
+        # lame hack uses root to avoid comparing DOCTYPE tags which can appear out of order.
+        # I should really finish lorax and use that here.
+        assert_equal @xml.root.to_s, xml.root.to_s
       end
 
       def test_encoding=
@@ -629,9 +630,7 @@ module Nokogiri
 
       def test_new
         doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
+        doc = Nokogiri::XML::Document.new
         assert doc
         assert doc.xml?
         assert_nil doc.root
@@ -639,9 +638,7 @@ module Nokogiri
 
       def test_set_root
         doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
+        doc = Nokogiri::XML::Document.new
         assert doc
         assert doc.xml?
         assert_nil doc.root

data/test/xml/test_document_encoding.rb

@@ -18,7 +18,9 @@ module Nokogiri
         end
 
         def test_dotted_version
-          assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
+          if Nokogiri.uses_libxml?
+            assert_equal 'UTF-8', Nokogiri::LIBXML_VERSION.encoding.name
+          end
         end
       end
     end

data/test/xml/test_document_fragment.rb

@@ -176,15 +176,34 @@ module Nokogiri
         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
+      if Nokogiri.uses_libxml?
+        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
-          GC.start
+        end
+
+        def test_for_libxml_in_context_memory_badness_when_encountering_encoding_errors
+          # see issue #643 for background
+          # this test exists solely to raise an error during valgrind test runs.
+          html = <<-EOHTML
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=shizzle" />
+  </head>
+  <body>
+    <div>Foo</div>
+  </body>
+</html>
+EOHTML
+          doc = Nokogiri::HTML html
+          doc.at_css("div").replace("Bar")
         end
       end
     end

data/test/xml/test_node.rb

@@ -993,6 +993,27 @@ EOXML
         assert_no_match("<ul>\n  <li>", xml.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
         assert_no_match("<ul>\n  <li>", node.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
       end
+
+      # issue 647
+      def test_default_namespace_should_be_created
+        subject = Nokogiri::XML.parse('<foo xml:bar="http://bar.com"/>').root
+        ns = subject.attributes['bar'].namespace
+        assert_not_nil ns
+        assert_equal ns.class, Nokogiri::XML::Namespace
+        assert_equal 'xml', ns.prefix
+        assert_equal "http://www.w3.org/XML/1998/namespace", ns.href
+      end
+
+      # issue 648
+      def test_namespace_without_prefix_should_be_set
+        node = Nokogiri::XML.parse('<foo xmlns="http://bar.com"/>').root
+        subject = Nokogiri::XML::Node.new 'foo', node.document
+        subject.namespace = node.namespace
+        ns = subject.namespace
+        assert_equal ns.class, Nokogiri::XML::Namespace
+        assert_nil ns.prefix
+        assert_equal ns.href, "http://bar.com"
+      end
     end
   end
 end

data/test/xml/test_node_set.rb

@@ -168,7 +168,7 @@ module Nokogiri
         set = html.xpath("/html/body/div")
         assert_equal set.first, set.search(".a").first
       end
-      
+
       def test_css_search_with_namespace
         fragment = Nokogiri::XML.fragment(<<-eoxml)
           <html xmlns="http://www.w3.org/1999/xhtml">
@@ -176,7 +176,7 @@ module Nokogiri
           <body></body>
           </html>
         eoxml
-        assert_nothing_raised{ fragment.children.search( 'body', { 'xmlns' => 'http://www.w3.org/1999/xhtml' }) }
+        assert fragment.children.search( 'body', { 'xmlns' => 'http://www.w3.org/1999/xhtml' })
       end
 
       def test_double_equal

data/test/xml/test_text.rb

@@ -30,9 +30,7 @@ module Nokogiri
         doc = Document.new
         node = Nokogiri::XML::Element.new('foo', doc)
 
-        assert_nothing_raised do
-          Text.new('hello world', node)
-        end
+        assert Text.new('hello world', node)
       end
 
       def test_content=

data/test/xml/test_unparented_node.rb

@@ -252,8 +252,8 @@ module Nokogiri
         doc = Nokogiri::XML "<root>foo</root>"
         pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo.xsl"})
         doc.root.add_previous_sibling pi
-        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>\n}
-        assert_equal expected_doc, doc.to_xml
+        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>}
+        assert_includes doc.to_xml, expected_doc
       end
 
       def test_find_by_css_with_tilde_eql

data/test/xml/test_xpath.rb

@@ -100,12 +100,10 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        assert_nothing_raised do
-          if Nokogiri.uses_libxml?
-            @xml.css('employee:thing()', @handler)
-          else
-            @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
-          end
+        if Nokogiri.uses_libxml?
+          @xml.css('employee:thing()', @handler)
+        else
+          @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
         end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
@@ -254,6 +252,17 @@ module Nokogiri
         end
         assert_equal 123.456, value
       end
+
+      def test_custom_xpath_with_bullshit_arguments
+        xml = %q{<foo> </foo>}
+        doc = Nokogiri::XML.parse(xml)
+        foo = doc.xpath('//foo[bool_function(bar/baz)]', Class.new {
+            def bool_function(value)
+              true
+            end
+          }.new)
+        assert_equal foo, doc.xpath("//foo")
+      end
     end
   end
 end

data/test/xslt/test_custom_functions.rb

@@ -58,6 +58,41 @@ EOXSL
         assert_equal 'FOO', result.css('title').first.text
       end
 
+
+      def test_function_arguments
+        skip("Pure Java version doesn't support this feature.") if !Nokogiri.uses_libxml?
+        foo = Class.new do
+          include MiniTest::Assertions
+
+          def multiarg *args
+            assert_equal ["abc", "xyz"], args
+            args.first
+          end
+
+          def numericarg arg
+            assert_equal 42, arg
+            arg
+          end
+        end
+
+        xsl = Nokogiri.XSLT(<<-EOXSL, "http://e.org/functions" => foo)
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:f="http://e.org/functions"
+  extension-element-prefixes="f">
+
+  <xsl:template match="text()">
+    <xsl:copy-of select="f:multiarg('abc', 'xyz')"/>
+    <xsl:copy-of select="f:numericarg(42)"/>
+  </xsl:template>
+</xsl:stylesheet>
+EOXSL
+
+        xsl.transform @xml
+      end
+
+
       def test_function_XSLT
         skip("Pure Java version doesn't support this feature.") if !Nokogiri.uses_libxml?
         foo = Class.new do

data/test_all

@@ -0,0 +1,84 @@
+#! /usr/bin/env bash
+#
+#  script to run tests on all relevant rubies, and valgrind on supported rubies.
+#  outputs tests to `test.log` and valgrind output to `valgrind.log`.
+#
+#  requires `rvm` to be installed. sorry about that, multiruby dudes.
+#
+
+RUBIES="ruby-1.9.3 jruby-1.6.5 ree-1.8.7 ruby-1.9.2 ruby-1.8.7"
+TEST_LOG=test.log
+VALGRIND_LOG=valgrind.log
+
+# Load RVM into a shell session *as a function*
+if [[ -s "$HOME/.rvm/scripts/rvm" ]] ; then
+    source "$HOME/.rvm/scripts/rvm"
+elif [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then
+    source "/usr/local/rvm/scripts/rvm"
+else
+    echo "ERROR: An RVM installation was not found.\n"
+fi
+
+> $TEST_LOG
+> $VALGRIND_LOG
+set -o errexit
+
+function rvm_use {
+    current_ruby=$1
+    rvm use "${1}@nokogiri" --create
+}
+
+function generate_parser_and_tokenizer {
+    old_ruby=$current_ruby
+    rvm_use ruby-1.8.7
+    bundle exec rake generate 2>&1 > /dev/null
+    rvm_use $old_ruby
+}
+
+function clean {
+    bundle exec rake clean clobber 2>&1 > /dev/null
+}
+
+function compile {
+    echo "** compiling ..."
+    generate_parser_and_tokenizer
+    bundle exec rake compile 2>&1 > /dev/null
+}
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    if gem list bundler | fgrep -v 1.1.rc 2>&1 > /dev/null ; then
+        gem install bundler --pre
+    fi
+    bundle install --quiet --local || bundle install
+    clean
+done
+
+for ruby in $RUBIES ; do
+    rvm_use ${ruby}
+    echo -e "**\n** testing nokogiri on ${ruby}\n**" | tee -a $TEST_LOG
+    clean
+    compile
+    echo "** running tests ..."
+    if [[ $ruby =~ "jruby" ]] ; then
+        # I get:
+        #   /usr/lib/jvm/java-7-oracle/bin/java: symbol lookup error: /home/mike/.rvm/gems/jruby-1.6.5@nokogiri/gems/racc-1.4.7/lib/racc/cparse.so: undefined symbol: rb_catch
+        # if I use 'bundle exec' with jruby. Anybody?
+        rake test 2>&1 | tee -a $TEST_LOG
+    else
+        bundle exec rake test 2>&1 | tee -a $TEST_LOG
+    fi
+    clean
+done
+
+for ruby in $RUBIES ; do
+    if [[ ! $ruby =~ "jruby" ]] ; then
+        rvm_use ${ruby}
+        echo -e "**\n** nokogiri prerelease: ${ruby}\n**" | tee -a $VALGRIND_LOG
+        clean
+        compile
+        echo "** running valgrind on tests ..."
+        bundle exec rake test:valgrind 2>&1 | tee -a $VALGRIND_LOG
+        clean
+    fi
+done