rdoc 3.9.5 → 3.10.pre.1

data/test/test_rdoc_rd_inline.rb

@@ -0,0 +1,63 @@
+require 'rdoc/test_case'
+
+class TestRDocRdInline < RDoc::TestCase
+
+  def setup
+    super
+
+    @inline = RDoc::RD::Inline.new '+text+', 'text'
+  end
+
+  def test_class_new
+    inline = RDoc::RD::Inline.new @inline
+
+    refute_equal inline.rdoc, inline.reference
+  end
+
+  def test_initialize
+    inline = RDoc::RD::Inline.new 'text'
+
+    assert_equal inline.rdoc, inline.reference
+    refute_same  inline.rdoc, inline.reference
+  end
+
+  def test_initialize_inline
+    inline = RDoc::RD::Inline.new @inline
+
+    assert_equal '+text+', inline.rdoc
+    assert_equal 'text',   inline.reference
+  end
+
+  def test_append_inline
+    out = @inline.append @inline
+
+    assert_same @inline, out
+
+    assert_equal '+text++text+', @inline.rdoc
+    assert_equal 'texttext',     @inline.reference
+  end
+
+  def test_append_string
+    @inline.append ' more'
+
+    assert_equal '+text+ more', @inline.rdoc
+    assert_equal 'text more',   @inline.reference
+  end
+
+  def test_equals2
+    assert_equal @inline, RDoc::RD::Inline.new('+text+', 'text')
+    refute_equal @inline, RDoc::RD::Inline.new('+text+', 'other')
+    refute_equal @inline, RDoc::RD::Inline.new('+other+', 'text')
+    refute_equal @inline, Object.new
+  end
+
+  def test_inspect
+    assert_equal '(inline: +text+)', @inline.inspect
+  end
+
+  def test_to_s
+    assert_equal '+text+', @inline.to_s
+  end
+
+end
+

data/test/test_rdoc_rd_inline_parser.rb

