* lib/rdoc*: Updated to RDoc 4.0 (pre-release)

* bin/rdoc:  ditto
* test/rdoc:  ditto
* NEWS:  Updated with RDoc 4.0 information


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 49 insertions, 6 deletions

diff --git a/test/rdoc/test_rdoc_markup_document.rb b/test/rdoc/test_rdoc_markup_document.rb
index 9eea019ae4..564434dfe6 100644
--- a/test/rdoc/test_rdoc_markup_document.rb
+++ b/test/rdoc/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
 
@@ -47,6 +45,21 @@ class TestRDocMarkupDocument < MiniTest::Unit::TestCase
     end
   end
 
+  def test_concat
+    @d.concat [@RM::BlankLine.new, @RM::BlankLine.new]
+
+    refute_empty @d
+  end
+
+  def test_each
+    a = @RM::Document.new
+    b = @RM::Document.new(@RM::Paragraph.new('hi'))
+
+    @d.push a, b
+
+    assert_equal [a, b], @d.map { |sub_doc| sub_doc }
+  end
+
   def test_empty_eh
     assert_empty @d
 
@@ -82,6 +95,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 = @store.add_file 'file.rb'
+
+    assert_equal 'file.rb', @d.file
+  end
+
   def test_lt2
     @d << @RM::BlankLine.new
 
@@ -148,5 +173,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