Changeset 1667

Timestamp:

09/11/08 09:54:29 (3 months ago)

Author:

nick

Message:

Now recursive checking ..

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\x03', (
-                    'a\x06\x00\x03',
-                    'c\x06\x02\x03',
-                    'b\x06\x04\x03', 
-                    'd\x06\x06\x01'
-                ))
-            )])
+            ({'a': u'a', 'b': u'b', 'c': u'c', 'd': u'd'},  '\n\x0b\x01\x03', (
+                'b\x06\x04\x03', 
+                'a\x06\x00\x03',
+                'd\x06\x06\x01',
+                'c\x06\x02\x03'
+            ))
+        ])
 
         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

@@ -62 +62 @@
 
     def run(self, testcase):
-        for n, s in self.data:
+        for n in self.data:
+            s = n[1:]
+            n = n[0]
+
             self.encoder.writeElement(n)
 
@@ -124 +127 @@
     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:
+    for idx in range(0, len(parts)):
+        for part in parts:
+            if isinstance(part, basestring):
+                if buf[0:len(part)] == part:
                     buf = buf[len(part):]
+                    break
+            elif isinstance(part, (tuple, list)):
+                print repr(buf), repr(part)
+                if check_buffer(buf, part):
+                    for p in part:
+                        buf = buf[len(part):]
+                    break
 
     return len(buf) == 0