* 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, 106 insertions, 15 deletions

diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb
index c323efeac3..35a797063a 100644
--- a/test/rdoc/test_rdoc_parser.rb
+++ b/test/rdoc/test_rdoc_parser.rb
@@ -1,14 +1,16 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/parser'
-require 'rdoc/parser/ruby'
-require 'tmpdir'
+require 'rdoc/test_case'
 
-class TestRDocParser < MiniTest::Unit::TestCase
+class TestRDocParser < RDoc::TestCase
 
   def setup
+    super
+
     @RP = RDoc::Parser
     @binary_dat = File.expand_path '../binary.dat', __FILE__
+
+    @fn = 'file.rb'
+    @top_level = RDoc::TopLevel.new @fn
+    @options = RDoc::Options.new
   end
 
   def test_class_binary_eh_marshal
@@ -29,11 +31,8 @@ class TestRDocParser < MiniTest::Unit::TestCase
   end
 
   def test_class_binary_large_japanese_rdoc
-    extenc, Encoding.default_external = Encoding.default_external, Encoding::US_ASCII
-    file_name = File.expand_path '../test.ja.largedoc', __FILE__
+    file_name = File.expand_path '../test.ja.large.rdoc', __FILE__
     assert [email protected]?(file_name)
-  ensure
-    Encoding.default_external = extenc
   end
 
   def test_class_binary_japanese_rdoc
@@ -60,13 +59,18 @@ class TestRDocParser < MiniTest::Unit::TestCase
 
     readme_file_name = File.expand_path '../README', __FILE__
     assert_equal @RP::Simple, @RP.can_parse(readme_file_name)
+  end
 
-    jtest_largerdoc_file_name = File.expand_path '../test.ja.largedoc', __FILE__
-    assert_nil @RP.can_parse(jtest_largerdoc_file_name)
-
-    @RP.alias_extension("rdoc", "largedoc")
-    assert_equal @RP::Simple, @RP.can_parse(jtest_largerdoc_file_name)
+  def test_class_can_parse_forbidden
+    Tempfile.open 'forbidden' do |io|
+      begin
+        File.chmod 0000, io.path
 
+        assert_nil @RP.can_parse io.path
+      ensure
+        File.chmod 0400, io.path
+      end
+    end
   end
 
   ##
@@ -89,5 +93,92 @@ class TestRDocParser < MiniTest::Unit::TestCase
     assert_nil @RP.for(nil, @binary_dat, nil, nil, nil)
   end
 
+  def test_class_for_markup
+    content = <<-CONTENT
+# coding: utf-8 markup: rd
+    CONTENT
+
+    parser = @RP.for @top_level, __FILE__, content, @options, nil
+
+    assert_kind_of @RP::RD, parser
+  end
+
+  def test_class_use_markup
+    content = <<-CONTENT
+# coding: utf-8 markup: rd
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_markup_markdown
+    content = <<-CONTENT
+# coding: utf-8 markup: markdown
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::Ruby, parser
+  end
+
+  def test_class_use_markup_modeline
+    content = <<-CONTENT
+# -*- coding: utf-8 -*-
+# markup: rd
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_markup_modeline_shebang
+    content = <<-CONTENT
+#!/bin/sh
+/* -*- coding: utf-8 -*-
+ * markup: rd
+ */
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_markup_shebang
+    content = <<-CONTENT
+#!/usr/bin/env ruby
+# coding: utf-8 markup: rd
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_markup_tomdoc
+    content = <<-CONTENT
+# coding: utf-8 markup: tomdoc
+    CONTENT
+
+    parser = @RP.use_markup content
+
+    assert_equal @RP::Ruby, parser
+  end
+
+  def test_class_use_markup_none
+    parser = @RP.use_markup ''
+
+    assert_nil parser
+  end
+
+  def test_initialize
+    @RP.new @top_level, @fn, '', @options, nil
+
+    assert_equal @RP, @top_level.parser
+  end
+
 end