nokogiri 1.3.2-x86-mingw32 → 1.3.3-x86-mingw32

data/test/files/shift_jis.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="Shift_JIS"?>
+<root>
+  <hi>This is a Shift_JIS File</hi>
+  <hi_again>����ɂ���</hi_again>
+</root>

data/test/helper.rb

@@ -2,6 +2,7 @@ Process.setrlimit(Process::RLIMIT_CORE, Process::RLIM_INFINITY) unless RUBY_PLAT
 $VERBOSE = true
 require 'rubygems'
 require 'test/unit'
+require 'tempfile'
 
 %w(../lib ../ext).each do |path|
   $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), path)))
@@ -19,6 +20,8 @@ module Nokogiri
     EXSLT_FILE      = File.join(ASSETS_DIR, 'exslt.xslt')
     EXML_FILE       = File.join(ASSETS_DIR, 'exslt.xml')
     HTML_FILE       = File.join(ASSETS_DIR, 'tlm.html')
+    NICH_FILE       = File.join(ASSETS_DIR, '2ch.html')
+    SHIFT_JIS_XML   = File.join(ASSETS_DIR, 'shift_jis.xml')
     PO_XML_FILE     = File.join(ASSETS_DIR, 'po.xml')
     PO_SCHEMA_FILE  = File.join(ASSETS_DIR, 'po.xsd')
     ADDRESS_SCHEMA_FILE = File.join(ASSETS_DIR, 'address_book.rlx')

data/test/hpricot/test_alter.rb

@@ -6,9 +6,9 @@ class TestAlter < Nokogiri::TestCase
 
   def setup
     super
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri::HTML.parse(TestFiles::BASIC)
   end
-  
+
   def test_before
     test0 = "<link rel='stylesheet' href='test0.css' />"
     @basic.at("link").before(test0)
@@ -24,18 +24,18 @@ class TestAlter < Nokogiri::TestCase
   def test_wrap
     ohmy = (@basic/"p.ohmy").wrap("<div id='wrapper'></div>")
     assert_equal 'wrapper', ohmy[0].parent['id']
-    assert_equal 'ohmy', Nokogiri.Hpricot(@basic.to_html).at("#wrapper").children[0]['class']
+    assert_equal 'ohmy', Nokogiri(@basic.to_html).at("#wrapper").children[0]['class']
   end
-  
+
   def test_add_class
     first_p = (@basic/"p:first").add_class("testing123")
     assert first_p[0].get_attribute("class").split(" ").include?("testing123")
-    assert((Nokogiri.Hpricot(@basic.to_html)/"p:first")[0]["class"].split(" ").include?("testing123"))
+    assert((Nokogiri(@basic.to_html)/"p:first")[0]["class"].split(" ").include?("testing123"))
     ####
     # Modified.  We do not support OB1 bug.
-    assert !(Nokogiri.Hpricot(@basic.to_html)/"p:gt(1)")[0]["class"].split(" ").include?("testing123")
+    assert !(Nokogiri(@basic.to_html)/"p:gt(1)")[0]["class"].split(" ").include?("testing123")
   end
-  
+
   def test_change_attributes
     all_ps = (@basic/"p").attr("title", "Some Title")
     all_as = (@basic/"a").attr("href", "http://my_new_href.com")
@@ -45,7 +45,7 @@ class TestAlter < Nokogiri::TestCase
     assert_changed(@basic, "a", all_as) {|a| a.attributes["href"].to_s == "http://my_new_href.com"}
     assert_changed(@basic, "link", all_lb) {|a| a.attributes["href"].to_s == "link" }
   end
-  
+
   def test_remove_attr
     all_rl = (@basic/"link").remove_attr("href")
     assert_changed(@basic, "link", all_rl) { |link| link['href'].nil? }
@@ -63,6 +63,6 @@ class TestAlter < Nokogiri::TestCase
 
   def assert_changed original, selector, set, &block
     assert set.all?(&block)
-    assert Nokogiri.Hpricot(original.to_html).search(selector).all?(&block)
+    assert Nokogiri(original.to_html).search(selector).all?(&block)
   end
 end

data/test/hpricot/test_builder.rb

@@ -4,7 +4,7 @@ class TestBuilder < Nokogiri::TestCase
   ####
   # Modified
   def test_escaping_text
