test/test_hanyu_coverage.rb in ting-0.2.1 vs test/test_hanyu_coverage.rb in ting-0.3.0

@@ -1,10 +1,12 @@
 require 'test/unit'
 require 'ting'
 require 'yaml'
 
-$KCODE='u'
+if RUBY_VERSION =~ /^1.8/
+  $KCODE='u'
+end
 
 module HanyuCoverage 
   grid=YAML.load(IO.read(File.dirname(__FILE__)+'/../lib/ting/data/valid_pinyin.yaml'))
   grid.each do |fname, row|
     row.each do |iname, hanyu|
@@ -20,10 +22,10 @@
           def test_parse_#{hanyu}
             assert_equal('#{hanyu}', @writer.unparse(Syllable.new(Initial::#{iname}, Final::#{fname}, Tones::NEUTRAL_TONE)), 'Wrong hanyu for Initial::#{iname}+Final::#{fname}, expected `#{hanyu}` ')
           end
 
           def test_unparse_#{hanyu}
-            ts=*@reader.parse('#{hanyu}')
+            ts=@reader.parse('#{hanyu}').first
             assert_not_nil(ts, 'Reader<:hanyu, :no_tone>#parse("#{hanyu}") returned nil')
             assert_equal(Initial::#{iname}, ts.initial, 'Wrong initial for `#{hanyu}`, expected Initial::#{iname}')
             assert_equal(Final::#{fname}, ts.final, 'Wrong final for `#{hanyu}`, expected Final::#{fname}')
           end
         end