rdoc 3.9.5 → 3.10.pre.1

data/test/test_rdoc_markup_to_label.rb

@@ -0,0 +1,50 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupToLabel < RDoc::TestCase
+
+  def setup
+    super
+
+    @to = RDoc::Markup::ToLabel.new
+  end
+
+  def test_convert_bold
+    assert_equal 'bold', @to.convert('<b>bold</b>')
+    assert_equal 'bold', @to.convert('*bold*')
+  end
+
+  def test_convert_crossref
+    assert_equal 'SomeClass', @to.convert('SomeClass')
+    assert_equal 'SomeClass', @to.convert('\\SomeClass')
+
+    assert_equal 'some_method', @to.convert('some_method')
+    assert_equal 'some_method', @to.convert('\\some_method')
+
+    assert_equal '%23some_method', @to.convert('#some_method')
+    assert_equal '%23some_method', @to.convert('\\#some_method')
+  end
+
+  def test_convert_em
+    assert_equal 'em', @to.convert('<em>em</em>')
+    assert_equal 'em', @to.convert('*em*')
+  end
+
+  def test_convert_em_dash # for HTML conversion
+    assert_equal '--', @to.convert('--')
+  end
+
+  def test_convert_escape
+    assert_equal 'a+%3E+b', @to.convert('a > b')
+  end
+
+  def test_convert_tidylink
+    assert_equal 'text', @to.convert('{text}[stuff]')
+    assert_equal 'text', @to.convert('text[stuff]')
+  end
+
+  def test_convert_tt
+    assert_equal 'tt', @to.convert('<tt>tt</tt>')
+  end
+
+end
+

data/test/test_rdoc_markup_to_rdoc.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
-require 'rdoc/markup/text_formatter_test_case'
-require 'rdoc/markup/to_rdoc'
-require 'minitest/autorun'
+require 'rdoc/test_case'
 
 class TestRDocMarkupToRDoc < RDoc::Markup::TextFormatterTestCase
 

data/test/test_rdoc_markup_to_table_of_contents.rb

@@ -0,0 +1,90 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupToTableOfContents < RDoc::Markup::FormatterTestCase
+
+  add_visitor_tests
+
+  def setup
+    super
+
+    @to = RDoc::Markup::ToTableOfContents.new
+  end
+
+  def end_accepting
+    assert_equal %w[hi], @to.res
+  end
+
+  def empty
+    assert_empty @to.res
+  end
+
+  def accept_heading
+    assert_equal [@RM::Heading.new(5, 'Hello')], @to.res
+  end
+
+  def accept_heading_1
+    assert_equal [@RM::Heading.new(1, 'Hello')], @to.res
+  end
+
+  def accept_heading_2
+    assert_equal [@RM::Heading.new(2, 'Hello')], @to.res
+  end
+
+  def accept_heading_3
+    assert_equal [@RM::Heading.new(3, 'Hello')], @to.res
+  end
+
+  def accept_heading_4
+    assert_equal [@RM::Heading.new(4, 'Hello')], @to.res
+  end
+
+  def accept_heading_b
+    assert_equal [@RM::Heading.new(1, '*Hello*')], @to.res
+  end
+
+  def accept_heading_suppressed_crossref
+    assert_equal [@RM::Heading.new(1, '\\Hello')], @to.res
+  end
+
+  alias accept_blank_line             empty
+  alias accept_document               empty
+  alias accept_list_end_bullet        empty
+  alias accept_list_end_label         empty
+  alias accept_list_end_lalpha        empty
+  alias accept_list_end_note          empty
+  alias accept_list_end_number        empty
+  alias accept_list_end_ualpha        empty
+  alias accept_list_item_end_bullet   empty
+  alias accept_list_item_end_label    empty
+  alias accept_list_item_end_lalpha   empty
+  alias accept_list_item_end_note     empty
+  alias accept_list_item_end_number   empty
+  alias accept_list_item_end_ualpha   empty
+  alias accept_list_item_start_bullet empty
+  alias accept_list_item_start_label  empty
+  alias accept_list_item_start_lalpha empty
+  alias accept_list_item_start_note   empty
+  alias accept_list_item_start_note_2 empty
+  alias accept_list_item_start_number empty
+  alias accept_list_item_start_ualpha empty
+  alias accept_list_start_bullet      empty
+  alias accept_list_start_label       empty
+  alias accept_list_start_lalpha      empty
+  alias accept_list_start_note        empty
+  alias accept_list_start_number      empty
+  alias accept_list_start_ualpha      empty
+  alias accept_paragraph              empty
+  alias accept_paragraph_b            empty
+  alias accept_paragraph_i            empty
+  alias accept_paragraph_plus         empty
+  alias accept_paragraph_star         empty
+  alias accept_paragraph_underscore   empty
+  alias accept_raw                    empty
+  alias accept_rule                   empty
+  alias accept_verbatim               empty
+  alias list_nested                   empty
+  alias list_verbatim                 empty
+  alias start_accepting               empty
+
+end
+

