nokogiri 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60

data/test/xml/test_attr.rb

@@ -1,8 +1,17 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 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
+      end
+
       def test_content=
         xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
         address = xml.xpath('//address')[3]
@@ -26,6 +35,31 @@ 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

data/test/xml/test_attribute_decl.rb

@@ -0,0 +1,82 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAttributeDecl < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML(<<-eoxml)
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ATTLIST br width CDATA "0">
+   <!ATTLIST a width CDATA >
+   <!ATTLIST payment type (check|cash) "cash">
+]>
+<root />
+        eoxml
+        @attrs = @xml.internal_subset.children
+        @attr_decl = @attrs.first
+      end
+
+      def test_inspect
+        assert_equal(
+          "#<#{@attr_decl.class.name}:#{sprintf("0x%x", @attr_decl.object_id)} #{@attr_decl.to_s.inspect}>",
+          @attr_decl.inspect
+        )
+      end
+
+      def test_type
+        assert_equal 16, @attr_decl.type
+      end
+
+      def test_class
+        assert_instance_of Nokogiri::XML::AttributeDecl, @attr_decl
+      end
+
+      def test_content
+        assert_raise NoMethodError do
+          @attr_decl.content
+        end
+      end
+
+      def test_attributes
+        assert_raise NoMethodError do
+          @attr_decl.attributes
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @attr_decl.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @attr_decl.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @attr_decl.line
+        end
+      end
+
+      def test_attribute_type
+        assert_equal 1, @attr_decl.attribute_type
+      end
+
+      def test_default
+        assert_equal '0', @attr_decl.default
+        assert_nil @attrs[1].default
+      end
+
+      def test_enumeration
+        assert_equal [], @attr_decl.enumeration
+        assert_equal ['check', 'cash'], @attrs[2].enumeration
+      end
+    end
+  end
+end
+

data/test/xml/test_builder.rb

