rdoc 3.9.5 → 3.10.pre.1

data/test/test_rdoc_generator_markup.rb

@@ -0,0 +1,56 @@
+require 'rdoc/test_case'
+
+class TestRDocGeneratorMarkup < RDoc::TestCase
+
+  include RDoc::Text
+  include RDoc::Generator::Markup
+
+  def setup
+    super
+
+    @options = RDoc::Options.new
+    @rdoc = RDoc::RDoc.new
+    @rdoc.options = @options
+    @parent = self
+    @path = '/index.html'
+    @symbols = {}
+
+    RDoc::RDoc.current = @rdoc
+  end
+
+  def test_aref_to
+    assert_equal 'Foo/Bar.html', aref_to('Foo/Bar.html')
+  end
+
+  def test_as_href
+    assert_equal '../index.html', as_href('Foo/Bar.html')
+  end
+
+  def test_cvs_url
+    assert_equal 'http://example/this_page',
+                 cvs_url('http://example/', 'this_page')
+
+    assert_equal 'http://example/?page=this_page&foo=bar',
+                 cvs_url('http://example/?page=%s&foo=bar', 'this_page')
+  end
+
+  def test_description
+    @comment = '= Hello'
+
+    assert_equal "\n<h1 id=\"label-Hello\">Hello</h1>\n", description
+  end
+
+  def test_formatter
+    assert_kind_of RDoc::Markup::ToHtmlCrossref, formatter
+    refute formatter.show_hash
+    assert_same self, formatter.context
+  end
+
+  attr_reader :path
+
+  def find_symbol name
+    @symbols[name]
+  end
+
+end
+

data/test/test_rdoc_generator_ri.rb

@@ -1,22 +1,15 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/rdoc'
-require 'rdoc/generator/ri'
-require 'tmpdir'
-require 'fileutils'
+require 'rdoc/test_case'
 
-class TestRDocGeneratorRI < MiniTest::Unit::TestCase
+class TestRDocGeneratorRI < RDoc::TestCase
 
   def setup
+    super
+
     @options = RDoc::Options.new
     @options.encoding = Encoding::UTF_8 if Object.const_defined? :Encoding
 
-    @pwd = Dir.pwd
-    RDoc::TopLevel.reset
-
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
     FileUtils.mkdir_p @tmpdir
-    Dir.chdir @tmpdir
 
     @g = RDoc::Generator::RI.new @options
 
@@ -35,9 +28,13 @@ class TestRDocGeneratorRI < MiniTest::Unit::TestCase
     @klass.add_method @meth
     @klass.add_method @meth_bang
     @klass.add_attribute @attr
+
+    Dir.chdir @tmpdir
   end
 
   def teardown
+    super
+
     Dir.chdir @pwd
     FileUtils.rm_rf @tmpdir
   end

data/test/test_rdoc_markup.rb

@@ -1,9 +1,13 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/markup'
-require 'rdoc/markup/to_test'
+require 'rdoc/test_case'
 
-class TestRDocMarkup < MiniTest::Unit::TestCase
+class TestRDocMarkup < RDoc::TestCase
+
+  def test_class_parse
+    expected = @RM::Document.new(
+      @RM::Paragraph.new('hello'))
+
+    assert_equal expected, RDoc::Markup.parse('hello')
+  end
 
   def test_convert
     str = <<-STR

data/test/test_rdoc_markup_attribute_manager.rb

@@ -1,13 +1,10 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc'
-require 'rdoc/markup'
-require 'rdoc/markup/inline'
-require 'rdoc/markup/to_html_crossref'
+require 'rdoc/test_case'
 
-class TestRDocMarkupAttributeManager < MiniTest::Unit::TestCase
+class TestRDocMarkupAttributeManager < RDoc::TestCase
 
   def setup
+    super
+
     @am = RDoc::Markup::AttributeManager.new
 
     @bold_on  = @am.changed_attribute_by_name([], [:BOLD])
@@ -212,7 +209,7 @@ class TestRDocMarkupAttributeManager < MiniTest::Unit::TestCase
   end
 
   def test_special
-    @am.add_special(RDoc::Markup::ToHtmlCrossref::CROSSREF_REGEXP, :CROSSREF)
+    @am.add_special(RDoc::CrossReference::CROSSREF_REGEXP, :CROSSREF)
 
     #
     # The apostrophes in "cats'" and "dogs'" suppress the flagging of these

