Fix warnings and skip encoding tests for 1.8

Author: drbrain

History.txt

@@ -1,4 +1,10 @@
-=== 3.3 / ??
+=== 3.3.1
+
+* Bug fixes
+  * Added skips to Encoding tests running on 1.8.
+  * Fixed warnings
+
+=== 3.3 / 2010-01-03
 
 * Minor enhancements
   * The coverage report can now report undocumented method parameters

lib/rdoc/stats.rb

@@ -30,6 +30,7 @@ def initialize num_files, verbosity = 1
     @num_files = num_files
 
     @coverage_level = 0
+    @doc_items = nil
     @fully_documented = nil
     @num_params = 0
     @percent_doc = nil

test/test_rdoc_code_object.rb

@@ -31,6 +31,8 @@ def test_comment_equals
   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'
@@ -43,6 +45,8 @@ def test_comment_equals_encoding
   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 = ''

test/test_rdoc_parser_ruby.rb

@@ -643,20 +643,6 @@ class ConstFailMeta
     assert_equal 1, const_fail_meta.attributes.length
   end
 
-  def test_parse_class_nested_superclass
-    foo = RDoc::NormalModule.new 'Foo'
-    foo.parent = @top_level
-
-    util_parser "class Bar < Super\nend"
-
-    tk = @parser.get_tk
-
-    @parser.parse_class foo, RDoc::Parser::Ruby::NORMAL, tk, ''
-
-    bar = foo.classes.first
-    assert_equal 'Super', bar.superclass
-  end
-
   def test_parse_class_nested_superclass
     util_top_level
     foo = @top_level.add_module RDoc::NormalModule, 'Foo'

test/test_rdoc_ri_driver.rb

@@ -570,12 +570,12 @@ def test_method_type
   end
 
   def test_name_regexp
-    assert_equal /^RDoc::AnyMethod#new$/,
+    assert_equal %r%^RDoc::AnyMethod#new$%,
                  @driver.name_regexp('RDoc::AnyMethod#new')
-    assert_equal /^RDoc::AnyMethod::new$/,
+    assert_equal %r%^RDoc::AnyMethod::new$%,
                  @driver.name_regexp('RDoc::AnyMethod::new')
 
-    assert_equal /^RDoc::AnyMethod(#|::)new$/,
+    assert_equal %r%^RDoc::AnyMethod(#|::)new$%,
                  @driver.name_regexp('RDoc::AnyMethod.new')
   end
 

test/test_rdoc_text.rb

@@ -145,6 +145,8 @@ def test_strip_newlines
   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"