data/test/test_rdoc_markup_to_tt_only.rb

@@ -1,7 +1,4 @@
-require 'rubygems'
-require 'rdoc/markup/formatter_test_case'
-require 'rdoc/markup/to_tt_only'
-require 'minitest/autorun'
+require 'rdoc/test_case'
 
 class TestRDocMarkupToTtOnly < RDoc::Markup::FormatterTestCase
 

data/test/test_rdoc_markup_verbatim.rb

@@ -0,0 +1,16 @@
+require 'rdoc/test_case'
+
+class TestRDocMarkupVerbatim < RDoc::TestCase
+
+  def test_ruby_eh
+    verbatim = RDoc::Markup::Verbatim.new
+
+    refute verbatim.ruby?
+
+    verbatim.format = :ruby
+
+    assert verbatim.ruby?
+  end
+
+end
+

data/test/test_rdoc_method_attr.rb

@@ -111,12 +111,27 @@ class TestRDocMethodAttr < XrefTestCase
     assert_nil @m1_m.find_method_or_attribute 'm'
   end
 
+  def test_search_record
+    @c1_m.comment = 'This is a comment.'
+
+    expected = [
+      'm',
+      'C1#m',
+      'm',
+      'C1',
+      'C1.html#method-i-m',
+      '(foo)',
+      "<p>This is a comment.\n",
+    ]
+
+    assert_equal expected, @c1_m.search_record
+  end
+
   def test_to_s
     assert_equal 'RDoc::AnyMethod: C1#m',  @c1_m.to_s
     assert_equal 'RDoc::AnyMethod: C2#b',  @c2_b.to_s
     assert_equal 'RDoc::AnyMethod: C1::m', @c1__m.to_s
   end
 
-
 end
 

data/test/test_rdoc_options.rb

@@ -1,18 +1,17 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/options'
+require 'rdoc/test_case'
 
-require 'fileutils'
-require 'tmpdir'
-
-class TestRDocOptions < MiniTest::Unit::TestCase
+class TestRDocOptions < RDoc::TestCase
 
   def setup
+    super
+
     @options = RDoc::Options.new
     @generators = RDoc::RDoc::GENERATORS.dup
   end
 
   def teardown
+    super
+
     RDoc::RDoc::GENERATORS.replace @generators
   end
 
@@ -286,6 +285,17 @@ file 'unreadable' not readable
     assert_equal 'MAIN', @options.main_page
   end
 
+  def test_parse_markup
+    out, err = capture_io do
+      @options.parse %w[--markup tomdoc]
+    end
+
+    assert_empty out
+    assert_empty err
+
+    assert_equal 'tomdoc', @options.markup
+  end
+
   def test_parse_template
     out, err = capture_io do
       @options.parse %w[--template darkfish]

data/test/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
@@ -79,5 +81,72 @@ class TestRDocParser < MiniTest::Unit::TestCase
     assert_nil @RP.for(nil, @binary_dat, nil, nil, nil)
   end
 