@@ -0,0 +1,173 @@
+require 'rdoc/test_case'
+
+class TestRDocRdInlineParser < RDoc::TestCase
+
+  def setup
+    super
+
+    @block_parser = RDoc::RD::BlockParser.new
+    @block_parser.instance_variable_set :@i, 0
+    @inline_parser = RDoc::RD::InlineParser.new @block_parser
+  end
+
+  def test_parse
+    assert_equal 'regular <em>emphasis</em>', parse('regular ((*emphasis*))')
+  end
+
+  def test_parse_code
+    assert_equal '<code>text</code>', parse('(({text}))')
+  end
+
+  def test_parse_em
+    assert_equal '<em>text</em>', parse('((*text*))')
+  end
+
+  def test_parse_footnote
+    assert_equal '{*1}[rdoc-label:foottext-1:footmark-1]', parse('((-text-))')
+
+    expected = [
+      @RM::Paragraph.new('{^1}[rdoc-label:footmark-1:foottext-1]', 'text')
+    ]
+
+    assert_equal expected, @block_parser.footnotes
+  end
+
+  def test_parse_index
+    assert_equal '<span id="label-text">text</span>', parse('((:text:))')
+
+    assert_includes @block_parser.labels, 'text'
+  end
+
+  def test_parse_kbd
+    assert_equal '<tt>text</tt>', parse('((%text%))')
+  end
+
+  def test_parse_multiple
+    assert_equal '<em>one</em> <em>two</em>', parse('((*one*)) ((*two*))')
+  end
+
+  def test_parse_newline
+    assert_equal "one\ntwo", parse("one\ntwo")
+  end
+
+  def test_parse_quote
+    assert_equal 'one " two', parse('one " two')
+  end
+
+  def test_parse_ref
+    assert_equal '{text}[rdoc-label:text]', parse('((<text>))')
+  end
+
+  def test_parse_ref_em
+    assert_equal '{<em>text</em>}[rdoc-label:text]', parse('((<((*text*))>))')
+  end
+
+  def test_parse_ref_filename_quote
+    assert_equal '{RD/foo}[rdoc-label:RD/foo]', parse('((<RD/"foo">))')
+  end
+
+  def test_parse_ref_filename
+    assert_equal '{RD}[rdoc-label:RD/]', parse('((<RD/>))')
+  end
+
+  def test_parse_ref_quote
+    assert_equal '{text \\"}[rdoc-label:text \\"]', parse('((<text \">))')
+  end
+
+  def test_parse_ref_quote_content
+    assert_equal '{<em>text</em>}[rdoc-label:text]',
+                 parse('((<"((*text*))">))')
+  end
+
+  def test_parse_ref_quote_content_multi
+    assert_equal '{<em>one</em> <em>two</em>}[rdoc-label:one two]',
+                 parse('((<"((*one*)) ((*two*))">))')
+  end
+
+  def test_parse_ref_substitute
+    assert_equal '{text}[rdoc-label:thing]', parse('((<text|thing>))')
+  end
+
+  def test_parse_ref_substitute_element_quote
+    assert_equal '{text}[rdoc-label:"RD"]',
+                 parse('((<text|"RD">))')
+  end
+
+  def test_parse_ref_substitute_filename
+    assert_equal '{text}[rdoc-label:RD/]', parse('((<text|RD/>))')
+  end
+
+  def test_parse_ref_substitute_filename_label
+    assert_equal '{text}[rdoc-label:RD/label]',
+                 parse('((<text|RD/label>))')
+  end
+
+  def test_parse_ref_substitute_filename_quote
+    assert_equal '{text}[rdoc-label:"RD"/]', parse('((<text|"RD"/>))')
+  end
+
+  def test_parse_ref_substitute_multi_content
+    assert_equal '{<em>one</em> two}[rdoc-label:thing]',
+                 parse('((<((*one*)) two|thing>))')
+  end
+
+  def test_parse_ref_substitute_multi_content2
+    assert_equal '{<em>one</em> \\" two}[rdoc-label:thing]',
+                 parse('((<((*one*)) \" two|thing>))')
+  end
+
+  def test_parse_ref_substitute_multi_content3
+    assert_equal '{<em>one</em> \\" <em>two</em>}[rdoc-label:thing]',
+                 parse('((<((*one*)) \" ((*two*))|thing>))')
+  end
+
+  def test_parse_ref_substitute_quote
+    assert_equal '{one | two}[rdoc-label:thing]',
+                 parse('((<"one | two"|thing>))')
+  end
+
+  def test_parse_ref_substitute_quote_content
+    assert_equal '{<em>text</em>}[rdoc-label:thing]',
+                 parse('((<"((*text*))"|thing>))')
+  end
+
+  def test_parse_ref_substitute_url
+    assert_equal '{text}[http://example]',
+                 parse('((<text|URL:http://example>))')
+  end
+
+  def test_parse_ref_url
+    assert_equal '{http://example}[http://example]',
+                 parse('((<URL:http://example>))')
+  end
+
+  def test_parse_var
+    assert_equal '+text+', parse('((|text|))')
+  end
+
+  def test_parse_verb
+    assert_equal '<tt>text</tt>', parse("(('text'))")
+  end
+
+  def test_parse_verb_backslash
+    assert_equal "<tt>(('text'))</tt>", parse("(('(('text\\'))'))")
+  end
+
+  def test_parse_verb_backslash_backslash
+    assert_equal '<tt>text \\</tt>', parse("(('text \\\\'))")
+  end
+
+  def test_parse_verb_backslash_quote
+    assert_equal '<tt>text "</tt>', parse("(('text \\\"'))")
+  end
+
+  def test_parse_verb_multiple
+    assert_equal '<tt>((*text*))</tt>', parse("(('((*text*))'))")
+  end
+
+  def parse text
+    @inline_parser.parse text
+  end
+
+end
+

data/test/test_rdoc_rdoc.rb

