test/test_lineinput.rb in review-2.0.0.beta1 vs test/test_lineinput.rb in review-2.0.0

- old
+ new

@@ -52,14 +52,13 @@ assert_equal line, li.gets li.ungets('xyz') assert_equal 0, li.lineno li.ungets('xyz') - assert_equal -1, li.lineno # XXX: OK? + assert_equal(-1, li.lineno) # XXX: OK? end -=begin def test_peek li = LineInput.new(StringIO.new) assert_equal nil, li.peek li = LineInput.new(StringIO.new('abc')) @@ -72,29 +71,10 @@ li = LineInput.new(StringIO.new('abc')) assert li.next? end - def test_skip_blank_lines - if "".respond_to?(:encode) - euc_jp_spc = " ".encode("EUC-JP") - else - euc_jp_spc = "\xa1\xa1" # EUC-JP 全角空白 - end - [ - ["", 0, nil], - ["\n \n \nabc", 3, 'abc'], - ["\t", 1, nil], - [euc_jp_spc, 0, euc_jp_spc], - ].each do |text, n, rest| - li = LineInput.new(StringIO.new(text)) - assert_equal n, li.skip_blank_lines - assert_equal rest, li.gets - end - end - - def test_gets_if io = StringIO.new li = LineInput.new(io) assert_equal nil, li.gets_if(//) @@ -117,11 +97,11 @@ assert_equal nil, li.gets_unless(//) assert_equal "abc\n", li.gets_unless(/^X/) assert_equal nil, li.gets_unless(/^d/) end -=end + def test_each content = "abc\ndef\nghi" io = StringIO.new(content) li = LineInput.new(io) @@ -136,30 +116,30 @@ li.while_match(/^[ad]/) {} assert_equal 2, li.lineno assert_equal "ghi", li.gets end -=begin + def test_getlines_while io = StringIO.new("abc\ndef\nghi") li = LineInput.new(io) buf = li.getlines_while(/^[ad]/) assert_equal ["abc\n", "def\n"], buf assert_equal 2, li.lineno assert_equal "ghi", li.gets end -=end + def test_until_match io = StringIO.new("abc\ndef\nghi") li = LineInput.new(io) li.until_match(/^[^a]/) {} assert_equal 1, li.lineno assert_equal "def\n", li.gets end -=begin + def test_getlines_until io = StringIO.new("abc\ndef\nghi") li = LineInput.new(io) buf = li.getlines_until(/^[^a]/) @@ -194,8 +174,7 @@ data = li.getblock(%r<\A//\}>) assert_equal ["abc\n", "def\n"], data assert_equal 3, li.lineno end -=end end