From ba6ae341bab83dfc7a624c5bf20d8d162dacaff9 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Sep 2016 22:23:38 +0000
Subject: * lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2   Fixed ri parse
 defect with left-hand matched classes.  
 https://github.com/rdoc/rdoc/pull/420

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/rdoc/test_rdoc_code_object.rb          |  5 -----
 test/rdoc/test_rdoc_comment.rb              |  9 ---------
 test/rdoc/test_rdoc_encoding.rb             | 31 -----------------------------
 test/rdoc/test_rdoc_generator_darkfish.rb   |  7 +------
 test/rdoc/test_rdoc_generator_json_index.rb |  3 ---
 test/rdoc/test_rdoc_generator_ri.rb         |  9 +++------
 test/rdoc/test_rdoc_markdown_test.rb        |  2 --
 test/rdoc/test_rdoc_markup_parser.rb        | 17 ++--------------
 test/rdoc/test_rdoc_markup_pre_process.rb   |  3 ---
 test/rdoc/test_rdoc_options.rb              | 10 +---------
 test/rdoc/test_rdoc_parser.rb               |  5 -----
 test/rdoc/test_rdoc_parser_ruby.rb          |  7 +------
 test/rdoc/test_rdoc_rdoc.rb                 |  2 --
 test/rdoc/test_rdoc_ri_driver.rb            | 15 +++++++++++++-
 test/rdoc/test_rdoc_rubygems_hook.rb        |  2 --
 test/rdoc/test_rdoc_store.rb                |  3 ---
 test/rdoc/test_rdoc_text.rb                 | 17 ----------------
 17 files changed, 22 insertions(+), 125 deletions(-)

(limited to 'test/rdoc')

diff --git a/test/rdoc/test_rdoc_code_object.rb b/test/rdoc/test_rdoc_code_object.rb
index 74b88557e0..e0d89e4e67 100644
--- a/test/rdoc/test_rdoc_code_object.rb
+++ b/test/rdoc/test_rdoc_code_object.rb
@@ -50,8 +50,6 @@ class TestRDocCodeObject < XrefTestCase
   end
 
   def test_comment_equals_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
 
     input = 'text'
@@ -64,8 +62,6 @@ class TestRDocCodeObject < XrefTestCase
   end
 
   def test_comment_equals_encoding_blank
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     refute_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
 
     input = ''
@@ -448,4 +444,3 @@ class TestRDocCodeObject < XrefTestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_comment.rb b/test/rdoc/test_rdoc_comment.rb
index 178c579ea7..3b0927212f 100644
--- a/test/rdoc/test_rdoc_comment.rb
+++ b/test/rdoc/test_rdoc_comment.rb
@@ -207,8 +207,6 @@ lines, one line per element. Lines are assumed to be separated by _sep_.
   end
 
   def test_force_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @comment.force_encoding Encoding::UTF_8
 
     assert_equal Encoding::UTF_8, @comment.text.encoding
@@ -343,8 +341,6 @@ lines, one line per element. Lines are assumed to be separated by _sep_.
   end
 
   def test_remove_private_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     comment = RDoc::Comment.new <<-EOS, @top_level
 # This is text
 #--
@@ -467,8 +463,6 @@ lines, one line per element. Lines are assumed to be separated by _sep_.
   end
 
   def test_remove_private_toggle_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     comment = RDoc::Comment.new <<-EOS, @top_level
 # This is text
 #--
@@ -485,8 +479,6 @@ lines, one line per element. Lines are assumed to be separated by _sep_.
   end
 
   def test_remove_private_toggle_encoding_ruby_bug?
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     comment = RDoc::Comment.new <<-EOS, @top_level
 #--
 # this is private
@@ -502,4 +494,3 @@ lines, one line per element. Lines are assumed to be separated by _sep_.
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_encoding.rb b/test/rdoc/test_rdoc_encoding.rb
index 74d2a2668a..915f3ce5ec 100644
--- a/test/rdoc/test_rdoc_encoding.rb
+++ b/test/rdoc/test_rdoc_encoding.rb
@@ -25,8 +25,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     expected = "# coding: utf-8\nhi everybody"
 
     @tempfile.write expected