@@ -1,15 +1,9 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/rdoc'
+require 'rdoc/test_case'
 
-require 'fileutils'
-require 'tempfile'
-require 'tmpdir'
-
-class TestRDocRDoc < MiniTest::Unit::TestCase
+class TestRDocRDoc < RDoc::TestCase
 
   def setup
-    RDoc::TopLevel.reset
+    super
 
     @rdoc = RDoc::RDoc.new
     @rdoc.options = RDoc::Options.new
@@ -19,6 +13,8 @@ class TestRDocRDoc < MiniTest::Unit::TestCase
   end
 
   def test_class_reset
+    RDoc::RDoc.current = :junk
+
     tl = RDoc::TopLevel.new 'file.rb'
     tl.add_class RDoc::NormalClass, 'C'
     tl.add_class RDoc::NormalModule, 'M'
@@ -31,6 +27,8 @@ class TestRDocRDoc < MiniTest::Unit::TestCase
 
     RDoc::RDoc.reset
 
+    assert_nil RDoc::RDoc.current
+
     assert_empty RDoc::TopLevel.all_classes_hash
     assert_empty RDoc::TopLevel.all_files_hash
     assert_empty RDoc::TopLevel.all_modules_hash

data/test/test_rdoc_ri_driver.rb

@@ -1,16 +1,9 @@
-require 'pp'
-require 'rubygems'
-require 'minitest/autorun'
-require 'tmpdir'
-require 'fileutils'
-require 'stringio'
-require 'rdoc/ri/driver'
-require 'rdoc/rdoc'
+require 'rdoc/test_case'
 
-class TestRDocRIDriver < MiniTest::Unit::TestCase
+class TestRDocRIDriver < RDoc::TestCase
 
   def setup
-    @RM = RDoc::Markup
+    super
 
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_driver_#{$$}"
     @home_ri = File.join @tmpdir, 'dot_ri'
@@ -31,6 +24,8 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
   end
 
   def teardown
+    super
+
     ENV['HOME'] = @orig_home
     ENV['RI'] = @orig_ri
     FileUtils.rm_rf @tmpdir
@@ -85,8 +80,8 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
     expected = @RM::Document.new(
       @RM::Rule.new(1),
       @RM::Paragraph.new('Also found in:'),
-      @RM::Verbatim.new("ruby core\n",
-                        "~/.ri\n"))
+      @RM::Verbatim.new("ruby core", "\n",
+                        "~/.ri", "\n"))
 
     assert_equal expected, out
   end
@@ -145,7 +140,7 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
       @RM::BlankLine.new,
       @RM::Paragraph.new("Include thingy"),
       @RM::BlankLine.new,
-      @RM::Verbatim.new("Enumerable\n"))
+      @RM::Verbatim.new("Enumerable", "\n"))
 
     assert_equal expected, out
   end
@@ -165,8 +160,8 @@ class TestRDocRIDriver < MiniTest::Unit::TestCase
       @RM::Rule.new(1),
       @RM::Heading.new(1, "Includes:"),
       @RM::Paragraph.new("(from #{@store.friendly_path})"),
-      @RM::Verbatim.new("Inc\n",
-                        "Enumerable\n"))
+      @RM::Verbatim.new("Inc", "\n",
+                        "Enumerable", "\n"))
 
     assert_equal expected, out
   end

data/test/test_rdoc_ri_paths.rb

@@ -1,16 +1,16 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'tmpdir'
-require 'fileutils'
-require 'rdoc/ri/paths'
+require 'rdoc/test_case'
 
-class TestRDocRIPaths < MiniTest::Unit::TestCase
+class TestRDocRIPaths < RDoc::TestCase
 
   def setup
+    super
+
     RDoc::RI::Paths.instance_variable_set :@gemdirs, %w[/nonexistent/gemdir]
   end
 
   def teardown
+    super
+
     RDoc::RI::Paths.instance_variable_set :@gemdirs, nil
   end
 