@@ -1,8 +1,187 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestBuilder < Nokogiri::TestCase
+      def test_builder_namespace
+        doc = Nokogiri::XML::Builder.new { |xml|
+          xml.a("xmlns:a" => "x") do
+            xml.b("xmlns:a" => "x", "xmlns:b" => "y")
+          end
+        }.doc
+
+        b = doc.at('b')
+        assert b
+        assert_equal({"xmlns:a"=>"x", "xmlns:b"=>"y"}, b.namespaces)
+        assert_equal({"xmlns:b"=>"y"}, namespaces_defined_on(b))
+      end
+
+      def test_builder_namespace_part_deux
+        doc = Nokogiri::XML::Builder.new { |xml|
+          xml.a("xmlns:b" => "y") do
+            xml.b("xmlns:a" => "x", "xmlns:b" => "y", "xmlns:c" => "z")
+          end
+        }.doc
+
+        b = doc.at('b')
+        assert b
+        assert_equal({"xmlns:a"=>"x", "xmlns:b"=>"y", "xmlns:c"=>"z"}, b.namespaces)
+        assert_equal({"xmlns:a"=>"x", "xmlns:c"=>"z"}, namespaces_defined_on(b))
+      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
+          end
+        end
+      end
+
+      def test_with_root
+        doc = Nokogiri::XML(File.read(XML_FILE))
+        Nokogiri::XML::Builder.with(doc.at('employee')) do |xml|
+          xml.foo
+        end
+        assert_equal 1, doc.xpath('//employee/foo').length
+      end
+
+      def test_root_namespace_default_decl
+        b = Nokogiri::XML::Builder.new { |xml| xml.root(:xmlns => 'one:two') }
+        doc = b.doc
+        assert_equal 'one:two', doc.root.namespace.href
+        assert_equal({ 'xmlns' => 'one:two' }, doc.root.namespaces)
+      end
+
+      def test_root_namespace_multi_decl
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root(:xmlns => 'one:two', 'xmlns:foo' => 'bar') do
+            xml.hello
+          end
+        }
+        doc = b.doc
+        assert_equal 'one:two', doc.root.namespace.href
+        assert_equal({ 'xmlns' => 'one:two', 'xmlns:foo' => 'bar' }, doc.root.namespaces)
+
+        assert_equal 'one:two', doc.at('hello').namespace.href
+      end
+
+      def test_non_root_namespace
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root { xml.hello(:xmlns => 'one') }
+        }
+        assert_equal 'one', b.doc.at('hello', 'xmlns' => 'one').namespace.href
+      end
+
+      def test_specify_namespace
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root('xmlns:foo' => 'bar') do
+            xml[:foo].bar
+            xml['foo'].baz
+          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
+      end
+
+      def test_specify_namespace_nested
+        b = Nokogiri::XML::Builder.new { |xml|
+          xml.root('xmlns:foo' => 'bar') do
+            xml.yay do
+              xml[:foo].bar
+
+              xml.yikes do
+                xml['foo'].baz
+              end
+            end
+          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
+      end
+
+      def test_specified_namespace_undeclared
+        Nokogiri::XML::Builder.new { |xml|
+          xml.root do
+            assert_raises(ArgumentError) do
+              xml[:foo]
+            end
+          end
+        }
+      end
+
+      def test_set_encoding
+        builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do |xml|
+          xml.root do
+            xml.bar 'blah'
+          end
+        end
+        assert_match 'UTF-8', builder.to_xml
+      end
+
+      def test_bang_and_underscore_is_escaped
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            xml.p_('adsfadsf')
+            xml.p!('adsfadsf')
+          end
+        end
+        assert_equal 2, builder.doc.xpath('//p').length
+      end
+
+      def test_square_brackets_set_attributes
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            foo = xml.foo
+            foo['id'] = 'hello'
+            assert_equal 'hello', foo['id']
+          end
+        end
+        assert_equal 1, builder.doc.xpath('//foo[@id = "hello"]').length
+      end
+
+      def test_nested_local_variable
+        @ivar     = 'hello'
+        local_var = 'hello world'
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            xml.foo local_var
+            xml.bar @ivar
+            xml.baz {
+              xml.text @ivar
+            }
+          end
+        end
+
+        assert_equal 'hello world', builder.doc.at('//root/foo').content
+        assert_equal 'hello', builder.doc.at('//root/bar').content
+        assert_equal 'hello', builder.doc.at('baz').content
+      end
+
+      def test_raw_append
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.root do
+            xml << 'hello'
+          end
+        end
+
+        assert_equal 'hello', builder.doc.at('/root').content
+      end
+
+      def test_raw_append_with_instance_eval
+        builder = Nokogiri::XML::Builder.new do
+          root do
+            self << 'hello'
+          end
+        end
+
+        assert_equal 'hello', builder.doc.at('/root').content
+      end
+
       def test_cdata
         builder = Nokogiri::XML::Builder.new do
           root {
@@ -20,6 +199,12 @@ module Nokogiri
         }
         assert_equal("<?xml version=\"1.0\"?><root><![CDATA[hello world]]></root>", builder.to_xml.gsub(/\n/, ''))
       end
+
+    private
+
+      def namespaces_defined_on(node)
+        Hash[*node.namespace_definitions.collect{|n| ["xmlns:" + n.prefix, n.href]}.flatten]
+      end
     end
   end
 end

data/test/xml/test_cdata.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -14,6 +14,37 @@ module Nokogiri
         assert cdata.cdata?
         assert_equal '#cdata-section', cdata.name
       end
+
+      def test_new
+        node = CDATA.new(@xml, "foo")
+        assert_equal "foo", node.content
+
+        node = CDATA.new(@xml.root, "foo")
+        assert_equal "foo", node.content
+      end
+
+      def test_new_with_nil
+        node = CDATA.new(@xml, nil)
+        assert_equal nil, node.content
+      end
+
+      def test_lots_of_new_cdata
+        assert_nothing_raised do
+          100.times { CDATA.new(@xml, "asdfasdf") }
+        end
+      end
+
+      def test_content=
+        node = CDATA.new(@xml, 'foo')
+        assert_equal('foo', node.content)
+
+        node.content = '& <foo> &amp;'
+        assert_equal('& <foo> &amp;', node.content)
+        assert_equal('<![CDATA[& <foo> &amp;]]>', node.to_xml)
+
+        node.content = 'foo ]]> bar'
+        assert_equal('foo ]]> bar', node.content)
+      end
     end
   end
 end

data/test/xml/test_comment.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -12,6 +12,18 @@ module Nokogiri
         comment = Nokogiri::XML::Comment.new(@xml, 'hello world')
         assert_equal('<!--hello world-->', comment.to_s)
       end
+
+      def test_comment?
+        comment = Nokogiri::XML::Comment.new(@xml, 'hello world')
+        assert(comment.comment?)
+        assert(!@xml.root.comment?)
+      end
+
+      def test_many_comments
+        100.times {
+          Nokogiri::XML::Comment.new(@xml, 'hello world')
+        }
+      end
     end
   end
 end

data/test/xml/test_document.rb

@@ -1,15 +1,327 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 require 'uri'
 
 module Nokogiri
   module XML
     class TestDocument < Nokogiri::TestCase
+      URI = if URI.const_defined?(:DEFAULT_PARSER)
+              ::URI::DEFAULT_PARSER
+            else
+              ::URI
+            end
+
       def setup
         super
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
       end
 
+      def test_root_set_to_nil
+        @xml.root = nil
+        assert_equal nil, @xml.root
+      end
+
+      def test_collect_namespaces
+        doc = Nokogiri::XML(<<-eoxml)
+        <xml>
+          <foo xmlns='hello'>
+            <bar xmlns:foo='world' />
+          </foo>
+        </xml>
+        eoxml
+        assert_equal({"xmlns"=>"hello", "xmlns:foo"=>"world"},
+          doc.collect_namespaces)
+      end
+
+      def test_subclass_initialize_modify # testing a segv
+        Class.new(Nokogiri::XML::Document) {
+          def initialize
+            super
+            body_node = Nokogiri::XML::Node.new "body", self
+            body_node.content = "stuff"
+            self.root = body_node
+          end
+        }.new
+      end
+
+      def test_create_text_node
+        txt = @xml.create_text_node 'foo'
+        assert_instance_of Nokogiri::XML::Text, txt
+        assert_equal 'foo', txt.text
+        assert_equal @xml, txt.document
+      end
+
+      def test_create_element
+        elm = @xml.create_element('foo')
+        assert_instance_of Nokogiri::XML::Element, elm
+        assert_equal 'foo', elm.name
+        assert_equal @xml, elm.document
+      end
+
+      def test_create_element_with_attributes
+        elm = @xml.create_element('foo',:a => "1")
+        assert_instance_of Nokogiri::XML::Element, elm
+        assert_instance_of Nokogiri::XML::Attr, elm.attributes["a"]
+        assert_equal "1", elm["a"]
+      end
+
+      def test_create_element_with_namespace
+        elm = @xml.create_element('foo',:'xmlns:foo' => 'http://tenderlovemaking.com')
+        assert_equal 'http://tenderlovemaking.com', elm.namespaces['xmlns:foo']
+      end
+
+      def test_create_element_with_content
+        elm = @xml.create_element('foo',"needs more xml/violence")
+        assert_equal "needs more xml/violence", elm.content
+      end
+
+      def test_create_cdata
+        cdata = @xml.create_cdata("abc")
+        assert_instance_of Nokogiri::XML::CDATA, cdata
+        assert_equal "abc", cdata.content
+      end
+
+      def test_pp
+        out = StringIO.new('')
+        assert_nothing_raised do
+          ::PP.pp @xml, out
+        end
+      end
+
+      def test_create_internal_subset_on_existing_subset
+        assert_not_nil @xml.internal_subset
+        assert_raises(RuntimeError) do
+          @xml.create_internal_subset('staff', nil, 'staff.dtd')
+        end
+      end
+
+      def test_create_internal_subset
+        xml = Nokogiri::XML('<root />')
+        assert_nil xml.internal_subset
+
+        xml.create_internal_subset('name', nil, 'staff.dtd')
+        ss = xml.internal_subset
+        assert_equal 'name', ss.name
+        assert_nil ss.external_id
+        assert_equal 'staff.dtd', ss.system_id
+      end
+
+      def test_external_subset
+        assert_nil @xml.external_subset
+        Dir.chdir(ASSETS_DIR) do
+          @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) { |cfg|
+            cfg.dtdload
+          }
+        end
+        assert @xml.external_subset
+      end
+
+      def test_create_external_subset_fails_with_existing_subset
+        assert_nil @xml.external_subset
+        Dir.chdir(ASSETS_DIR) do
+          @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) { |cfg|
+            cfg.dtdload
+          }
+        end
+        assert @xml.external_subset
+
+        assert_raises(RuntimeError) do
+          @xml.create_external_subset('staff', nil, 'staff.dtd')
+        end
+      end
+
+      def test_create_external_subset
+        dtd = @xml.create_external_subset('staff', nil, 'staff.dtd')
+        assert_nil dtd.external_id
+        assert_equal 'staff.dtd', dtd.system_id
+        assert_equal 'staff', dtd.name
+        assert_equal dtd, @xml.external_subset
+      end
+
+      def test_version
+        assert_equal '1.0', @xml.version
+      end
+
+      def test_add_namespace
+        assert_raise NoMethodError do
+          @xml.add_namespace('foo', 'bar')
+        end
+      end
+
+      def test_attributes
+        assert_raise NoMethodError do
+          @xml.attributes
+        end
+      end
+
+      def test_namespace
+        assert_raise NoMethodError do
+          @xml.namespace
+        end
+      end
+
+      def test_namespace_definitions
+        assert_raise NoMethodError do
+          @xml.namespace_definitions
+        end
+      end
+
+      def test_line
+        assert_raise NoMethodError do
+          @xml.line
+        end
+      end
+
+      def test_empty_node_converted_to_html_is_not_self_closing
+        doc = Nokogiri::XML('<a></a>')
+        assert_equal "<a></a>", doc.inner_html
+      end
+
+      def test_fragment
+        fragment = @xml.fragment
+        assert_equal 0, fragment.children.length
+      end
+
+      def test_add_child_fragment_with_single_node
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello />')
+        doc.add_child fragment
+        assert_equal '/hello', doc.at('//hello').path
+        assert_equal 'hello', doc.root.name
+      end
+
+      def test_add_child_fragment_with_multiple_nodes
+        doc = Nokogiri::XML::Document.new
+        fragment = doc.fragment('<hello /><goodbye />')
+        assert_raises(RuntimeError) do
+          doc.add_child fragment
+        end
+      end
+
+      def test_add_child_with_multiple_roots
+        assert_raises(RuntimeError) do
+          @xml << Node.new('foo', @xml)
+        end
+      end
+
+      def test_move_root_to_document_with_no_root
+        sender = Nokogiri::XML('<root>foo</root>')
+        newdoc = Nokogiri::XML::Document.new
+        newdoc.root = sender.root
+      end
+
+      def test_move_root_with_existing_root_gets_gcd
+        doc = Nokogiri::XML('<root>test</root>')
+        doc2 = Nokogiri::XML("<root>#{'x' * 5000000}</root>")
+        doc2.root = doc.root
+      end
+
+      def test_validate
+        assert_equal 44, @xml.validate.length
+      end
+
+      def test_validate_no_internal_subset
+        doc = Nokogiri::XML('<test/>')
+        assert_nil doc.validate
+      end
+
+      def test_clone
+        assert @xml.clone
+      end
+
+      def test_document_should_not_have_default_ns
+        doc = Nokogiri::XML::Document.new
+
+        assert_raises NoMethodError do
+          doc.default_namespace = 'http://innernet.com/'
+        end
+
+        assert_raises NoMethodError do
+          doc.add_namespace_definition('foo', 'bar')
+        end
+      end
+
+      def test_parse_handles_nil_gracefully
+        assert_nothing_raised do
+          @doc = Nokogiri::XML::Document.parse(nil)
+        end
+        assert_instance_of Nokogiri::XML::Document, @doc
+      end
+
+      def test_parse_takes_block
+        options = nil
+        Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) do |cfg|
+          options = cfg
+        end
+        assert options
+      end
+
+      def test_parse_yields_parse_options
+        options = nil
+        Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) do |cfg|
+          options = cfg
+          options.nonet.nowarning.dtdattr
+        end
+        assert options.nonet?
+        assert options.nowarning?
+        assert options.dtdattr?
+      end
+
+      def test_XML_takes_block
+        options = nil
+        Nokogiri::XML(File.read(XML_FILE), XML_FILE) do |cfg|
+          options = cfg
+          options.nonet.nowarning.dtdattr
+        end
+        assert options.nonet?
+        assert options.nowarning?
+        assert options.dtdattr?
+      end
+
+      def test_subclass
+        klass = Class.new(Nokogiri::XML::Document)
+        doc = klass.new
+        assert_instance_of klass, doc
+      end
+
+      def test_subclass_initialize
+        klass = Class.new(Nokogiri::XML::Document) do
+          attr_accessor :initialized_with
+
+          def initialize(*args)
+            @initialized_with = args
+          end
+        end
+        doc = klass.new("1.0", 1)
+        assert_equal ["1.0", 1], doc.initialized_with
+      end
+
+      def test_subclass_dup
+        klass = Class.new(Nokogiri::XML::Document)
+        doc = klass.new.dup
+        assert_instance_of klass, doc
+      end
+
+      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
+        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
+      end
+
+      def test_encoding=
+        @xml.encoding = 'UTF-8'
+        assert_match 'UTF-8', @xml.to_xml
+
+        @xml.encoding = 'EUC-JP'
+        assert_match 'EUC-JP', @xml.to_xml
+      end
+
       def test_namespace_should_not_exist
         assert_raises(NoMethodError) {
           @xml.namespace
@@ -17,13 +329,22 @@ module Nokogiri
       end
 
       def test_non_existant_function
-        assert_raises(RuntimeError) {
+        # WTF.  I don't know why this is different between MRI and ffi.
+        # 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'
+          exception = Nokogiri::XML::XPath::SyntaxError
+        end
+
+        assert_raises(exception) {
           @xml.xpath('//name[foo()]')
         }
       end
 
       def test_ancestors
-        assert_equal [], @xml.ancestors
+        assert_equal 0, @xml.ancestors.length
       end
 
       def test_root_node_parent_is_document
@@ -68,6 +389,22 @@ module Nokogiri
         assert_equal 1, doc.search('//xmlns:foo').search('./xmlns:bar').length
       end
 
+      def test_to_xml_with_indent
+        doc = Nokogiri::XML('<root><foo><bar/></foo></root>')
+        doc = Nokogiri::XML(doc.to_xml(:indent => 5))
+
+        assert_indent 5, doc
+      end
+
+      def test_write_xml_to_with_indent
+        io = StringIO.new
+        doc = Nokogiri::XML('<root><foo><bar/></foo></root>')
+        doc.write_xml_to io, :indent => 5
+        io.rewind
+        doc = Nokogiri::XML(io.read)
+        assert_indent 5, doc
+      end
+
       # wtf...  osx's libxml sucks.
       unless Nokogiri::LIBXML_VERSION =~ /^2\.6\./
         def test_encoding
@@ -91,6 +428,18 @@ module Nokogiri
         assert_raises(Nokogiri::XML::SyntaxError) {
           Nokogiri::XML('<foo><bar></foo>', nil, nil, 0)
         }
+
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML('<foo><bar></foo>') { |cfg|
+            cfg.strict
+          }
+        }
+
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML(StringIO.new('<foo><bar></foo>')) { |cfg|
+            cfg.strict
+          }
+        }
       end
 
       def test_XML_function
