rdoc 2.5 → 2.5.1

data/test/test_rdoc_context.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'minitest/unit'
-require 'test/xref_test_case'
+require 'minitest/autorun'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocContext < XrefTestCase
 

data/test/test_rdoc_include.rb

@@ -1,4 +1,4 @@
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocInclude < XrefTestCase
 

data/test/test_rdoc_markup_parser.rb

@@ -1004,6 +1004,24 @@ the time
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_heading_no_space
+    str = <<-STR
+=Heading
+==Heading 2
+    STR
+
+    expected = [
+      [:HEADER,  1,            0, 0],
+      [:TEXT,    'Heading',    1, 0],
+      [:NEWLINE, "\n",         8, 0],
+      [:HEADER,  2,            0, 1],
+      [:TEXT,    'Heading 2',  2, 1],
+      [:NEWLINE, "\n",        11, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_label
     str = <<-STR
 [cat] l1

data/test/test_rdoc_markup_to_ansi.rb

@@ -9,7 +9,7 @@ class TestRDocMarkupToAnsi < RDoc::Markup::FormatterTestCase
 
   def setup
     super
-    
+
     @to = RDoc::Markup::ToAnsi.new
   end
 

data/test/test_rdoc_markup_to_html_crossref.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 require 'rdoc/rdoc'
 require 'rdoc/code_objects'
 require 'rdoc/markup/to_html_crossref'
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocMarkupToHtmlCrossref < XrefTestCase
 

data/test/test_rdoc_markup_to_rdoc.rb

@@ -9,7 +9,7 @@ class TestRDocMarkupToRdoc < RDoc::Markup::FormatterTestCase
 
   def setup
     super
-    
+
     @to = RDoc::Markup::ToRdoc.new
   end
 

data/test/test_rdoc_normal_class.rb

@@ -1,4 +1,4 @@
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocNormalClass < XrefTestCase
 

data/test/test_rdoc_normal_module.rb

@@ -1,4 +1,4 @@
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocNormalModule < XrefTestCase
 

data/test/test_rdoc_parser.rb

@@ -45,13 +45,9 @@ class TestRDocParser < MiniTest::Unit::TestCase
   def test_class_can_parse
     assert_equal @RP.can_parse(__FILE__), @RP::Ruby
 
-    readme_file_name = File.expand_path '../README.txt', __FILE__
+    readme_file_name = File.expand_path '../test.txt', __FILE__
 
-    unless File.exist? readme_file_name then # HACK for tests in trunk :/
-      readme_file_name = File.expand_path '../../README.txt', __FILE__
-    end
-
-    assert_equal @RP.can_parse(readme_file_name), @RP::Simple
+    assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
 
     assert_nil @RP.can_parse(@binary_dat)
 

data/test/test_rdoc_parser_c.rb

@@ -201,6 +201,26 @@ Multiline comment goes here because this comment spans multiple lines.
     assert constants.empty?, constants.inspect
   end
 
+  def test_find_class_comment_include
+    @options.rdoc_include << File.dirname(__FILE__)
+
+    content = <<-EOF
+/*
+ * a comment for class Foo
+ *
+ * :include: test.txt
+ */
+void
+Init_Foo(void) {
+  VALUE foo = rb_define_class("Foo", rb_cObject);
+}
+    EOF
+
+    klass = util_get_class content, 'foo'
+
+    assert_equal "a comment for class Foo\n\ntest file", klass.comment
+  end
+
   def test_find_class_comment_init
     content = <<-EOF
 /*

data/test/test_rdoc_parser_ruby.rb

@@ -1240,7 +1240,7 @@ end
     util_parser 'class A; B = "#{c}"; end'
 
     while tk = @parser.get_tk do last_tk = tk end
-    
+
     assert_equal "\n", last_tk.text
   end
 

data/test/test_rdoc_rdoc.rb

@@ -15,8 +15,8 @@ class TestRDocRDoc < MiniTest::Unit::TestCase
   end
 
   def test_gather_files
-    assert_equal(%w[lib/rdoc.rb],
-                 @rdoc.gather_files(%w[lib/rdoc.rb lib/rdoc.rb]))
+    file = File.expand_path __FILE__
+    assert_equal [file], @rdoc.gather_files([file, file])
   end
 
   def test_read_file_contents

data/test/test_rdoc_require.rb

@@ -1,4 +1,4 @@
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocRequire < XrefTestCase
 

data/test/test_rdoc_ri_driver.rb

@@ -34,6 +34,15 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
     FileUtils.rm_rf @tmpdir
   end
 
+  DUMMY_PAGER = ":;\n"
+
+  def with_dummy_pager
+    pager_env, ENV['RI_PAGER'] = ENV['RI_PAGER'], DUMMY_PAGER
+    yield
+  ensure
+    ENV['RI_PAGER'] = pager_env
+  end
+
   def mu_pp(obj)
     s = ''
     s = PP.pp obj, s
@@ -357,7 +366,6 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
     assert_match %r%Foo::Bar#blah%, out
     assert_match %r%blah.5%,        out
     assert_match %r%blah.6%,        out
-    assert_match %r%yields: stuff%, out
   end
 
   def test_display_method_attribute
@@ -416,6 +424,16 @@ Foo::Bar#bother
     assert_equal expected, out
   end
 
+  def test_display_method_params
+    util_store
+
+    out, err = capture_io do
+      @driver.display_method 'Foo::Bar#bother'
+    end
+
+    assert_match %r%things.*stuff%, out
+  end
+
   def test_expand_class
     util_store
 
@@ -558,10 +576,12 @@ Foo::Bar#bother
   def test_page
     @driver.use_stdout = false
 
-    @driver.page do |io|
-      skip "couldn't find a standard pager" if io == $stdout
+    with_dummy_pager do
+      @driver.page do |io|
+        skip "couldn't find a standard pager" if io == $stdout
 
-      assert @driver.paging?
+        assert @driver.paging?
+      end
     end
 
     refute @driver.paging?
@@ -664,7 +684,7 @@ Foo::Bar#bother
   def test_setup_pager
     @driver.use_stdout = false
 
-    pager = @driver.setup_pager
+    pager = with_dummy_pager do @driver.setup_pager end
 
     skip "couldn't find a standard pager" unless pager
 
@@ -765,9 +785,10 @@ Foo::Bar#bother
 
     @blah = RDoc::AnyMethod.new nil, 'blah'
     @blah.call_seq = "blah(5) => 5\nblah(6) => 6\n"
-    @blah.block_params = "stuff"
 
     @bother = RDoc::AnyMethod.new nil, 'bother'
+    @bother.params = "(things)"
+    @bother.block_params = "stuff"
 
     @new  = RDoc::AnyMethod.new nil, 'new'
     @new.singleton = true

data/test/test_rdoc_ri_paths.rb

@@ -6,6 +6,14 @@ require 'rdoc/ri/paths'
 
 class TestRDocRIPaths < MiniTest::Unit::TestCase
 
+  def setup
+    RDoc::RI::Paths.instance_variable_set :@gemdirs, %w[/nonexistent/gemdir]
+  end
+
+  def teardown
+    RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
+  end
+
   def test_class_path_nonexistent
     path = RDoc::RI::Paths.path true, true, true, true, '/nonexistent'
 
@@ -18,9 +26,7 @@ class TestRDocRIPaths < MiniTest::Unit::TestCase
     assert_equal RDoc::RI::Paths::SYSDIR,  path.shift
     assert_equal RDoc::RI::Paths::SITEDIR, path.shift
     assert_equal RDoc::RI::Paths::HOMEDIR, path.shift
-
-    refute_empty path
-    assert_kind_of String, path.first
+    assert_equal '/nonexistent/gemdir',    path.shift
   end
 
   def test_class_raw_path_extra_dirs
@@ -30,9 +36,7 @@ class TestRDocRIPaths < MiniTest::Unit::TestCase
     assert_equal RDoc::RI::Paths::SYSDIR,  path.shift
     assert_equal RDoc::RI::Paths::SITEDIR, path.shift
     assert_equal RDoc::RI::Paths::HOMEDIR, path.shift
-
-    refute_empty path
-    assert_kind_of String, path.first
+    assert_equal '/nonexistent/gemdir',    path.shift
   end
 
 end

data/test/test_rdoc_task.rb

@@ -3,18 +3,18 @@ require 'minitest/autorun'
 require 'rdoc/task'
 
 class TestRDocTask < MiniTest::Unit::TestCase
-  
+
   def setup
     Rake::Task.clear
   end
-  
+
   def test_tasks_creation
     RDoc::Task.new
     assert Rake::Task[:rdoc]
     assert Rake::Task[:clobber_rdoc]
     assert Rake::Task[:rerdoc]
   end
-  
+
   def test_tasks_creation_with_custom_name_symbol
     rd = RDoc::Task.new(:rdoc_dev)
     assert Rake::Task[:rdoc_dev]
@@ -22,7 +22,7 @@ class TestRDocTask < MiniTest::Unit::TestCase
     assert Rake::Task[:rerdoc_dev]
     assert_equal :rdoc_dev, rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_string
     rd = RDoc::Task.new("rdoc_dev")
     assert Rake::Task[:rdoc_dev]
@@ -30,7 +30,7 @@ class TestRDocTask < MiniTest::Unit::TestCase
     assert Rake::Task[:rerdoc_dev]
     assert_equal "rdoc_dev", rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_hash
     options = { :rdoc => "rdoc", :clobber_rdoc => "rdoc:clean", :rerdoc => "rdoc:force" }
     rd = RDoc::Task.new(options)
@@ -40,25 +40,25 @@ class TestRDocTask < MiniTest::Unit::TestCase
     assert_raises(RuntimeError) { Rake::Task[:clobber_rdoc] }
     assert_equal options, rd.name
   end
-  
+
   def test_tasks_creation_with_custom_name_hash_will_use_default_if_an_option_isnt_given
     rd = RDoc::Task.new(:clobber_rdoc => "rdoc:clean")
     assert Rake::Task[:rdoc]
     assert Rake::Task[:"rdoc:clean"]
     assert Rake::Task[:rerdoc]
   end
-  
+
   def test_tasks_creation_with_custom_name_hash_raises_exception_if_invalid_option_given
     assert_raises(ArgumentError) do
       RDoc::Task.new(:foo => "bar")
     end
-    
+
     begin
       RDoc::Task.new(:foo => "bar")
     rescue ArgumentError => e
       assert_match(/foo/, e.message)
     end
   end
-  
+
 end
 

data/test/test_rdoc_top_level.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
 require 'minitest/autorun'
-require 'test/xref_test_case'
+require File.expand_path '../xref_test_case', __FILE__
 
 class TestRDocTopLevel < XrefTestCase
 

data/test/xref_data.rb

@@ -11,7 +11,7 @@ class C1
   def self.m
   end
 
-  def m
+  def m foo
   end
 end
 

data/test/xref_test_case.rb

@@ -7,7 +7,7 @@ require 'rdoc/stats'
 require 'rdoc/options'
 require 'rdoc/code_objects'
 require 'rdoc/parser/ruby'
-require 'test/xref_data'
+require File.expand_path '../xref_data', __FILE__
 
 class XrefTestCase < MiniTest::Unit::TestCase
 

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 5
-  version: "2.5"
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -37,7 +38,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-03-31 00:00:00 -07:00
+date: 2010-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -229,6 +230,7 @@ files:
 - test/hidden.zip.txt
 - test/test.ja.rdoc
 - test/test.ja.txt
+- test/test.txt
 - test/test_attribute_manager.rb
 - test/test_rdoc_any_method.rb
 - test/test_rdoc_attr.rb