Changeset 1666

Timestamp:

09/10/08 22:20:14 (2 months ago)

Author:

nick

Message:

Added a way to implementation independantly check the bytestring

Location:

pyamf/branches/impl-indep-test-suite-343/pyamf/tests

Files:

• test_amf3.py (modified) (1 diff)
• util.py (modified) (2 diffs)

pyamf/branches/impl-indep-test-suite-343/pyamf/tests/test_amf3.py

@@ -418 +418 @@
 
         self._run([
-            ({'a': u'a', 'b': u'b', 'c': u'c', 'd': u'd'},
-                '\n\x0b\x01\x03a\x06\x00\x03c\x06\x02\x03b\x06\x04\x03d\x06\x06\x01')])
+            ({'a': u'a', 'b': u'b', 'c': u'c', 'd': u'd'}, (
+                '\n\x0b\x01\x03', (
+                    'a\x06\x00\x03',
+                    'c\x06\x02\x03',
+                    'b\x06\x04\x03', 
+                    'd\x06\x06\x01'
+                ))
+            )])
 
         x = amf3.Decoder('\n\x0b\x01\x03a\x06\x00\x03c\x06\x02\x03b\x06\x04\x03d\x06\x06\x01')

pyamf/branches/impl-indep-test-suite-343/pyamf/tests/util.py

@@ -65 +65 @@
             self.encoder.writeElement(n)
 
-            testcase.assertEqual(self.getval(), s)
+            if isinstance(s, basestring):
+                testcase.assertEqual(self.getval(), s)
+            elif isinstance(s, (tuple, list)):
+                testcase.assertTrue(check_buffer(self.getval(), s))
 
 class DecoderTester(object):
@@ -118 +121 @@
         return val == float('-inf')
 
+def check_buffer(buf, parts):
+    assert isinstance(parts, (tuple, list))
+
+    for part in parts:
+        print repr(part)
+        if isinstance(part, basestring):
+            if buf[0:len(part)] == part:
+                buf = buf[len(part):]
+        elif isinstance(part, (tuple, list)):
+            if check_buffer(buf, part):
+                for p in part:
+                    buf = buf[len(part):]
+
+    return len(buf) == 0
 
 def replace_dict(src, dest):