+  def test_class_for_format
+    content = <<-CONTENT
+# coding: utf-8 format: rd
+    CONTENT
+
+    parser = @RP.for @top_level, __FILE__, content, @options, nil
+
+    assert_kind_of @RP::RD, parser
+  end
+
+  def test_class_use_format
+    content = <<-CONTENT
+# coding: utf-8 format: rd
+    CONTENT
+
+    parser = @RP.use_format content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_format_modeline
+    content = <<-CONTENT
+# -*- coding: utf-8 -*-
+# format: rd
+    CONTENT
+
+    parser = @RP.use_format content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_format_modeline_shebang
+    content = <<-CONTENT
+#!/bin/sh
+/* -*- coding: utf-8 -*-
+ * format: rd
+ */
+    CONTENT
+
+    parser = @RP.use_format content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_format_shebang
+    content = <<-CONTENT
+#!/usr/bin/env ruby
+# coding: utf-8 format: rd
+    CONTENT
+
+    parser = @RP.use_format content
+
+    assert_equal @RP::RD, parser
+  end
+
+  def test_class_use_format_none
+    parser = @RP.use_format ''
+
+    assert_nil parser
+  end
+
+  def test_initialize
+    @RP.new @top_level, @fn, '', @options, nil
+
+    assert_equal @RP, @top_level.parser
+  end
+
 end
 

data/test/test_rdoc_parser_c.rb

@@ -1,9 +1,4 @@
-require 'stringio'
-require 'tempfile'
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc/options'
-require 'rdoc/parser/c'
+require 'rdoc/test_case'
 
 =begin
   TODO: test call-seq parsing
@@ -51,9 +46,11 @@ class RDoc::Parser::C
   public :do_classes, :do_constants
 end
 
-class TestRDocParserC < MiniTest::Unit::TestCase
+class TestRDocParserC < RDoc::TestCase
 
   def setup
+    super
+
     @tempfile = Tempfile.new self.class.name
     filename = @tempfile.path
 
@@ -61,12 +58,11 @@ class TestRDocParserC < MiniTest::Unit::TestCase
     @fn = filename
     @options = RDoc::Options.new
     @stats = RDoc::Stats.new 0
-
-    RDoc::Parser::C.reset
-    RDoc::TopLevel.reset
   end
 
   def teardown
+    super
+
     @tempfile.close
   end
 