@@ -38,8 +36,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_convert
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     content = ""
     content.encode! 'ISO-8859-1'
     content << "# coding: ISO-8859-1\nhi \xE9verybody"
@@ -53,8 +49,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_fail
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @tempfile.write "# coding: utf-8\n\317\200" # pi
     @tempfile.flush
 
@@ -70,8 +64,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_fancy
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     expected = "# -*- coding: utf-8; fill-column: 74 -*-\nhi everybody"
     expected.encode! Encoding::UTF_8
 
@@ -84,8 +76,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_force_transcode
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @tempfile.write "# coding: utf-8\n\317\200" # pi
     @tempfile.flush
 
@@ -96,8 +86,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_guess
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     path = File.expand_path '../test.ja.txt', __FILE__
     content = RDoc::Encoding.read_file path, Encoding::UTF_8
 
@@ -105,8 +93,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_invalid
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @tempfile.write "# coding: ascii\nM\xE4r"
     @tempfile.flush
 
@@ -121,8 +107,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_with_signature
-    skip "Encoding not implemented" unless defined? ::Encoding
-
     @tempfile.write "\xEF\xBB\xBFhi everybody"
     @tempfile.flush
 
@@ -133,8 +117,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_read_file_encoding_iso_2022_jp
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     input = "# coding: ISO-2022-JP\n:\e$B%3%^%s%I\e(B:"
 
     @tempfile.write input
@@ -155,8 +137,6 @@ class TestRDocEncoding < RDoc::TestCase
 
     # sanity check for 1.8
 
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     assert_equal Encoding::UTF_8, s.encoding
 
     s = "#!/bin/ruby\n# coding: UTF-8\n"
@@ -192,8 +172,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_class_set_encoding_bad
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     s = ""
     expected = s.encoding
     RDoc::Encoding.set_encoding s
@@ -218,8 +196,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_skip_frozen_string_literal
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     expected = "# frozen_string_literal: false\nhi everybody"
 
     @tempfile.write expected
@@ -231,8 +207,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_skip_frozen_string_literal_after_coding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     expected = "# coding: utf-8\n# frozen-string-literal: false\nhi everybody"
 
     @tempfile.write expected
@@ -244,8 +218,6 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_skip_frozen_string_literal_before_coding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     expected = "# frozen_string_literal: false\n# coding: utf-8\nhi everybody"
 
     @tempfile.write expected
@@ -257,11 +229,8 @@ class TestRDocEncoding < RDoc::TestCase
   end
 
   def test_sanity
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     assert_equal Encoding::US_ASCII, ''.encoding,
                  'If this file is not ASCII tests may incorrectly pass'
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_generator_darkfish.rb b/test/rdoc/test_rdoc_generator_darkfish.rb
index 894acbd4f2..6a3e7038e1 100644
--- a/test/rdoc/test_rdoc_generator_darkfish.rb
+++ b/test/rdoc/test_rdoc_generator_darkfish.rb
@@ -83,11 +83,7 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase
     assert_hard_link 'fonts/SourceCodePro-Bold.ttf'
     assert_hard_link 'fonts/SourceCodePro-Regular.ttf'
 
-    encoding = if Object.const_defined? :Encoding then
-                 Regexp.escape Encoding::UTF_8.name
-               else
-                 Regexp.escape 'UTF-8'
-               end
+    encoding = Regexp.escape Encoding::UTF_8.name
 
     assert_match %r%<meta charset="#{encoding}">%, File.read('index.html')
     assert_match %r%<meta charset="#{encoding}">%, File.read('Object.html')
@@ -227,4 +223,3 @@ class TestRDocGeneratorDarkfish < RDoc::TestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_generator_json_index.rb b/test/rdoc/test_rdoc_generator_json_index.rb
index 864d1134e4..52c35a564d 100644
--- a/test/rdoc/test_rdoc_generator_json_index.rb
+++ b/test/rdoc/test_rdoc_generator_json_index.rb
@@ -198,8 +198,6 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
   end
 
   def test_generate_utf_8
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     text = "5\xB0"
     text.force_encoding Encoding::ISO_8859_1
     @klass.add_comment comment(text), @top_level
