diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-17 19:44:31 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-01-17 19:44:31 +0000 |
commit | 0b38e9bc9d030539d1a2b70f7075a92b4c5b2213 (patch) | |
tree | fe64497512c27850f2489b400ccd51c0a121be93 /test | |
parent | eacee9d95f86b035263fe8ba570c19e133c29aae (diff) | |
download | ruby-0b38e9bc9d030539d1a2b70f7075a92b4c5b2213.tar.gz |
* ext/psych/lib/psych/parser.rb (Mark): Adding a class to wrap
marker information
* ext/psych/parser.c (mark): Add a method to return the mark object
for the parser
* test/psych/test_parser.rb: tests for the Mark class.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/psych/test_parser.rb | 60 |
1 files changed, 57 insertions, 3 deletions
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb index 0b1e92e62e..cd22914d3b 100644 --- a/test/psych/test_parser.rb +++ b/test/psych/test_parser.rb @@ -5,9 +5,12 @@ require_relative 'helper' module Psych class TestParser < TestCase class EventCatcher < Handler - attr_reader :calls + attr_accessor :parser + attr_reader :calls, :marks def initialize - @calls = [] + @parser = nil + @calls = [] + @marks = [] end (Handler.instance_methods(true) - @@ -15,6 +18,7 @@ module Psych class_eval %{ def #{m} *args super + @marks << @parser.mark if @parser @calls << [:#{m}, args] end } @@ -23,7 +27,57 @@ module Psych def setup super - @parser = Psych::Parser.new EventCatcher.new + @handler = EventCatcher.new + @parser = Psych::Parser.new @handler + @handler.parser = @parser + end + + def test_line_numbers + assert_equal 0, @parser.mark.line + @parser.parse "---\n- hello\n- world" + line_calls = @handler.marks.map(&:line).zip(@handler.calls.map(&:first)) + assert_equal [[0, :start_stream], + [0, :start_document], + [1, :start_sequence], + [2, :scalar], + [3, :scalar], + [3, :end_sequence], + [3, :end_document], + [3, :end_stream]], line_calls + + assert_equal 3, @parser.mark.line + end + + def test_column_numbers + assert_equal 0, @parser.mark.column + @parser.parse "---\n- hello\n- world" + col_calls = @handler.marks.map(&:column).zip(@handler.calls.map(&:first)) + assert_equal [[0, :start_stream], + [3, :start_document], + [1, :start_sequence], + [0, :scalar], + [0, :scalar], + [0, :end_sequence], + [0, :end_document], + [0, :end_stream]], col_calls + + assert_equal 0, @parser.mark.column + end + + def test_index_numbers + assert_equal 0, @parser.mark.index + @parser.parse "---\n- hello\n- world" + idx_calls = @handler.marks.map(&:index).zip(@handler.calls.map(&:first)) + assert_equal [[0, :start_stream], + [3, :start_document], + [5, :start_sequence], + [12, :scalar], + [19, :scalar], + [19, :end_sequence], + [19, :end_document], + [19, :end_stream]], idx_calls + + assert_equal 19, @parser.mark.index end def test_set_encoding_twice |