data/test/test_rdoc_markup_document.rb

@@ -1,12 +1,10 @@
-require 'pp'
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/markup'
+require 'rdoc/test_case'
 
-class TestRDocMarkupDocument < MiniTest::Unit::TestCase
+class TestRDocMarkupDocument < RDoc::TestCase
 
   def setup
-    @RM = RDoc::Markup
+    super
+
     @d = @RM::Document.new
   end
 
@@ -82,6 +80,18 @@ class TestRDocMarkupDocument < MiniTest::Unit::TestCase
     assert_equal @d, d2
   end
 
+  def test_file_equals
+    @d.file = 'file.rb'
+
+    assert_equal 'file.rb', @d.file
+  end
+
+  def test_file_equals_top_level
+    @d.file = RDoc::TopLevel.new 'file.rb'
+
+    assert_equal 'file.rb', @d.file
+  end
+
   def test_lt2
     @d << @RM::BlankLine.new
 
@@ -148,5 +158,23 @@ class TestRDocMarkupDocument < MiniTest::Unit::TestCase
     refute_empty @d
   end
 
+  def test_table_of_contents
+    doc = @RM::Document.new(
+      @RM::Heading.new(1, 'A'),
+      @RM::Paragraph.new('B'),
+      @RM::Heading.new(2, 'C'),
+      @RM::Paragraph.new('D'),
+      @RM::Heading.new(1, 'E'),
+      @RM::Paragraph.new('F'))
+
+    expected = [
+      @RM::Heading.new(1, 'A'),
+      @RM::Heading.new(2, 'C'),
+      @RM::Heading.new(1, 'E'),
+    ]
+
+    assert_equal expected, doc.table_of_contents
+  end
+
 end
 

data/test/test_rdoc_markup_formatter.rb

@@ -1,17 +1,13 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc'
-require 'rdoc/markup'
-require 'rdoc/markup/formatter'
+require 'rdoc/test_case'
 
-class TestRDocMarkupFormatter < MiniTest::Unit::TestCase
+class TestRDocMarkupFormatter < RDoc::TestCase
 
   class ToTest < RDoc::Markup::Formatter
 
     def initialize markup
       super
 
-      add_tag :TT, '<tt>', '</tt>'
+      add_tag :TT, '<code>', '</code>'
     end
 
     def accept_paragraph paragraph
@@ -37,20 +33,22 @@ class TestRDocMarkupFormatter < MiniTest::Unit::TestCase
   end
 
   def setup
-    @markup = RDoc::Markup.new
+    super
+
+    @markup = @RM.new
     @markup.add_special(/[A-Z]+/, :CAPS)
 
     @to = ToTest.new @markup
 
-    @caps    = RDoc::Markup::Attribute.bitmap_for :CAPS
-    @special = RDoc::Markup::Attribute.bitmap_for :_SPECIAL_
-    @tt      = RDoc::Markup::Attribute.bitmap_for :TT
+    @caps    = @RM::Attribute.bitmap_for :CAPS
+    @special = @RM::Attribute.bitmap_for :_SPECIAL_
+    @tt      = @RM::Attribute.bitmap_for :TT
   end
 
   def test_convert_tt_special
-    converted = @to.convert '<tt>AAA</tt>'
+    converted = @to.convert '<code>AAA</code>'
 
-    assert_equal '<tt>AAA</tt>', converted
+    assert_equal '<code>AAA</code>', converted
   end
 
 end

data/test/test_rdoc_markup_heading.rb

@@ -0,0 +1,20 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupHeading < RDoc::TestCase
+
+  def setup
+    super
+
+    @h = RDoc::Markup::Heading.new 1, 'Hello *Friend*!'
+  end
+
+  def test_label
+    assert_equal 'label-Hello+Friend%21', @h.label
+  end
+
+  def test_plain_html
+    assert_equal 'Hello <strong>Friend</strong>!', @h.plain_html
+  end
+
+end
+

data/test/test_rdoc_markup_include.rb