@@ -322,4 +320,3 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_generator_ri.rb b/test/rdoc/test_rdoc_generator_ri.rb
index 1e18e13b10..d9f7b7ebc6 100644
--- a/test/rdoc/test_rdoc_generator_ri.rb
+++ b/test/rdoc/test_rdoc_generator_ri.rb
@@ -7,10 +7,8 @@ class TestRDocGeneratorRI < RDoc::TestCase
     super
 
     @options = RDoc::Options.new
-    if Object.const_defined? :Encoding then
-      @options.encoding = Encoding::UTF_8
-      @store.encoding = Encoding::UTF_8
-    end
+    @options.encoding = Encoding::UTF_8
+    @store.encoding = Encoding::UTF_8
 
     @tmpdir = File.join Dir.tmpdir, "test_rdoc_generator_ri_#{$$}"
     FileUtils.mkdir_p @tmpdir
@@ -57,7 +55,7 @@ class TestRDocGeneratorRI < RDoc::TestCase
     store = RDoc::RI::Store.new @tmpdir
     store.load_cache
 
-    encoding = Object.const_defined?(:Encoding) ? Encoding::UTF_8 : nil
+    encoding = Encoding::UTF_8
 
     assert_equal encoding, store.encoding
   end
@@ -76,4 +74,3 @@ class TestRDocGeneratorRI < RDoc::TestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_markdown_test.rb b/test/rdoc/test_rdoc_markdown_test.rb
index 0d880e0a7c..b80838131c 100644
--- a/test/rdoc/test_rdoc_markdown_test.rb
+++ b/test/rdoc/test_rdoc_markdown_test.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-require 'rubygems'
 require 'minitest/autorun'
 require 'pp'
 
@@ -1882,4 +1881,3 @@ foo
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_markup_parser.rb b/test/rdoc/test_rdoc_markup_parser.rb
index e9986553c0..849d19f8c7 100644
--- a/test/rdoc/test_rdoc_markup_parser.rb
+++ b/test/rdoc/test_rdoc_markup_parser.rb
@@ -8,8 +8,6 @@ class TestRDocMarkupParser < RDoc::TestCase
   def setup
     super
 
-    @have_byteslice = ''.respond_to? :byteslice
-
     @RMP = @RM::Parser
   end
 
@@ -30,11 +28,7 @@ class TestRDocMarkupParser < RDoc::TestCase
 
     s.scan(/\S+/)
 
-    if @have_byteslice or @have_encoding then
-      assert_equal 3, parser.char_pos(s.pos)
-    else
-      assert_equal 4, parser.char_pos(s.pos)
-    end
+    assert_equal 3, parser.char_pos(s.pos)
   end
 
   def test_get
@@ -1360,8 +1354,6 @@ cat::
   end
 
   def test_tokenize_note_utf_8
-    skip 'Encoding not implemented' unless @have_encoding
-
     str = <<-STR
 cät:: l1a
       l1b
@@ -1626,11 +1618,7 @@ Example heading:
 
     s.scan(/\S+/)
 
-    if @have_encoding or @have_byteslice then
-      assert_equal [3, 0], parser.token_pos(s.pos)
-    else
-      assert_equal [4, 0], parser.token_pos(s.pos)
-    end
+    assert_equal [3, 0], parser.token_pos(s.pos)
   end
 
   # HACK move to Verbatim test case
@@ -1678,4 +1666,3 @@ some more text over here
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_markup_pre_process.rb b/test/rdoc/test_rdoc_markup_pre_process.rb
index 8bc474a8fc..ceb411c745 100644
--- a/test/rdoc/test_rdoc_markup_pre_process.rb
+++ b/test/rdoc/test_rdoc_markup_pre_process.rb
@@ -55,8 +55,6 @@ contents of a string.
   end
 
   def test_include_file_encoding_incompatible
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @tempfile.write <<-INCLUDE
 # -*- mode: rdoc; coding: utf-8; fill-column: 74; -*-
 