@@ -116,18 +112,18 @@ void Init_Blah(void) {
     accessor = attrs.shift
     assert_equal 'accessor',            accessor.name
     assert_equal 'RW',                  accessor.rw
-    assert_equal 'This is an accessor', accessor.comment
+    assert_equal 'This is an accessor', accessor.comment.text
     assert_equal @top_level,            accessor.file
 
     reader = attrs.shift
     assert_equal 'reader',           reader.name
     assert_equal 'R',                reader.rw
-    assert_equal 'This is a reader', reader.comment
+    assert_equal 'This is a reader', reader.comment.text
 
     writer = attrs.shift
     assert_equal 'writer',           writer.name
     assert_equal 'W',                writer.rw
-    assert_equal 'This is a writer', writer.comment
+    assert_equal 'This is a writer', writer.comment.text
   end
 
   def test_do_attr_rb_define_attr
@@ -150,7 +146,7 @@ void Init_Blah(void) {
     accessor = attrs.shift
     assert_equal 'accessor',            accessor.name
     assert_equal 'RW',                  accessor.rw
-    assert_equal 'This is an accessor', accessor.comment
+    assert_equal 'This is an accessor', accessor.comment.text
     assert_equal @top_level,            accessor.file
   end
 
@@ -211,7 +207,7 @@ void Init_Blah(void) {
     assert_equal 'bleh', methods.last.name
     assert               methods.last.singleton
     assert_equal 'blah', methods.last.is_alias_for.name
-    assert_equal 'This should show up as an alias', methods.last.comment
+    assert_equal 'This should show up as an alias', methods.last.comment.text
   end
 
   def test_do_classes_boot_class
@@ -223,7 +219,7 @@ VALUE cFoo = boot_defclass("Foo", rb_cObject);
     EOF
 
     klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo boot class", klass.comment
+    assert_equal "this is the Foo boot class", klass.comment.text
     assert_equal 'Object', klass.superclass
   end
 
@@ -236,7 +232,7 @@ VALUE cFoo = boot_defclass("Foo", 0);
     EOF
 
     klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo boot class", klass.comment
+    assert_equal "this is the Foo boot class", klass.comment.text
     assert_equal nil, klass.superclass
   end
 
@@ -264,7 +260,7 @@ VALUE cFoo = rb_define_class("Foo", rb_cObject);
     EOF
 
     klass = util_get_class content, 'cFoo'
-    assert_equal "this is the Foo class", klass.comment
+    assert_equal "this is the Foo class", klass.comment.text
   end
 
   def test_do_classes_class_under
@@ -277,7 +273,7 @@ VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_cObject);
 
     klass = util_get_class content, 'cFoo'
     assert_equal 'Kernel::Foo', klass.full_name
-    assert_equal "this is the Foo class under Kernel", klass.comment
+    assert_equal "this is the Foo class under Kernel", klass.comment.text
   end
 
   def test_do_classes_class_under_rb_path2class
@@ -292,7 +288,7 @@ VALUE cFoo = rb_define_class_under(rb_mKernel, "Foo", rb_path2class("A::B"));
 
     assert_equal 'Kernel::Foo', klass.full_name
     assert_equal 'A::B', klass.superclass
-    assert_equal 'this is Kernel::Foo < A::B', klass.comment
+    assert_equal 'this is Kernel::Foo < A::B', klass.comment.text
   end
 
   def test_do_classes_singleton
@@ -315,7 +311,7 @@ VALUE mFoo = rb_define_module("Foo");
     EOF
 
     klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module", klass.comment
+    assert_equal "this is the Foo module", klass.comment.text
   end
 
   def test_do_classes_module_under
@@ -327,7 +323,7 @@ VALUE mFoo = rb_define_module_under(rb_mKernel, "Foo");
     EOF
 
     klass = util_get_class content, 'mFoo'
-    assert_equal "this is the Foo module under Kernel", klass.comment
+    assert_equal "this is the Foo module under Kernel", klass.comment.text
   end
 
   def test_do_constants
@@ -393,7 +389,7 @@ void Init_foo(){
 
     assert_equal @top_level, constants.first.file
 
-    constants = constants.map { |c| [c.name, c.value, c.comment] }
+    constants = constants.map { |c| [c.name, c.value, c.comment.text] }
 
     assert_equal ['PERFECT', '300', 'The highest possible score in bowling   '],
                  constants.shift
@@ -455,7 +451,7 @@ void Init_curses(){
 
     assert_equal 'COLOR_BLACK', constants.first.name
     assert_equal 'UINT2NUM(COLOR_BLACK)', constants.first.value
-    assert_equal 'Value of the color black', constants.first.comment
+    assert_equal 'Value of the color black', constants.first.comment.text
   end
 
   def test_do_includes
@@ -472,7 +468,7 @@ Init_foo() {
 
     incl = klass.includes.first
     assert_equal 'Inc',      incl.name
-    assert_equal '',         incl.comment
+    assert_equal '',         incl.comment.text
     assert_equal @top_level, incl.file
   end
 
@@ -568,7 +564,7 @@ void Init_Blah(void) {
 
     comment = parser.find_alias_comment 'C', '[]', 'index'
 
-    assert_equal '', comment
+    assert_equal '', comment.text
 
     parser = util_parser <<-C
 /*
@@ -580,7 +576,7 @@ rb_define_alias(C, "[]", "index");
 
     comment = parser.find_alias_comment 'C', '[]', 'index'
 
-    assert_equal "/*\n * comment\n */\n\n", comment
+    assert_equal "/*\n * comment\n */\n\n", comment.text
   end
 
   def test_find_class_comment_include
@@ -600,7 +596,7 @@ Init_Foo(void) {
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "a comment for class Foo\n\ntest file", klass.comment
+    assert_equal "a comment for class Foo\n\ntest file\n", klass.comment.text
   end
 
   def test_find_class_comment_init
@@ -616,7 +612,7 @@ Init_Foo(void) {
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "a comment for class Foo", klass.comment
+    assert_equal "a comment for class Foo", klass.comment.text
   end
 
   def test_find_class_comment_define_class
@@ -629,7 +625,7 @@ VALUE foo = rb_define_class("Foo", rb_cObject);
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "a comment for class Foo", klass.comment
+    assert_equal "a comment for class Foo", klass.comment.text
   end
 
   def test_find_class_comment_define_class_Init_Foo
@@ -648,7 +644,7 @@ Init_Foo(void) {
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "a comment for class Foo on Init", klass.comment
+    assert_equal "a comment for class Foo on Init", klass.comment.text
   end
 
   def test_find_class_comment_define_class_Init_Foo_no_void
@@ -667,7 +663,7 @@ Init_Foo() {
 
     klass = util_get_class content, 'foo'
 
-    assert_equal "a comment for class Foo on Init", klass.comment
+    assert_equal "a comment for class Foo on Init", klass.comment.text
   end
 
   def test_find_class_comment_define_class_bogus_comment
@@ -687,7 +683,7 @@ Init_Foo(void) {
 
     klass = util_get_class content, 'foo'
 
-    assert_equal '', klass.comment
+    assert_equal '', klass.comment.text
   end
 
   def test_find_const_comment_rb_define
@@ -702,7 +698,7 @@ rb_define_const(cFoo, "CONST", value);
 
     comment = parser.find_const_comment 'const', 'CONST'
 
-    assert_equal "/*\n * A comment\n */\n", comment
+    assert_equal "/*\n * A comment\n */\n", comment.text
   end
 
   def test_find_const_comment_document_const
@@ -718,7 +714,7 @@ rb_define_const(cFoo, "CONST", value);
 
     comment = parser.find_const_comment nil, 'CONST'
 
-    assert_equal " *\n * A comment\n */", comment
+    assert_equal "/*\n *\n * A comment\n */", comment.text
   end
 
   def test_find_const_comment_document_const_full_name
@@ -734,7 +730,7 @@ rb_define_const(cFoo, "CONST", value);
 
     comment = parser.find_const_comment nil, 'CONST', 'Foo'
 
-    assert_equal " *\n * A comment\n */", comment
+    assert_equal "/*\n *\n * A comment\n */", comment.text
   end
 
   def test_find_body
@@ -759,7 +755,7 @@ Init_Foo(void) {
 
     assert_equal 'my_method', other_function.name
     assert_equal "a comment for other_function",
-                 other_function.comment
+                 other_function.comment.text
     assert_equal '()', other_function.params
 
     code = other_function.token_stream.first.text
@@ -832,7 +828,7 @@ Init_Foo(void) {
     other_function = klass.method_list.first
 
     assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for rb_other_function', other_function.comment
+    assert_equal 'a comment for rb_other_function', other_function.comment.text
     assert_equal '()', other_function.params
     assert_equal 118, other_function.offset
     assert_equal 8, other_function.line
@@ -866,7 +862,7 @@ Init_Foo(void) {
     other_function = klass.method_list.first
 
     assert_equal 'my_method', other_function.name
-    assert_equal 'a comment for other_function', other_function.comment
+    assert_equal 'a comment for other_function', other_function.comment.text
     assert_equal '()', other_function.params
     assert_equal 39, other_function.offset
     assert_equal 4, other_function.line
@@ -904,11 +900,11 @@ Init_Foo(void) {
 
     bar = methods.first
     assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for bar", bar.comment
+    assert_equal "a comment for bar", bar.comment.text
 
     baz = methods.last
     assert_equal 'Foo#baz', baz.full_name
-    assert_equal "a comment for bar", baz.comment
+    assert_equal "a comment for bar", baz.comment.text
   end
 
   def test_find_body_document_method_equals
@@ -938,7 +934,7 @@ Init_zlib() {
 
     bar = methods.first
     assert_equal 'Zlib::GzipWriter#mtime=', bar.full_name
-    assert_equal 'A comment', bar.comment
+    assert_equal 'A comment', bar.comment.text
   end
 
   def test_find_body_document_method_same
@@ -979,53 +975,19 @@ Init_Foo(void) {
 
     s_bar = methods.first
     assert_equal 'Foo::bar', s_bar.full_name
-    assert_equal "a comment for Foo::bar", s_bar.comment
+    assert_equal "a comment for Foo::bar", s_bar.comment.text
 
     bar = methods.last
     assert_equal 'Foo#bar', bar.full_name
-    assert_equal "a comment for Foo#bar", bar.comment
+    assert_equal "a comment for Foo#bar", bar.comment.text
   end
 
   def test_find_modifiers_call_seq
-    comment = <<-COMMENT
-/* call-seq:
- *   commercial() -> Date <br />
- *   commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
- *   commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
- *
- * If no arguments are given:
- * * ruby 1.8: returns a +Date+ for 1582-10-15 (the Day of Calendar Reform in
- *   Italy)
- * * ruby 1.9: returns a +Date+ for julian day 0
- *
- * Otherwise, returns a +Date+ for the commercial week year, commercial week,
- * and commercial week day given. Ignores the 4th argument.
- */
-
-    COMMENT
-
-    parser = util_parser ''
-    method_obj = RDoc::AnyMethod.new nil, 'blah'
-
-    parser.find_modifiers comment, method_obj
-
-    expected = <<-CALL_SEQ.chomp
-commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
- 
-    CALL_SEQ
+    comment = RDoc::Comment.new <<-COMMENT
+call-seq:
+  commercial() -> Date <br />
 
-    assert_equal expected, method_obj.call_seq
-  end
-
-  def test_find_modifiers_call_seq_no_blank
-    comment = <<-COMMENT
-/* call-seq:
- *   commercial() -> Date <br />
- *   commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
- *   commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
- */
+If no arguments are given:
 
     COMMENT
 
@@ -1036,16 +998,14 @@ commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
 
     expected = <<-CALL_SEQ.chomp
 commercial() -> Date <br />
-commercial(cwyear, cweek=41, cwday=5, sg=nil) -> Date [ruby 1.8] <br />
-commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
- 
+
     CALL_SEQ
 
     assert_equal expected, method_obj.call_seq
   end
 
   def test_find_modifiers_nodoc
-    comment = <<-COMMENT
+    comment = RDoc::Comment.new <<-COMMENT
 /* :nodoc:
  *
  * Blah
@@ -1062,7 +1022,7 @@ commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
   end
 
   def test_find_modifiers_yields
-    comment = <<-COMMENT
+    comment = RDoc::Comment.new <<-COMMENT
 /* :yields: a, b
  *
  * Blah
@@ -1077,15 +1037,7 @@ commercial(cwyear, cweek=1, cwday=1, sg=nil) -> Date [ruby 1.9]
 
     assert_equal 'a, b', method_obj.block_params
 
-    expected = <<-EXPECTED
-/*
- *
- * Blah
- */
-
-    EXPECTED
-
-    assert_equal expected, comment
+    assert_equal "\n\nBlah", comment.text
   end
 
   def test_handle_method_args_minus_1
@@ -1208,12 +1160,12 @@ void Init_Blah(void) {
   def test_look_for_directives_in
     parser = util_parser ''
 
-    comment = "# :markup: not_rdoc\n"
+    comment = RDoc::Comment.new "# :other: not_handled\n"
 
     parser.look_for_directives_in @top_level, comment
 
-    assert_equal "# :markup: not_rdoc\n", comment
-    assert_equal 'not_rdoc', @top_level.metadata['markup']
+    assert_equal "# :other: not_handled\n", comment.text
+    assert_equal 'not_handled', @top_level.metadata['other']
   end
 
   def test_define_method
@@ -1240,7 +1192,7 @@ Init_IO(void) {
     klass = util_get_class content, 'rb_cIO'
     read_method = klass.method_list.first
     assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment
+    assert_equal "Method Comment!   ", read_method.comment.text
     assert_equal "rb_io_s_read", read_method.c_function
     assert read_method.singleton
   end
@@ -1271,7 +1223,7 @@ Init_IO(void) {
     klass = util_get_class content, 'rb_cIO'
     read_method = klass.method_list.first
     assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment
+    assert_equal "Method Comment!   ", read_method.comment.text
     assert_equal "rb_io_s_read", read_method.c_function
     assert read_method.singleton
   end
@@ -1301,7 +1253,7 @@ Init_IO(void) {
     read_method = klass.method_list.first
     assert_equal 'IO#read', read_method.full_name
     assert_equal :private, read_method.visibility
-    assert_equal "Method Comment!   ", read_method.comment
+    assert_equal "Method Comment!   ", read_method.comment.text
   end
 
   def test_define_method_private_singleton
@@ -1329,7 +1281,7 @@ Init_IO(void) {
     klass = util_get_class content, 'rb_cIO'
     read_method = klass.method_list.first
     assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment
+    assert_equal "Method Comment!   ", read_method.comment.text
     assert_equal :private, read_method.visibility
     assert read_method.singleton
   end
@@ -1359,7 +1311,7 @@ Init_IO(void) {
     klass = util_get_class content, 'rb_cIO'
     read_method = klass.method_list.first
     assert_equal "read", read_method.name
-    assert_equal "Method Comment!   ", read_method.comment
+    assert_equal "Method Comment!   ", read_method.comment.text
     assert read_method.singleton
   end