data/test/test_rdoc_ri_store.rb

@@ -1,18 +1,11 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/rdoc'
-require 'rdoc/ri'
-require 'rdoc/markup'
-require 'tmpdir'
-require 'fileutils'
-require 'pp'
+require 'rdoc/test_case'
 
-class TestRDocRIStore < MiniTest::Unit::TestCase
+class TestRDocRIStore < RDoc::TestCase
 
   OBJECT_ANCESTORS = defined?(::BasicObject) ? %w[BasicObject] : []
 
   def setup
-    RDoc::TopLevel.reset
+    super
 
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_ri_store_#{$$}"
     @s = RDoc::RI::Store.new @tmpdir
@@ -49,11 +42,11 @@ class TestRDocRIStore < MiniTest::Unit::TestCase
 
     @nest_klass.add_method @nest_meth
     @nest_klass.add_include @nest_incl
-
-    @RM = RDoc::Markup
   end
 
   def teardown
+    super
+
     FileUtils.rm_rf @tmpdir
   end
 
@@ -386,7 +379,7 @@ class TestRDocRIStore < MiniTest::Unit::TestCase
     s = RDoc::RI::Store.new @tmpdir
 
     inner = @RM::Document.new @RM::Paragraph.new 'new comment'
-    inner.file = @top_level.absolute_name
+    inner.file = @top_level
 
     document = @RM::Document.new inner
 

data/test/test_rdoc_ruby_lex.rb

@@ -1,9 +1,55 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/rdoc'
-require 'rdoc/ruby_lex'
+require 'rdoc/test_case'
+
+class TestRDocRubyLex < RDoc::TestCase
+
+  def setup
+    @TK = RDoc::RubyToken
+  end
+
+  def mu_pp obj
+    s = ''
+    s = PP.pp obj, s
+    s = s.force_encoding(Encoding.default_external) if defined? Encoding
+    s.chomp
+  end
+
+  def test_class_tokenize
+    tokens = RDoc::RubyLex.tokenize "def x() end", nil
+
+    expected = [
+      @TK::TkDEF       .new( 0, 1,  0, "def"),
+      @TK::TkSPACE     .new( 3, 1,  3, " "),
+      @TK::TkIDENTIFIER.new( 4, 1,  4, "x"),
+      @TK::TkLPAREN    .new( 5, 1,  5, "("),
+      @TK::TkRPAREN    .new( 6, 1,  6, ")"),
+      @TK::TkSPACE     .new( 7, 1,  7, " "),
+      @TK::TkEND       .new( 8, 1,  8, "end"),
+      @TK::TkNL        .new(11, 1, 11, "\n"),
+    ]
+
+    assert_equal expected, tokens
+  end
+
+  def test_class_tokenize_heredoc
+    tokens = RDoc::RubyLex.tokenize <<-'RUBY', nil
+string = <<-STRING
+Line 1
+Line 2
+STRING
+    RUBY
+
+    expected = [
+      @TK::TkIDENTIFIER.new( 0, 1,  0, 'string'),
+      @TK::TkSPACE     .new( 6, 1,  6, ' '),
+      @TK::TkASSIGN    .new( 7, 1,  7, '='),
+      @TK::TkSPACE     .new( 8, 1,  8, ' '),
+      @TK::TkSTRING    .new( 9, 1,  9, %Q{"Line 1\nLine 2\n"}),
+      @TK::TkNL        .new(39, 4, 40, "\n"),
+    ]
+
+    assert_equal expected, tokens
+  end
 
-class TestRubyLex < MiniTest::Unit::TestCase
   def test_unary_minus
     ruby_lex = RDoc::RubyLex.new("-1", nil)
     assert_equal("-1", ruby_lex.token.value)
@@ -20,4 +66,6 @@ class TestRubyLex < MiniTest::Unit::TestCase
     2.times { ruby_lex.token } # skip "0" and "+"
     assert_equal("-0.1", ruby_lex.token.value)
   end
+
 end
+