@@ -0,0 +1,19 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupInclude < RDoc::TestCase
+
+  def setup
+    super
+
+    @include = @RM::Include.new 'file', [Dir.tmpdir]
+  end
+
+  def test_equals2
+    assert_equal @include, @RM::Include.new('file', [Dir.tmpdir])
+    refute_equal @include, @RM::Include.new('file', %w[.])
+    refute_equal @include, @RM::Include.new('other', [Dir.tmpdir])
+    refute_equal @include, Object.new
+  end
+
+end
+

data/test/test_rdoc_markup_indented_paragraph.rb

@@ -1,11 +1,10 @@
-require 'pp'
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/markup'
+require 'rdoc/test_case'
 
-class TestRDocMarkupIndentedParagraph < MiniTest::Unit::TestCase
+class TestRDocMarkupIndentedParagraph < RDoc::TestCase
 
   def setup
+    super
+
     @IP = RDoc::Markup::IndentedParagraph
   end
 

data/test/test_rdoc_markup_paragraph.rb

@@ -1,9 +1,6 @@
-require 'pp'
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/markup'
+require 'rdoc/test_case'
 
-class TestRDocMarkupParagraph < MiniTest::Unit::TestCase
+class TestRDocMarkupParagraph < RDoc::TestCase
 
   def test_accept
     visitor = Object.new

data/test/test_rdoc_markup_parser.rb

@@ -1,14 +1,12 @@
 # coding: utf-8
 
-require 'pp'
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/markup'
+require 'rdoc/test_case'
 
-class TestRDocMarkupParser < MiniTest::Unit::TestCase
+class TestRDocMarkupParser < RDoc::TestCase
 
   def setup
-    @RM = RDoc::Markup
+    super
+
     @RMP = @RM::Parser
   end
 
@@ -623,7 +621,7 @@ for all good men
   def test_parse_paragraph_multiline
     str = "now is the time\nfor all good men"
 
-    expected = @RM::Paragraph.new 'now is the time for all good men'
+    expected = @RM::Paragraph.new 'now is the time', 'for all good men'
     assert_equal [expected], @RMP.parse(str).parts
   end
 
@@ -1185,6 +1183,38 @@ the time
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_label_newline
+    str = <<-STR
+[cat]
+  l1
+    STR
+
+    expected = [
+      [:LABEL,   'cat',   0, 0],
+      [:NEWLINE, "\n",    5, 0],
+      [:TEXT,    'l1',    2, 1],
+      [:NEWLINE, "\n",    4, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
+  def test_tokenize_label_newline_windows
+    str = <<-STR
+[cat]\r
+  l1\r
+    STR
+
+    expected = [
+      [:LABEL,   'cat',   0, 0],
+      [:NEWLINE, "\n",    6, 0],
+      [:TEXT,    'l1',    2, 1],
+      [:NEWLINE, "\n",    5, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_lalpha
     str = <<-STR
 a. l1
@@ -1237,6 +1267,38 @@ dog::
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_note_newline
+    str = <<-STR
+cat::
+  l1
+    STR
+
+    expected = [
+      [:NOTE,    'cat',   0, 0],
+      [:NEWLINE, "\n",    5, 0],
+      [:TEXT,    'l1',    2, 1],
+      [:NEWLINE, "\n",    4, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
+  def test_tokenize_note_newline_windows
+    str = <<-STR
+cat::\r
+  l1\r
+    STR
+
+    expected = [
+      [:NOTE,    'cat',   0, 0],
+      [:NEWLINE, "\n",    6, 0],
+      [:TEXT,    'l1',    2, 1],
+      [:NEWLINE, "\n",    5, 1],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_note_not
     str = <<-STR
 Cat::Dog
@@ -1363,6 +1425,24 @@ for all
     assert_equal expected, @RMP.tokenize(str)
   end
 
+  def test_tokenize_rule_windows
+    str = <<-STR
+---\r
+
+--- blah ---\r
+    STR
+
+    expected = [
+      [:RULE,    1,            0, 0],
+      [:NEWLINE, "\n",         4, 0],
+      [:NEWLINE, "\n",         0, 1],
+      [:TEXT, "--- blah ---",  0, 2],
+      [:NEWLINE, "\n",        13, 2],
+    ]
+
+    assert_equal expected, @RMP.tokenize(str)
+  end
+
   def test_tokenize_ualpha
     str = <<-STR
 A. l1