Changeset 141

Timestamp:

04/18/06 12:48:00 (7 years ago)

Author:

xi

Message:

Add more unit tests for error messages.

Location:

pyyaml/trunk

Files:

• lib/yaml/emitter.py (modified) (3 diffs)
• tests/data/empty-anchor.emitter-error (added)
• tests/data/empty-tag-handle.emitter-error (added)
• tests/data/empty-tag-prefix.emitter-error (added)
• tests/data/empty-tag.emitter-error (added)
• tests/data/expected-document-end.emitter-error (added)
• tests/data/expected-document-start.emitter-error (added)
• tests/data/expected-node-1.emitter-error (added)
• tests/data/expected-node-2.emitter-error (added)
• tests/data/expected-nothing.emitter-error (added)
• tests/data/expected-stream-start.emitter-error (added)
• tests/data/invalid-anchor.emitter-error (added)
• tests/data/invalid-tag-handle-1.emitter-error (added)
• tests/data/invalid-tag-handle-2.emitter-error (added)
• tests/data/no-alias-anchor.emitter-error (added)
• tests/data/no-tag.emitter-error (added)
• tests/data/recursive.dumper-error (added)
• tests/data/serializer-is-already-opened.dumper-error (added)
• tests/data/serializer-is-closed-1.dumper-error (added)
• tests/data/serializer-is-closed-2.dumper-error (added)
• tests/data/serializer-is-not-opened-1.dumper-error (added)
• tests/data/serializer-is-not-opened-2.dumper-error (added)
• tests/data/unknown.dumper-error (added)
• tests/data/unsupported-version.emitter-error (added)
• tests/test_errors.py (modified) (3 diffs)

pyyaml/trunk/lib/yaml/emitter.py

@@ -466 +466 @@
                 self.prepared_tag = None
                 return
-            if self.event.implicit[0] and not tag:
+            if self.event.implicit[0] and tag is None:
                 tag = u'!'
                 self.prepared_tag = None
@@ -473 +473 @@
                 self.prepared_tag = None
                 return
-        if not tag:
+        if tag is None:
             raise EmitterError("tag is not specified")
         if self.prepared_tag is None:
@@ -609 +609 @@
                     or ch in u'-_'):
                 raise EmitterError("invalid character %r in the anchor: %r"
-                        % (ch.encode('utf-8'), text.encode('utf-8')))
+                        % (ch.encode('utf-8'), anchor.encode('utf-8')))
         return anchor
 

pyyaml/trunk/tests/test_errors.py

@@ -1 +1 @@
 
 import test_appliance
+import test_emitter
+
+import StringIO
 
 from yaml import *
@@ -13 +16 @@
         #self._load_string(invalid_filename)
         self.failUnlessRaises(YAMLError, lambda: self._load_string(invalid_filename))
+
+    def _testEmitterErrors(self, test_name, invalid_filename):
+        events = list(load(file(invalid_filename, 'rb').read(),
+            Loader=test_emitter.EventsLoader))
+        self.failUnlessRaises(YAMLError, lambda: self._emit(events))
+
+    def _testDumperErrors(self, test_name, invalid_filename):
+        code = file(invalid_filename, 'rb').read()
+        self.failUnlessRaises(YAMLError, lambda: self._dump(code))
+
+    def _dump(self, code):
+        try:
+            exec code
+        except YAMLError, exc:
+            #print '.'*70
+            #print "%s:" % exc.__class__.__name__, exc
+            raise
+
+    def _emit(self, events):
+        try:
+            emit(events)
+        except EmitterError, exc:
+            #print '.'*70
+            #print "%s:" % exc.__class__.__name__, exc
+            raise
 
     def _load(self, filename):
@@ -41 +69 @@
 TestErrors.add_tests('testLoaderErrors', '.loader-error')
 TestErrors.add_tests('testLoaderStringErrors', '.loader-error')
+TestErrors.add_tests('testEmitterErrors', '.emitter-error')
+TestErrors.add_tests('testDumperErrors', '.dumper-error')