merging from ruby

1 files changed, 37 insertions, 11 deletions

diff --git a/test/psych/visitors/test_depth_first.rb b/test/psych/visitors/test_depth_first.rb
index a783960..a84f5b6 100644
--- a/test/psych/visitors/test_depth_first.rb
+++ b/test/psych/visitors/test_depth_first.rb
@@ -3,21 +3,47 @@ require_relative '../helper'
 module Psych
   module Visitors
     class TestDepthFirst < TestCase
+      class Collector < Struct.new(:calls)
+        def initialize(calls = [])
+          super
+        end
+
+        def call obj
+          calls << obj
+        end
+      end
+
       def test_scalar
-        collector = Class.new(Struct.new(:calls)) {
-          def initialize(calls = [])
-            super
-          end
-
-          def call obj
-            calls << obj
-          end
-        }.new
-        visitor = Visitors::DepthFirst.new collector
-        visitor.accept Psych.parse '--- hello'
+        collector = Collector.new
+        visitor   = Visitors::DepthFirst.new collector
+        visitor.accept Psych.parse_stream '--- hello'
 
         assert_equal 3, collector.calls.length
       end
+
+      def test_sequence
+        collector = Collector.new
+        visitor   = Visitors::DepthFirst.new collector
+        visitor.accept Psych.parse_stream "---\n- hello"
+
+        assert_equal 4, collector.calls.length
+      end
+
+      def test_mapping
+        collector = Collector.new
+        visitor   = Visitors::DepthFirst.new collector
+        visitor.accept Psych.parse_stream "---\nhello: world"
+
+        assert_equal 5, collector.calls.length
+      end
+
+      def test_alias
+        collector = Collector.new
+        visitor   = Visitors::DepthFirst.new collector
+        visitor.accept Psych.parse_stream "--- &yay\n- foo\n- *yay\n"
+
+        assert_equal 5, collector.calls.length
+      end
     end
   end
 end