@@ -143,11 +492,6 @@ module Nokogiri
         }
       end
 
-      def test_new_document_collect_namespaces
-        doc = Nokogiri::XML::Document.new
-        assert_equal({}, doc.collect_namespaces)
-      end
-
       def test_find_with_namespace
         doc = Nokogiri::XML.parse(<<-eoxml)
         <x xmlns:tenderlove='http://tenderlovemaking.com/'>
@@ -157,21 +501,21 @@ module Nokogiri
 
         ctx = Nokogiri::XML::XPathContext.new(doc)
         ctx.register_ns 'tenderlove', 'http://tenderlovemaking.com/'
-        set = ctx.evaluate('//tenderlove:foo').node_set
+        set = ctx.evaluate('//tenderlove:foo')
         assert_equal 1, set.length
         assert_equal 'foo', set.first.name
 
         # It looks like only the URI is important:
         ctx = Nokogiri::XML::XPathContext.new(doc)
         ctx.register_ns 'america', 'http://tenderlovemaking.com/'
-        set = ctx.evaluate('//america:foo').node_set
+        set = ctx.evaluate('//america:foo')
         assert_equal 1, set.length
         assert_equal 'foo', set.first.name
 
         # Its so important that a missing slash will cause it to return nothing
         ctx = Nokogiri::XML::XPathContext.new(doc)
         ctx.register_ns 'america', 'http://tenderlovemaking.com'
