Changeset 132 for pyyaml/trunk/tests

Timestamp:

04/09/06 15:51:02 (6 years ago)

Author:

xi

Message:

Emitter is done!!!

Location:

pyyaml/trunk/tests

Files:

• data/documents.events (modified) (1 diff)
• data/mappings.events (modified) (1 diff)
• data/sequences.events (modified) (1 diff)
• data/tags.events (added)
• test_appliance.py (modified) (1 diff)
• test_emitter.py (modified) (4 diffs)
• test_yaml.py (modified) (1 diff)

pyyaml/trunk/tests/data/documents.events

@@ -1 +1 @@
 - !StreamStart
-- !DocumentStart
-- !Scalar { implicit: true }
+- !DocumentStart { explicit: false }
+- !Scalar { implicit: true, value: 'data' }
 - !DocumentEnd
 - !DocumentStart
 - !Scalar { implicit: true }
 - !DocumentEnd
-- !DocumentStart
+- !DocumentStart { version: [1,1], tags: { '!': '!foo', '!yaml!': 'tag:yaml.org,2002:', '!ugly!': '!!!!!!!' } }
 - !Scalar { implicit: true }
 - !DocumentEnd

pyyaml/trunk/tests/data/mappings.events

@@ -25 +25 @@
 - !MappingEnd
 - !Scalar { implicit: true, value: 'flow mapping' }
-- !MappingStart { flow: true }
+- !MappingStart { flow_style: true }
 - !Scalar { implicit: true, value: 'key' }
 - !Scalar { implicit: true, value: 'value' }

pyyaml/trunk/tests/data/sequences.events

@@ -65 +65 @@
 - !DocumentStart
 - !SequenceStart
-- !SequenceStart { flow: true }
+- !SequenceStart { flow_style: true }
 - !SequenceStart
 - !SequenceEnd

pyyaml/trunk/tests/test_appliance.py

@@ -238 +238 @@
             if self.test_token(AnchorToken):
                 anchor = self.get_value()
-            tag = u'!'
+            tag = None
             if self.test_token(TagToken):
                 tag = self.get_value()

pyyaml/trunk/tests/test_emitter.py

@@ -5 +5 @@
 import yaml
 
-class TestEmitterOnCanonical(test_appliance.TestAppliance):
+class TestEmitter(test_appliance.TestAppliance):
 
-    def _testEmitterOnCanonical(self, test_name, canonical_filename):
-        events = list(iter(Parser(Scanner(Reader(file(canonical_filename, 'rb'))))))
-        #writer = sys.stdout
+    def _testEmitterOnData(self, test_name, canonical_filename, data_filename):
+        self._testEmitter(test_name, data_filename)
+
+    def _testEmitterOnCanonicalNormally(self, test_name, canonical_filename):
+        self._testEmitter(test_name, canonical_filename, False)
+
+    def _testEmitterOnCanonicalCanonically(self, test_name, canonical_filename):
+        self._testEmitter(test_name, canonical_filename, True)
+
+    def _testEmitter(self, test_name, filename, canonical=None):
+        events = list(iter(Parser(Scanner(Reader(file(filename, 'rb'))))))
+        if canonical is not None:
+            events[0].canonical = canonical
+        #self._dump(filename, events)
         writer = StringIO.StringIO()
         emitter = Emitter(writer)
-        #print "-"*30
-        #print "ORIGINAL DATA:"
-        #print file(canonical_filename, 'rb').read()
         for event in events:
             emitter.emit(event)
         data = writer.getvalue()
         new_events = list(parse(data))
-        self.failUnlessEqual(len(events), len(new_events))
         for event, new_event in zip(events, new_events):
             self.failUnlessEqual(event.__class__, new_event.__class__)
+            if isinstance(event, NodeEvent):
+                self.failUnlessEqual(event.anchor, new_event.anchor)
+            if isinstance(event, CollectionStartEvent):
+                self.failUnlessEqual(event.tag, new_event.tag)
+            if isinstance(event, ScalarEvent):
+                #self.failUnlessEqual(event.implicit, new_event.implicit)
+                if not event.implicit and not new_event.implicit:
+                    self.failUnlessEqual(event.tag, new_event.tag)
+                self.failUnlessEqual(event.value, new_event.value)
 
-TestEmitterOnCanonical.add_tests('testEmitterOnCanonical', '.canonical')
+    def _dump(self, filename, events):
+        writer = sys.stdout
+        emitter = Emitter(writer)
+        print "="*30
+        print "ORIGINAL DOCUMENT:"
+        print file(filename, 'rb').read()
+        print '-'*30
+        print "EMITTED DOCUMENT:"
+        for event in events:
+            emitter.emit(event)
+        
+TestEmitter.add_tests('testEmitterOnData', '.canonical', '.data')
+#TestEmitter.add_tests('testEmitterOnCanonicalNormally', '.canonical')
+#TestEmitter.add_tests('testEmitterOnCanonicalCanonically', '.canonical')
 
 class EventsConstructor(Constructor):
@@ -44 +73 @@
 EventsConstructor.add_constructor(None, EventsConstructor.construct_event)
 
-class TestEmitter(test_appliance.TestAppliance):
+class TestEmitterEvents(test_appliance.TestAppliance):
 
-    def _testEmitter(self, test_name, events_filename):
-        events = load_document(file(events_filename, 'rb'), Constructor=EventsConstructor)
-        self._dump(events_filename, events)
+    def _testEmitterEvents(self, test_name, events_filename):
+        events = list(load_document(file(events_filename, 'rb'), Constructor=EventsConstructor))
+        #self._dump(events_filename, events)
         writer = StringIO.StringIO()
         emitter = Emitter(writer)
@@ -58 +87 @@
         for event, new_event in zip(events, new_events):
             self.failUnlessEqual(event.__class__, new_event.__class__)
+            if isinstance(event, NodeEvent):
+                self.failUnlessEqual(event.anchor, new_event.anchor)
+            if isinstance(event, CollectionStartEvent):
+                self.failUnlessEqual(event.tag, new_event.tag)
+            if isinstance(event, ScalarEvent):
+                self.failUnless(event.implicit == new_event.implicit
+                        or event.tag == new_event.tag)
+                self.failUnlessEqual(event.value, new_event.value)
 
     def _dump(self, events_filename, events):
@@ -70 +107 @@
             emitter.emit(event)
         
-TestEmitter.add_tests('testEmitter', '.events')
+TestEmitterEvents.add_tests('testEmitterEvents', '.events')
 

pyyaml/trunk/tests/test_yaml.py

@@ -10 +10 @@
 from test_detector import *
 from test_constructor import *
-#from test_emitter import *
+from test_emitter import *
 from test_syck import *