Index: pyyaml/trunk/tests/test_structure.py
===================================================================
--- pyyaml/trunk/tests/test_structure.py	(revision 118)
+++ pyyaml/trunk/tests/test_structure.py	(revision 130)
@@ -36,15 +36,15 @@
             else:
                 return None
-        elif parser.check(SequenceEvent):
+        elif parser.check(SequenceStartEvent):
             parser.get()
             sequence = []
-            while not parser.check(CollectionEndEvent):
+            while not parser.check(SequenceEndEvent):
                 sequence.append(self._convert(parser))
             parser.get()
             return sequence
-        elif parser.check(MappingEvent):
+        elif parser.check(MappingStartEvent):
             parser.get()
             mapping = []
-            while not parser.check(CollectionEndEvent):
+            while not parser.check(MappingEndEvent):
                 key = self._convert(parser)
                 value = self._convert(parser)
@@ -93,5 +93,5 @@
                 #self.failUnlessEqual(event1.tag, event2.tag)
                 self.failUnlessEqual(event1.value, event2.value)
-            if isinstance(event1, CollectionEvent):
+            if isinstance(event1, CollectionStartEvent):
                 #self.failUnlessEqual(event1.anchor, event2.anchor)
                 #self.failUnlessEqual(event1.tag, event2.tag)
@@ -214,5 +214,5 @@
                 self.failUnlessEqual(event1.tag, event2.tag)
                 self.failUnlessEqual(event1.value, event2.value)
-            if isinstance(event1, CollectionEvent):
+            if isinstance(event1, CollectionStartEvent):
                 self.failUnlessEqual(event1.anchor, event2.anchor)
                 self.failUnlessEqual(event1.tag, event2.tag)