-        set = ctx.evaluate('//america:foo').node_set
+        set = ctx.evaluate('//america:foo')
         assert_equal 0, set.length
       end
 
@@ -230,6 +574,65 @@ module Nokogiri
         assert dup.xml?, 'duplicate should be xml'
       end
 
+      def test_new
+        doc = nil
+        assert_nothing_raised {
+          doc = Nokogiri::XML::Document.new
+        }
+        assert doc
+        assert doc.xml?
+        assert_nil doc.root
+      end
+
+      def test_set_root
+        doc = nil
+        assert_nothing_raised {
+          doc = Nokogiri::XML::Document.new
+        }
+        assert doc
+        assert doc.xml?
+        assert_nil doc.root
+        node = Nokogiri::XML::Node.new("b", doc) { |n|
+          n.content = 'hello world'
+        }
+        assert_equal('hello world', node.content)
+        doc.root = node
+        assert_equal(node, doc.root)
+      end
+
+      def test_remove_namespaces
+        doc = Nokogiri::XML <<-EOX
+          <root xmlns:a="http://a.flavorjon.es/" xmlns:b="http://b.flavorjon.es/">
+            <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>
+            </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("//x:foo", "x" => "http://c.flavorjon.es/").length
+        assert_match %r{foo attr}, doc.to_xml
+      end
+
       def test_subset_is_decorated
         x = Module.new do
           def awesome!
@@ -260,38 +663,7 @@ module Nokogiri
           assert node.respond_to?(:awesome!), node.class
         end
         assert @xml.root.respond_to?(:awesome!)
-      end
-
-      def test_new
-        doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
-        assert doc
-        assert doc.xml?
-        assert_nil doc.root
-      end
-
-      def test_set_root
-        doc = nil
-        assert_nothing_raised {
-          doc = Nokogiri::XML::Document.new
-        }
-        assert doc
-        assert doc.xml?
-        assert_nil doc.root
-        node = Nokogiri::XML::Node.new("b", doc) { |n|
-          n.content = 'hello world'
-        }
-        assert_equal('hello world', node.content)
-        doc.root = node
-        assert_equal(node, doc.root)
-      end
-
-      def util_decorate(document, x)
-        document.decorators(XML::Node) << x
-        document.decorators(XML::NodeSet) << x
-        document.decorate!
+        assert @xml.children.respond_to?(:awesome!)
       end
     end
   end