Fixed string and unicode string readers to handle null-termination. Implemented more...

diff --git a/ebml/core.py b/ebml/core.py
index e076c8b..0f390a8 100644 (file)
--- a/ebml/core.py
+++ b/ebml/core.py
@@ -189,6 +189,7 @@ def read_string(stream, size):
        value = ''
        if size > 0:
                value = stream.read(size)
        value = ''
        if size > 0:
                value = stream.read(size)

+               value = value.rstrip(chr(0))

        return value
 
 
        return value
 
 


@@ -208,6 +209,7 @@ def read_unicode_string(stream, size):
        value = u''
        if size > 0:
                data = stream.read(size)
        value = u''
        if size > 0:
                data = stream.read(size)

+               data = data.rstrip(chr(0))

                value = unicode(data, 'utf_8')
        return value
 
                value = unicode(data, 'utf_8')
        return value
 

diff --git a/ebml/tests/test_core.py b/ebml/tests/test_core.py
index ce72b69..9887ad3 100644 (file)
--- a/ebml/tests/test_core.py
+++ b/ebml/tests/test_core.py
@@ -3,13 +3,16 @@ try:
        from cStringIO import StringIO
 except ImportError:
        from StringIO import StringIO
        from cStringIO import StringIO
 except ImportError:
        from StringIO import StringIO

-from random import randint
+import random
+import sys

 from ..core import *
 
 
 class ElementSizeTests(unittest.TestCase):
        def assert_roundtrip(self, value, length=None):
                encoded = encode_element_size(value, length=length)
 from ..core import *
 
 
 class ElementSizeTests(unittest.TestCase):
        def assert_roundtrip(self, value, length=None):
                encoded = encode_element_size(value, length=length)

+               if length is not None:
+                       self.assertEqual(length, len(encoded))

                encoded_stream = StringIO(encoded)
                self.assertEqual(value, read_element_size(encoded_stream)[0])
        
                encoded_stream = StringIO(encoded)
                self.assertEqual(value, read_element_size(encoded_stream)[0])
        


@@ -28,10 +31,10 @@ class ElementSizeTests(unittest.TestCase):
        def test_max_base_2(self):
                for value in ((2**exp) - 2 for exp in xrange(1, 57)):
                        self.assert_roundtrip(value)
        def test_max_base_2(self):
                for value in ((2**exp) - 2 for exp in xrange(1, 57)):
                        self.assert_roundtrip(value)

-               
+       

        def test_random(self):
                maximum = 2**56 - 2
        def test_random(self):
                maximum = 2**56 - 2

-               for value in (randint(0, maximum) for i in xrange(0, 200)):
+               for value in (random.randint(0, maximum) for i in xrange(0, 10000)):

                        self.assert_roundtrip(value)
 
 
                        self.assert_roundtrip(value)
 
 


@@ -63,9 +66,11 @@ class ValueTestCase(unittest.TestCase):
        encoder = None
        reader = None
        
        encoder = None
        reader = None
        

-       def assert_roundtrip(self, value):
+       def assert_roundtrip(self, value, length=None):

                if self.encoder is not None and self.reader is not None:
                if self.encoder is not None and self.reader is not None:

-                       encoded = self.encoder(value)
+                       encoded = self.encoder(value, length)
+                       if length is not None:
+                               self.assertEqual(length, len(encoded))

                        encoded_stream = StringIO(encoded)
                        self.assertEqual(value, self.reader(encoded_stream, len(encoded)))
                else:
                        encoded_stream = StringIO(encoded)
                        self.assertEqual(value, self.reader(encoded_stream, len(encoded)))
                else:


@@ -78,9 +83,13 @@ class UnsignedIntegerTests(ValueTestCase):
        maximum = 2**64 - 1
        
        def test_random(self):
        maximum = 2**64 - 1
        
        def test_random(self):

-               for value in (randint(0, self.maximum) for i in xrange(0, 10000)):
+               for value in (random.randint(0, self.maximum) for i in xrange(0, 10000)):

                        self.assert_roundtrip(value)
        
                        self.assert_roundtrip(value)
        

+       def test_random_longer(self):
+               for value in (random.randint(0, (self.maximum / (2**32))) for i in xrange(0, 10000)):
+                       self.assert_roundtrip(value, length=8)
+       

        def test_maximum(self):
                self.assert_roundtrip(self.maximum)
 
        def test_maximum(self):
                self.assert_roundtrip(self.maximum)
 


@@ -92,9 +101,13 @@ class SignedIntegerTests(ValueTestCase):
        maximum = (2**63) - 1
        
        def test_random(self):
        maximum = (2**63) - 1
        
        def test_random(self):

-               for value in (randint(self.minimum, self.maximum) for i in xrange(0, 10000)):
+               for value in (random.randint(self.minimum, self.maximum) for i in xrange(0, 10000)):

                        self.assert_roundtrip(value)
        
                        self.assert_roundtrip(value)
        

+       def test_random_longer(self):
+               for value in (random.randint((self.minimum / (2**32)), (self.maximum / (2**32))) for i in xrange(0, 10000)):
+                       self.assert_roundtrip(value, length=8)
+       

        def test_minimum(self):
                self.assert_roundtrip(self.minimum)
        
        def test_minimum(self):
                self.assert_roundtrip(self.minimum)
        


@@ -102,5 +115,46 @@ class SignedIntegerTests(ValueTestCase):
                self.assert_roundtrip(self.maximum)
 
 
                self.assert_roundtrip(self.maximum)
 
 

+class FloatTests(ValueTestCase):
+       encoder = staticmethod(encode_float)
+       reader = staticmethod(read_float)
+       
+       def test_random(self):
+               raise NotImplementedError
+
+
+class StringTests(ValueTestCase):
+       encoder = staticmethod(encode_string)
+       reader = staticmethod(read_string)
+       letters = ''.join(chr(i) for i in xrange(1, 127))
+       
+       def test_random(self):
+               for length in (random.randint(0, 2**10) for i in xrange(0, 1000)):
+                       astring = ''.join(random.sample(self.letters * ((length // len(self.letters)) + 1), length))
+                       self.assert_roundtrip(astring)
+                       self.assert_roundtrip(astring, length=length*2)
+
+
+class UnicodeStringTests(ValueTestCase):
+       encoder = staticmethod(encode_unicode_string)
+       reader = staticmethod(read_unicode_string)
+       letters = u''.join(unichr(i) for i in xrange(1, sys.maxunicode + 1))
+       
+       def test_random(self):
+               for length in (random.randint(0, 2**10) for i in xrange(0, 1000)):
+                       ustring = u''.join(random.sample(self.letters * ((length // len(self.letters)) + 1), length))
+                       ustring = ustring.encode('utf_8').decode('utf_8')
+                       self.assert_roundtrip(ustring)
+                       self.assert_roundtrip(ustring, length=length*5)
+
+
+class DateTests(ValueTestCase):
+       encoder = staticmethod(encode_date)
+       reader = staticmethod(read_date)
+       
+       def test_random(self):
+               raise NotImplementedError
+
+

 if __name__ == '__main__':
        unittest.main()
\ No newline at end of file
 if __name__ == '__main__':
        unittest.main()
\ No newline at end of file