-    doc = Nokogiri.Hpricot() { b "<a\"b>" }
+    doc = Nokogiri() { b "<a\"b>" }
     assert_match "<b>&lt;a\"b&gt;</b>", doc.to_html.chomp
     assert_equal %{&lt;a\"b&gt;}, doc.at("text()").to_s
   end
@@ -12,7 +12,7 @@ class TestBuilder < Nokogiri::TestCase
   ####
   # Modified
   def test_no_escaping_text
-    doc = Nokogiri.Hpricot() { div.test.me! { text "<a\"b>" } }
+    doc = Nokogiri() { div.test.me! { text "<a\"b>" } }
     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

data/test/hpricot/test_parser.rb

@@ -5,87 +5,60 @@ class TestParser < Nokogiri::TestCase
   include Nokogiri
 
   def test_set_attr
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     @basic.search('//p').set('class', 'para')
     assert_equal 4, @basic.search('//p').length
     assert_equal 4, @basic.search('//p').find_all { |x| x['class'] == 'para' }.length
   end
 
-  # Modified.  Not supported
-  ## Test creating a new element 
-  #def test_new_element 
-  #  elem = Hpricot::Elem.new(Hpricot::STag.new('form')) 
-  #  assert_not_nil(elem) 
-  #  assert_not_nil(elem.attributes) 
-  #end 
-
-  def test_scan_text
-    assert_equal 'FOO', Hpricot.make("FOO").first.content
-  end
-
   def test_filter_by_attr
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+    @boingboing = Nokogiri.parse(TestFiles::BOINGBOING)
 
     # this link is escaped in the doc
     link = 'http://www.youtube.com/watch?v=TvSNXyNw26g&search=chris%20ware'
     assert_equal link, @boingboing.at("a[@href='#{link}']")['href']
   end
-  
+
   def test_filter_contains
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     assert_equal '<title>Sample XHTML</title>', @basic.search("title:contains('Sample')").to_s.chomp
   end
 
   def test_get_element_by_id
-    @basic = Hpricot.parse(TestFiles::BASIC)
-    assert_equal 'link1', @basic.get_element_by_id('link1')['id']
-    assert_equal 'link1', @basic.get_element_by_id('body1').get_element_by_id('link1').get_attribute('id')
+    @basic = Nokogiri.parse(TestFiles::BASIC)
+    assert_equal 'link1', @basic.at('#link1')['id']
+    assert_equal 'link1', @basic.at('#body1').at('#link1')['id']
   end
 
   def test_get_element_by_tag_name
-    @basic = Hpricot.parse(TestFiles::BASIC)
-    assert_equal 'link1', @basic.get_elements_by_tag_name('a')[0].get_attribute('id')
-    assert_equal 'link1', @basic.get_elements_by_tag_name('body')[0].get_element_by_id('link1').get_attribute('id')
+    @basic = Nokogiri.parse(TestFiles::BASIC)
+    assert_equal 'link1', @basic.at('a')['id']
+    assert_equal 'link1', @basic.at('body').at('#link1')['id']
   end
 
   def test_output_basic
-    @basic = Hpricot.parse(TestFiles::BASIC)
-    @basic2 = Hpricot.parse(@basic.inner_html)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
+    @basic2 = Nokogiri.parse(@basic.inner_html)
     scan_basic @basic2
   end
 
   def test_scan_basic
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     scan_basic @basic
   end
 
   def scan_basic doc
-    ####
-    # Modified: asserting kind is not duck typey
-    #assert_kind_of Hpricot::XMLDecl, doc.children.first
-    assert_not_equal doc.children.first.to_s, doc.children[1].to_s 
+    assert_not_equal doc.children.first.to_s, doc.children[1].to_s
     assert_equal 'link1', doc.at('#link1')['id']
     assert_equal 'link1', doc.at("p a")['id']
     assert_equal 'link1', (doc/:p/:a).first['id']
-    assert_equal 'link1', doc.search('p').at('a').get_attribute('id')
-
-    assert_equal 'link2', (doc/'p').filter('.ohmy').search('a').first.get_attribute('id')
-    assert_equal((doc/'p')[2], (doc/'p').filter('[text()="The third paragraph"]')[0])
-    assert_equal((doc/'p')[3], (doc/'p').filter('b')[0])
-    assert_equal((doc/'p')[1], (doc/'p').filter('a[@id="link2"]')[0])
-    assert_equal((doc/'p')[3], (doc/'p').filter('.last')[0])
-    assert_equal 4, (doc/'p').filter('*').length
-    assert_equal 3, (doc/'p').filter('* *').length
-    eles = (doc/'p').filter('.ohmy')
-    assert_equal 1, eles.length
-    assert_equal 'ohmy', eles.first.get_attribute('class')
+    assert_equal 'link1', doc.search('p').at('a')['id']
+
+    assert_equal 'link2', (doc/'p').css('.ohmy').search('a').first['id']
+    assert_equal((doc/'p')[2], (doc/'p').css('[text()="The third paragraph"]')[0])
     assert_equal 3, (doc/'p:not(.ohmy)').length
 
-    assert_equal 3, (doc/'p').not('.ohmy').length
-    assert_equal 3, (doc/'p').not(eles.first).length
-    assert_equal 2, (doc/'p').filter('[@class]').length
     assert_equal 'last final', (doc/'p[@class~="final"]').first.get_attribute('class')
-    assert_equal 1, (doc/'p').filter('[@class~="final"]').length
     assert_equal 2, (doc/'p > a').length
     assert_equal 1, (doc/'p.ohmy > a').length
     assert_equal 2, (doc/'p / a').length
@@ -97,44 +70,33 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_positional
-    h = Nokogiri.Hpricot( "<div><br/><p>one</p><p>two</p></div>" )
+    h = Nokogiri( "<div><br/><p>one</p><p>two</p></div>" )
     assert_equal "<p>one</p>", h.search("div/p:eq(1)").to_s.chomp # MODIFIED: eq(0) -> eq(1), and removed initial '//'
     assert_equal "<p>one</p>", h.search("div/p:first").to_s.chomp # MODIFIED: removed initial '//'
     assert_equal "<p>one</p>", h.search("div/p:first()").to_s.chomp # MODIFIED: removed initial '//'
   end
 
   def test_pace
-    doc = Nokogiri.Hpricot(TestFiles::PACE_APPLICATION)
+    doc = Nokogiri(TestFiles::PACE_APPLICATION)
     assert_equal 'get', doc.at('form[@name=frmSect11]')['method']
-    # assert_equal '2', doc.at('#hdnSpouse')['value']
   end
 
   def test_scan_boingboing
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+    @boingboing = Nokogiri.HTML(TestFiles::BOINGBOING)
     assert_equal 60, (@boingboing/'p.posted').length
     assert_equal 1, @boingboing.search("//a[@name='027906']").length
-    ###  MODIFIED: libxml wraps the contents of <script> in a CDATA tag, so we won't be able to parse comments.
-#    assert_equal 10, @boingboing.search("script comment()").length
     assert_equal 3, @boingboing.search("a[text()*='Boing']").length
-    assert_equal 1, @boingboing.search("h3[text()='College kids reportedly taking more smart drugs']").length
+    assert_equal 1, @boingboing.search(
+      "//h3[normalize-space(text())='College kids reportedly taking more smart drugs']"
+    ).length
     assert_equal 0, @boingboing.search("h3[text()='College']").length
     assert_equal 60, @boingboing.search("h3").length
-    assert_equal 59, @boingboing.search("h3[text()!='College kids reportedly taking more smart drugs']").length
-    assert_equal 17, @boingboing.search("h3[text()$='s']").length
-    ### Modified.  Hpricot is wrong
-    #assert_equal 129, @boingboing.search("p[text()]").length
-    ## This test seems to change between libxml versions, so I'm commenting
-    ## it out.
-    #if Nokogiri::LIBXML_VERSION == '2.6.16'
-    #  assert_equal 111, @boingboing.search("p[text()]").length
-    #else
-    #  assert_equal 110, @boingboing.search("p[text()]").length
-    #end
+    assert_equal 59, @boingboing.search("//h3[normalize-space(text())!='College kids reportedly taking more smart drugs']").length
     assert_equal 211, @boingboing.search("p").length
   end
 
   def test_reparent
-    doc = Nokogiri.Hpricot(%{<div id="blurb_1"></div>})
+    doc = Nokogiri(%{<div id="blurb_1"></div>})
     div1 = doc.search('#blurb_1')
     div1.before('<div id="blurb_0"></div>')
 
@@ -145,7 +107,7 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_siblings
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     t = @basic.at(:title)
     e = t.next_sibling
     assert_equal 'test1.css', e['href']
@@ -153,33 +115,31 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_css_negation
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     assert_equal 3, (@basic/'p:not(.final)').length
   end
 
   def test_remove_attribute
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     (@basic/:p).each { |ele| ele.remove_attribute('class') }
     assert_equal 0, (@basic/'p[@class]').length
   end
 
-  ##
-  #  Modified: hpricot is giving incorrect counts. Libxml gets it right.
   def test_abs_xpath
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+    @boingboing = Nokogiri.parse(TestFiles::BOINGBOING)
     assert_equal 60, @boingboing.search("/html/body//p[@class='posted']").length
     assert_equal 60, @boingboing.search("/*/body//p[@class='posted']").length
     assert_equal 18, @boingboing.search("//script").length
     divs = @boingboing.search("//script/../div")
-    assert_equal 2,  divs.length # hpricot says this is 1, but that's wrong.
+    assert_equal 2,  divs.length
     imgs = @boingboing.search('//div/p/a/img')
-    assert_equal 12, imgs.length # hpricot says this is 15, but that's wrong.
+    assert_equal 12, imgs.length
     assert_equal 16, @boingboing.search('//div').search('p/a/img').length
     assert imgs.all? { |x| x.name == 'img' }
   end
 
   def test_predicates
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+    @boingboing = Nokogiri.parse(TestFiles::BOINGBOING)
     assert_equal 2, @boingboing.search('//link[@rel="alternate"]').length
     p_imgs = @boingboing.search('//div/p[/a/img]')
     #assert_equal 15, p_imgs.length
@@ -190,32 +150,26 @@ class TestParser < Nokogiri::TestCase
     assert_equal 1, @boingboing.search('//input[@checked]').length
   end
 
-  def test_tag_case 
-    @tenderlove = Hpricot.parse(TestFiles::TENDERLOVE) 
-    assert_equal 2, @tenderlove.search('//a').length 
-    assert_equal 3, @tenderlove.search('//area').length 
-    assert_equal 2, @tenderlove.search('//meta').length 
-  end 
+  def test_tag_case
+    @tenderlove = Nokogiri.parse(TestFiles::TENDERLOVE)
+    assert_equal 2, @tenderlove.search('//a').length
+    assert_equal 3, @tenderlove.search('//area').length
+    assert_equal 2, @tenderlove.search('//meta').length
+  end
 
   def test_alt_predicates
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
-    assert_equal 2, @boingboing.search('table/tr:last').length # MODIFIED to not have '//' prefix
+    @boingboing = Nokogiri.parse(TestFiles::BOINGBOING)
+    assert_equal 2, @boingboing.search('table/tr:last').length
 
-    @basic = Hpricot.parse(TestFiles::BASIC)
-    ##
-    #  MODIFIED:
-    #  hpricot has an off-by-one bug eith eq-and-friends.
+    @basic = Nokogiri.parse(TestFiles::BASIC)
     assert_equal "<p>The third paragraph</p>",
-        @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:eq(3)').to_html.chomp
         @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
+    assert_equal 'last final', @basic.search('p:last-of-type').first.get_attribute('class')
   end
 
   def test_insert_after # ticket #63
-    doc = Nokogiri.Hpricot('<html><body><div id="a-div"></div></body></html>')
+    doc = Nokogiri('<html><body><div id="a-div"></div></body></html>')
     (doc/'div').each do |element|
       element.after('<p>Paragraph 1</p><p>Paragraph 2</p>')
     end
@@ -224,7 +178,7 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_insert_before # ticket #61
-    doc = Nokogiri.Hpricot('<html><body><div id="a-div"></div></body></html>')
+    doc = Nokogiri.HTML('<html><body><div id="a-div"></div></body></html>')
     (doc/'div').each do |element|
       element.before('<p>Paragraph 1</p><p>Paragraph 2</p>')
     end
@@ -233,34 +187,22 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_many_paths
-    @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
+    @boingboing = Nokogiri.parse(TestFiles::BOINGBOING)
     assert_equal 62, @boingboing.search('p.posted, link[@rel="alternate"]').length
-    ###
-    # Modified.  I don't want to support this syntax.  Just use a comma.
-    #assert_equal 20, @boingboing.search('//div/p[a/img]|//link[@rel="alternate"]').length
   end
 
-  ####
-  # Modified.  Epic Fail.  We're on the duck type train folks.
-  #def test_stacked_search
-  #  @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
-  #  assert_kind_of Hpricot::Elements, @boingboing.search('//div/p').search('a img')
-  #end
-
   def test_class_search
-    # test case sent by Chih-Chao Lam
-    # Modified.  libxml corrects this differently than hpricot
-    doc = Nokogiri::Hpricot.HTML("<div class=xyz '>abc</div>")
+    doc = Nokogiri.HTML("<div class=xyz '>abc</div>")
     assert_equal 1, doc.search(".xyz").length
 
-    doc = Nokogiri::Hpricot.HTML("<div class=xyz>abc</div><div class=abc>xyz</div>")
+    doc = Nokogiri.HTML("<div class=xyz>abc</div><div class=abc>xyz</div>")
     assert_equal 1, doc.search(".xyz").length
     assert_equal 4, doc.search("*").length
   end
 
   def test_kleene_star
     # bug noticed by raja bhatia
-    doc = Nokogiri::Hpricot.HTML("<span class='small'>1</span><div class='large'>2</div><div class='small'>3</div><span class='blue large'>4</span>")
+    doc = Nokogiri.HTML("<span class='small'>1</span><div class='large'>2</div><div class='small'>3</div><span class='blue large'>4</span>")
     assert_equal 2, doc.search("*[@class*='small']").length
     assert_equal 2, doc.search("*.small").length
     assert_equal 2, doc.search(".small").length
@@ -268,17 +210,17 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_empty_comment
-    doc = Nokogiri::Hpricot.HTML("<p><!----></p>")
+    doc = Nokogiri.HTML("<p><!----></p>")
     doc = doc.search('//body').first
     assert doc.children[0].children[0].comment?
 
-    doc = Nokogiri::Hpricot.HTML("<p><!-- --></p>")
+    doc = Nokogiri.HTML("<p><!-- --></p>")
     doc = doc.search('//body').first
     assert doc.children[0].children[0].comment?
   end
 
   def test_body_newlines
-    @immob = Hpricot.parse(TestFiles::IMMOB)
+    @immob = Nokogiri.parse(TestFiles::IMMOB)
     body = @immob.at(:body)
     {'background' => '', 'bgcolor' => '#ffffff', 'text' => '#000000', 'marginheight' => '10',
      'marginwidth' => '10', 'leftmargin' => '10', 'topmargin' => '10', 'link' => '#000066',
@@ -288,32 +230,32 @@ class TestParser < Nokogiri::TestCase
   end
 
   def test_nested_twins
-    @doc = Nokogiri.Hpricot("<div>Hi<div>there</div></div>")
+    @doc = Nokogiri("<div>Hi<div>there</div></div>")
     assert_equal 1, (@doc/"div div").length
   end
 
   def test_wildcard
-    @basic = Hpricot.parse(TestFiles::BASIC)
+    @basic = Nokogiri::HTML.parse(TestFiles::BASIC)
     assert_equal 3, (@basic/"*[@id]").length
     assert_equal 3, (@basic/"//*[@id]").length
   end
 
   def test_javascripts
-    @immob = Hpricot.parse(TestFiles::IMMOB)
+    @immob = Nokogiri::HTML.parse(TestFiles::IMMOB)
     assert_equal 3, (@immob/:script)[0].inner_html.scan(/<LINK/).length
   end
 
   ####
   # Modified.  This test passes with later versions of libxml
   def test_nested_scripts
-    @week9 = Hpricot.parse(TestFiles::WEEK9)
+    @week9 = Nokogiri.parse(TestFiles::WEEK9)
     unless Nokogiri::LIBXML_VERSION == '2.6.16'
       assert_equal 14, (@week9/"a").find_all { |x| x.inner_html.include? "GameCenter" }.length
     end
   end
 
   def test_uswebgen
-    @uswebgen = Hpricot.parse(TestFiles::USWEBGEN)
+    @uswebgen = HTML.parse(TestFiles::USWEBGEN)
     # sent by brent beardsley, nokogiri 0.3 had problems with all the links.
     assert_equal 67, (@uswebgen/:a).length
   end
@@ -324,7 +266,7 @@ class TestParser < Nokogiri::TestCase
      %{<html><form name='loginForm'?URL= ?URL= method='post' action='/units/a/login/1,13088,779-1,00.html'?URL=></form></html>},
      %{<html><form name='loginForm' method='post' action='/units/a/login/1,13088,779-1,00.html' ?URL=></form></html>}].
     each do |str|
-      doc = Nokogiri.Hpricot(str)
+      doc = Nokogiri(str)
       assert_equal 1, (doc/:form).length
       assert_equal '/units/a/login/1,13088,779-1,00.html', doc.at("form")['action']
     end
@@ -333,8 +275,8 @@ class TestParser < Nokogiri::TestCase
   ####
   # Modified.  Added question.  Don't care.
   def test_procins
-    doc = Nokogiri::Hpricot.HTML("<?php print('hello') ?>\n<?xml blah='blah'?>")
-    assert_equal "php", doc.children[1].target
+    doc = Nokogiri.HTML("<?php print('hello') ?>\n<?xml blah='blah'?>")
+    assert_equal "php", doc.children[1].name
     assert_equal "blah='blah'?", doc.children[2].content #"# quote added so emacs ruby-mode parser doesn't barf
   end
 
@@ -342,7 +284,7 @@ class TestParser < Nokogiri::TestCase
   # Altered...  libxml does not get a buffer error
   def test_buffer_error
     assert_nothing_raised {
-      Nokogiri.Hpricot(%{<p>\n\n<input type="hidden" name="__VIEWSTATE"  value="#{(("X" * 2000) + "\n") * 22}" />\n\n</p>})
+      Nokogiri(%{<p>\n\n<input type="hidden" name="__VIEWSTATE"  value="#{(("X" * 2000) + "\n") * 22}" />\n\n</p>})
     }
   end
 
@@ -367,40 +309,23 @@ class TestParser < Nokogiri::TestCase
     </object>
     </body></html?
     edoc
-    doc = Nokogiri.Hpricot(str)
+    doc = Nokogiri(str)
     assert_equal "http://www.youtube.com/v/NbDQ4M_cuwA",
       doc.at("//object/param[@value='http://www.youtube.com/v/NbDQ4M_cuwA']")['value']
   end
-  
+
   # ticket #84 by jamezilla
   def test_screwed_xmlns
-    doc = Nokogiri.Hpricot(<<-edoc)
+    doc = Nokogiri(<<-edoc)
       <?xml:namespace prefix = cwi />
       <html><body>HAI</body></html>
     edoc
     assert_equal "HAI", doc.at("body").inner_text
   end
 
-  # Reported by Jonathan Nichols on the Hpricot list (24 May 2007)
-  # MODIFIED:  This is an issue with libxml which we cannot deal with....
-  #def test_self_closed_form
-  #  doc = Nokogiri.Hpricot(<<-edoc)
-  #    <body>
-  #    <form action="/loginRegForm" name="regForm" method="POST" />
-  #    <input type="button">
-  #    </form>
-  #    </body>
-  #  edoc
-  #  assert_equal "button", doc.at("//form/input")['type']
-  #end
-
   def test_filters
-    @basic = Hpricot.parse(TestFiles::BASIC)
-    ##
-    #  MODIFIED:
-    #  Hpricot considers nodes with text-only (but no child tags) to be empty.
-    #  Nokogiri considers that any content makes a parent.
-    assert_equal 1, (@basic/"title:parent").size # so this was 0 under Hpricot
+    @basic = Nokogiri.parse(TestFiles::BASIC)
+    assert_equal 1, (@basic/"title:parent").size
     assert_equal 4, (@basic/"p:parent").size
     assert_equal 0, (@basic/"title:empty").size
     assert_equal 3, (@basic/"link:empty").size
@@ -410,7 +335,7 @@ class TestParser < Nokogiri::TestCase
     str = %{<script> /*<![CDATA[*/
     /*]]>*/ </script>}
     # MODIFIED: if you want the cdata, to_xml it
-    assert_match str, Nokogiri.Hpricot(str).to_xml
+    assert_match str, Nokogiri(str).to_xml
   end
 
   def test_namespace
@@ -419,8 +344,7 @@ class TestParser < Nokogiri::TestCase
       <t:sam>hi </t:sam>
     </a>
     END
-    doc = Hpricot::XML(chunk)
-    assert((doc/"//t:sam").size > 0) # at least this should probably work
-    # assert (doc/"//sam").size > 0  # this would be nice 
+    doc = Nokogiri::XML(chunk)
+    assert((doc/"//t:sam").size > 0)
   end
 end