@@ -471,4 +469,3 @@ contents of a string.
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_options.rb b/test/rdoc/test_rdoc_options.rb
index 5d79432f94..eef37b44b4 100644
--- a/test/rdoc/test_rdoc_options.rb
+++ b/test/rdoc/test_rdoc_options.rb
@@ -60,7 +60,7 @@ class TestRDocOptions < RDoc::TestCase
 
     @options.encode_with coder
 
-    encoding = Object.const_defined?(:Encoding) ? 'UTF-8' : nil
+    encoding = 'UTF-8'
 
     expected = {
       'charset'              => 'UTF-8',
@@ -122,8 +122,6 @@ class TestRDocOptions < RDoc::TestCase
   end
 
   def test_encoding_default
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     assert_equal Encoding::UTF_8, @options.encoding
   end
 
@@ -142,7 +140,6 @@ class TestRDocOptions < RDoc::TestCase
   end
 
   def test_init_with_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
     RDoc.load_yaml
 
     @options.encoding = Encoding::IBM437
@@ -273,8 +270,6 @@ rdoc_include:
   end
 
   def test_parse_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @options.parse %w[--encoding Big5]
 
     assert_equal Encoding::Big5, @options.encoding
@@ -282,8 +277,6 @@ rdoc_include:
   end
 
   def test_parse_encoding_invalid
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     out, err = capture_io do
       @options.parse %w[--encoding invalid]
     end
@@ -764,4 +757,3 @@ rdoc_include:
     assert_equal :private, @options.visibility
   end
 end
-
diff --git a/test/rdoc/test_rdoc_parser.rb b/test/rdoc/test_rdoc_parser.rb
index ee2865ce02..732beb6629 100644
--- a/test/rdoc/test_rdoc_parser.rb
+++ b/test/rdoc/test_rdoc_parser.rb
@@ -47,8 +47,6 @@ class TestRDocParser < RDoc::TestCase
   end
 
   def test_class_binary_large_japanese_rdoc
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     capture_io do
       begin
         extenc, Encoding.default_external =
@@ -62,8 +60,6 @@ class TestRDocParser < RDoc::TestCase
   end
 
   def test_class_binary_japanese_rdoc
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     file_name = File.expand_path '../test.ja.rdoc', __FILE__
     refute @RP.binary?(file_name)
   end
@@ -325,4 +321,3 @@ class TestRDocParser < RDoc::TestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_parser_ruby.rb b/test/rdoc/test_rdoc_parser_ruby.rb
index 2befa87542..44b38c28aa 100644
--- a/test/rdoc/test_rdoc_parser_ruby.rb
+++ b/test/rdoc/test_rdoc_parser_ruby.rb
@@ -48,8 +48,6 @@ class C; end
   end
 
   def test_collect_first_comment_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     @options.encoding = Encoding::CP852
 
     p = util_parser <<-CONTENT
@@ -1928,8 +1926,7 @@ end
 
     method = "def ω() end"
 
-    assert_equal Encoding::UTF_8, method.encoding if
-      Object.const_defined? :Encoding
+    assert_equal Encoding::UTF_8, method.encoding
 
     util_parser method
 
@@ -2023,7 +2020,6 @@ end
   end
 
   def test_parse_statements_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
     @options.encoding = Encoding::CP852
 
     content = <<-EOF
@@ -3320,4 +3316,3 @@ end
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_rdoc.rb b/test/rdoc/test_rdoc_rdoc.rb
index b87f44b652..55096d394e 100644
--- a/test/rdoc/test_rdoc_rdoc.rb
+++ b/test/rdoc/test_rdoc_rdoc.rb
@@ -249,7 +249,6 @@ class TestRDocRDoc < RDoc::TestCase
   end
 
   def test_parse_file_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
     @rdoc.options.encoding = Encoding::ISO_8859_1
     @rdoc.store = RDoc::Store.new
 
@@ -454,4 +453,3 @@ class TestRDocRDoc < RDoc::TestCase
     end
   end
 end
-
diff --git a/test/rdoc/test_rdoc_ri_driver.rb b/test/rdoc/test_rdoc_ri_driver.rb
index ba334d3708..144e74f825 100644
--- a/test/rdoc/test_rdoc_ri_driver.rb
+++ b/test/rdoc/test_rdoc_ri_driver.rb
@@ -852,6 +852,20 @@ Foo::Bar#bother
     assert_equal 'Foo::Bar',  @driver.expand_class('F::B')
   end
 
+  def test_expand_class_3
+    @store1 = RDoc::RI::Store.new @home_ri, :home
+
+    @top_level = @store1.add_file 'file.rb'
+
+    @cFoo = @top_level.add_class RDoc::NormalClass, 'Foo'
+    @mFox = @top_level.add_module RDoc::NormalModule, 'FooBar'
+    @store1.save
+
+    @driver.stores = [@store1]
+
+    assert_equal 'Foo',  @driver.expand_class('Foo')
+  end
+
   def test_expand_name
     util_store
 
@@ -1452,4 +1466,3 @@ Foo::Bar#bother
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_rubygems_hook.rb b/test/rdoc/test_rdoc_rubygems_hook.rb
index 9ab481cbd4..143d45ec66 100644
--- a/test/rdoc/test_rdoc_rubygems_hook.rb
+++ b/test/rdoc/test_rdoc_rubygems_hook.rb
@@ -1,5 +1,4 @@
 # frozen_string_literal: false
-require 'rubygems'
 require 'rubygems/test_case'
 require 'rdoc/rubygems_hook'
 
@@ -249,4 +248,3 @@ class TestRDocRubygemsHook < Gem::TestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_store.rb b/test/rdoc/test_rdoc_store.rb
index c1717549c6..2c988aaea4 100644
--- a/test/rdoc/test_rdoc_store.rb
+++ b/test/rdoc/test_rdoc_store.rb
@@ -429,8 +429,6 @@ class TestRDocStore < XrefTestCase
   end
 
   def test_load_cache_encoding_differs
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     cache = {
       :c_class_variables           => {},
       :c_singleton_class_variables => {},
@@ -991,4 +989,3 @@ class TestRDocStore < XrefTestCase
   end
 
 end
-
diff --git a/test/rdoc/test_rdoc_text.rb b/test/rdoc/test_rdoc_text.rb
index 3945b6e718..2eb5ad69c7 100644
--- a/test/rdoc/test_rdoc_text.rb
+++ b/test/rdoc/test_rdoc_text.rb
@@ -16,8 +16,6 @@ class TestRDocText < RDoc::TestCase
   end
 
   def test_self_encode_fallback
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     assert_equal '…',
                  RDoc::Text::encode_fallback('…', Encoding::UTF_8,    '...')
     assert_equal '...',
@@ -63,8 +61,6 @@ class TestRDocText < RDoc::TestCase
   end
 
   def test_expand_tabs_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     inn = "hello\ns\tdave"
     inn.force_encoding Encoding::BINARY
 
@@ -93,8 +89,6 @@ The comments associated with
   end
 
   def test_flush_left_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     text = <<-TEXT
 
   we don't worry too much.
@@ -303,8 +297,6 @@ paragraph will be cut off …
   end
 
   def test_strip_hashes_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     text = <<-TEXT
 ##
 # we don't worry too much.
@@ -338,8 +330,6 @@ paragraph will be cut off …
   end
 
   def test_strip_newlines_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     assert_equal Encoding::UTF_8, ''.encoding, 'Encoding sanity check'
 
     text = " \n"
@@ -389,8 +379,6 @@ paragraph will be cut off …
   end
 
   def test_strip_stars_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     text = <<-TEXT
 /*
  * * we don't worry too much.
@@ -415,8 +403,6 @@ paragraph will be cut off …
   end
 
   def test_strip_stars_encoding2
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     text = <<-TEXT
 /*
  * * we don't worry too much.
@@ -511,8 +497,6 @@ The comments associated with
   end
 
   def test_to_html_encoding
-    skip "Encoding not implemented" unless Object.const_defined? :Encoding
-
     s = '...(c)'.encode Encoding::Shift_JIS
 
     html = to_html s
@@ -555,4 +539,3 @@ The comments associated with
   end
 
 end
-
-- 
cgit v1.2.3