From 1c279a7d2753949c725754e1302f791b76358114 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Nov 2012 04:28:14 +0000
Subject: * 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
---
 test/rdoc/test_attribute_manager.rb | 66 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'test/rdoc/test_attribute_manager.rb')

diff --git a/test/rdoc/test_attribute_manager.rb b/test/rdoc/test_attribute_manager.rb
index 25e8ca5e04..8832a5d515 100644
--- a/test/rdoc/test_attribute_manager.rb
+++ b/test/rdoc/test_attribute_manager.rb
@@ -1,27 +1,26 @@
-require 'rubygems'
-require 'minitest/autorun'
-require 'rdoc'
-require 'rdoc/markup'
-require 'rdoc/markup/formatter'
-require 'rdoc/markup/attribute_manager'
+require 'rdoc/test_case'
 
-class TestAttributeManager < MiniTest::Unit::TestCase # HACK fix test name
+class TestAttributeManager < RDoc::TestCase # HACK fix test name
 
   def setup
+    super
+
+    @options = RDoc::Options.new
+
     @am = RDoc::Markup::AttributeManager.new
     @klass = RDoc::Markup::AttributeManager
-    @formatter = RDoc::Markup::Formatter.new
+    @formatter = RDoc::Markup::Formatter.new @options
     @formatter.add_tag :BOLD, '<B>', '</B>'
     @formatter.add_tag :EM, '<EM>', '</EM>'
-    @formatter.add_tag :TT, '<TT>', '</TT>'
+    @formatter.add_tag :TT, '<CODE>', '</CODE>'
   end
 
   def test_convert_attrs_ignores_code
-    assert_equal 'foo <TT>__send__</TT> bar', output('foo <code>__send__</code> bar')
+    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <code>__send__</code> bar')
   end
 
   def test_convert_attrs_ignores_tt
-    assert_equal 'foo <TT>__send__</TT> bar', output('foo <tt>__send__</tt> bar')
+    assert_equal 'foo <CODE>__send__</CODE> bar', output('foo <tt>__send__</tt> bar')
   end
 
   def test_convert_attrs_preserves_double
@@ -30,7 +29,7 @@ class TestAttributeManager < MiniTest::Unit::TestCase # HACK fix test name
   end
 
   def test_convert_attrs_does_not_ignore_after_tt
-    assert_equal 'the <TT>IF:</TT><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
+    assert_equal 'the <CODE>IF:</CODE><EM>key</EM> directive', output('the <tt>IF:</tt>_key_ directive')
   end
 
   def test_initial_word_pairs
@@ -73,38 +72,39 @@ class TestAttributeManager < MiniTest::Unit::TestCase # HACK fix test name
   end
 
   def test_add_special
-    @am.add_special("WikiWord", :WIKIWORD)
+    @am.add_special "WikiWord", :WIKIWORD
     specials = @am.special
-    assert_equal(1,specials.size)
-    assert(specials.has_key?("WikiWord"))
+
+    assert_equal 1, specials.size
+    assert specials.assoc "WikiWord"
   end
 
   def test_escapes
-    assert_equal '<TT>text</TT>',   output('<tt>text</tt>')
-    assert_equal '<tt>text</tt>',   output('\\<tt>text</tt>')
-    assert_equal '<tt>',            output('\\<tt>')
-    assert_equal '<TT><tt></TT>',   output('<tt>\\<tt></tt>')
-    assert_equal '<TT>\\<tt></TT>', output('<tt>\\\\<tt></tt>')
-    assert_equal '<B>text</B>',     output('*text*')
-    assert_equal '*text*',          output('\\*text*')
-    assert_equal '\\',              output('\\')
-    assert_equal '\\text',          output('\\text')
-    assert_equal '\\\\text',        output('\\\\text')
-    assert_equal 'text \\ text',    output('text \\ text')
-
-    assert_equal 'and <TT>\\s</TT> matches space',
+    assert_equal '<CODE>text</CODE>',   output('<tt>text</tt>')
+    assert_equal '<tt>text</tt>',       output('\\<tt>text</tt>')
+    assert_equal '<tt>',                output('\\<tt>')
+    assert_equal '<CODE><tt></CODE>',   output('<tt>\\<tt></tt>')
+    assert_equal '<CODE>\\<tt></CODE>', output('<tt>\\\\<tt></tt>')
+    assert_equal '<B>text</B>',         output('*text*')
+    assert_equal '*text*',              output('\\*text*')
+    assert_equal '\\',                  output('\\')
+    assert_equal '\\text',              output('\\text')
+    assert_equal '\\\\text',            output('\\\\text')
+    assert_equal 'text \\ text',        output('text \\ text')
+
+    assert_equal 'and <CODE>\\s</CODE> matches space',
                  output('and <tt>\\s</tt> matches space')
-    assert_equal 'use <TT><tt>text</TT></tt> for code',
+    assert_equal 'use <CODE><tt>text</CODE></tt> for code',
                  output('use <tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <TT><tt>text</tt></TT> for code',
+    assert_equal 'use <CODE><tt>text</tt></CODE> for code',
                  output('use <tt>\\<tt>text\\</tt></tt> for code')
     assert_equal 'use <tt><tt>text</tt></tt> for code',
                  output('use \\<tt>\\<tt>text</tt></tt> for code')
-    assert_equal 'use <tt><TT>text</TT></tt> for code',
+    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
                  output('use \\<tt><tt>text</tt></tt> for code')
-    assert_equal 'use <TT>+text+</TT> for code',
+    assert_equal 'use <CODE>+text+</CODE> for code',
                  output('use <tt>\\+text+</tt> for code')
-    assert_equal 'use <tt><TT>text</TT></tt> for code',
+    assert_equal 'use <tt><CODE>text</CODE></tt> for code',
                  output('use \\<tt>+text+</tt> for code')
     assert_equal 'illegal <tag>not</tag> changed',
                  output('illegal <tag>not</tag> changed')
-- 
cgit v1.2.3