Rev 2618: Move bencode tests into util.tests in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Mon Jul 16 00:31:36 BST 2007


At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2618
revision-id: pqm at pqm.ubuntu.com-20070715233134-zrptwn7og449cirw
parent: pqm at pqm.ubuntu.com-20070713074627-93zxs9uh528y0fki
parent: mbp at sourcefrog.net-20070713062010-c4u4b751qzb7v8ue
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-07-16 00:31:34 +0100
message:
  Move bencode tests into util.tests
added:
  bzrlib/util/tests/             bzrlibutiltests-20070713054332-wmm62qs3xvyfzwup-1
  bzrlib/util/tests/__init__.py  __init__.py-20070713054446-oliu3oth0gy08y0t-1
  bzrlib/util/tests/test_bencode.py test_bencode.py-20070713042202-qjw8rppxaz7ky6i6-1
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/util/bencode.py         bencode.py-20070220044742-sltr28q21w2wzlxi-1
    ------------------------------------------------------------
    revno: 2613.1.2
    merged: mbp at sourcefrog.net-20070713062010-c4u4b751qzb7v8ue
    parent: mbp at sourcefrog.net-20070713042217-mnkwb9przs8x2de0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bencode
    timestamp: Fri 2007-07-13 16:20:10 +1000
    message:
      Move bencode tests into util.tests
    ------------------------------------------------------------
    revno: 2613.1.1
    merged: mbp at sourcefrog.net-20070713042217-mnkwb9przs8x2de0
    parent: pqm at pqm.ubuntu.com-20070713031727-kcz297vvphee2hhg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bencode
    timestamp: Fri 2007-07-13 14:22:17 +1000
    message:
      Move bencode tests from within their module into our test suite
=== added directory 'bzrlib/util/tests'
=== added file 'bzrlib/util/tests/__init__.py'
--- a/bzrlib/util/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ b/bzrlib/util/tests/__init__.py	2007-07-13 06:20:10 +0000
@@ -0,0 +1,1 @@
+True

=== added file 'bzrlib/util/tests/test_bencode.py'
--- a/bzrlib/util/tests/test_bencode.py	1970-01-01 00:00:00 +0000
+++ b/bzrlib/util/tests/test_bencode.py	2007-07-13 06:20:10 +0000
@@ -0,0 +1,212 @@
+# bencode structured encoding
+#
+# Written by Petru Paler
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation files
+# (the "Software"), to deal in the Software without restriction,
+# including without limitation the rights to use, copy, modify, merge,
+# publish, distribute, sublicense, and/or sell copies of the Software,
+# and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# The Software is provided "AS IS", without warranty of any kind,
+# express or implied, including but not limited to the warranties of
+# merchantability,  fitness for a particular purpose and
+# noninfringement. In no event shall the  authors or copyright holders
+# be liable for any claim, damages or other liability, whether in an
+# action of contract, tort or otherwise, arising from, out of or in
+# connection with the Software or the use or other dealings in the
+# Software.
+
+
+from bzrlib.util.bencode import bencode, bdecode, Bencached
+from bzrlib.tests import TestCase
+
+class TestBencode(TestCase):
+    # tests moved from within the bencode module so they're not run on every
+    # startup
+
+    def test_bdecode(self):
+        try:
+            bdecode('0:0:')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('ie')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('i341foo382e')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('i4e') == 4L
+        assert bdecode('i0e') == 0L
+        assert bdecode('i123456789e') == 123456789L
+        assert bdecode('i-10e') == -10L
+        try:
+            bdecode('i-0e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('i123')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('i6easd')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('35208734823ljdahflajhdf')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('2:abfdjslhfld')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('0:') == ''
+        assert bdecode('3:abc') == 'abc'
+        assert bdecode('10:1234567890') == '1234567890'
+        try:
+            bdecode('02:xy')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('l')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('le') == []
+        try:
+            bdecode('leanfdldjfh')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('l0:0:0:e') == ['', '', '']
+        try:
+            bdecode('relwjhrlewjh')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('li1ei2ei3ee') == [1, 2, 3]
+        assert bdecode('l3:asd2:xye') == ['asd', 'xy']
+        assert bdecode('ll5:Alice3:Bobeli2ei3eee') == [['Alice', 'Bob'], [2, 3]]
+        try:
+            bdecode('d')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('defoobar')
+            assert 0
+        except ValueError:
+            pass
+        assert bdecode('de') == {}
+        assert bdecode('d3:agei25e4:eyes4:bluee') == {'age': 25, 'eyes': 'blue'}
+        assert bdecode('d8:spam.mp3d6:author5:Alice6:lengthi100000eee') == {'spam.mp3': {'author': 'Alice', 'length': 100000}}
+        try:
+            bdecode('d3:fooe')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('di1e0:e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('d1:b0:1:a0:e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('d1:a0:1:a0:e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('i03e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('l01:ae')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('9999:x')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('l0:')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('d0:0:')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('d0:')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('00:')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('l-3:e')
+            assert 0
+        except ValueError:
+            pass
+        try:
+            bdecode('i-03e')
+            assert 0
+        except ValueError:
+            pass
+        bdecode('d0:i3ee')
+
+
+    def test_bencode(self):
+        assert bencode(4) == 'i4e'
+        assert bencode(0) == 'i0e'
+        assert bencode(-10) == 'i-10e'
+        assert bencode(12345678901234567890L) == 'i12345678901234567890e'
+        assert bencode('') == '0:'
+        assert bencode('abc') == '3:abc'
+        assert bencode('1234567890') == '10:1234567890'
+        assert bencode([]) == 'le'
+        assert bencode([1, 2, 3]) == 'li1ei2ei3ee'
+        assert bencode([['Alice', 'Bob'], [2, 3]]) == 'll5:Alice3:Bobeli2ei3eee'
+        assert bencode({}) == 'de'
+        assert bencode({'age': 25, 'eyes': 'blue'}) == 'd3:agei25e4:eyes4:bluee'
+        assert bencode({'spam.mp3': {'author': 'Alice', 'length': 100000}}) == 'd8:spam.mp3d6:author5:Alice6:lengthi100000eee'
+        assert bencode(Bencached(bencode(3))) == 'i3e'
+        try:
+            bencode({1: 'foo'})
+        except TypeError:
+            return
+        assert 0
+

=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2007-07-12 09:49:37 +0000
+++ b/bzrlib/tests/__init__.py	2007-07-13 06:20:10 +0000
@@ -2243,6 +2243,7 @@
     suite on a global basis, but it is not encouraged.
     """
     testmod_names = [
+                   'bzrlib.util.tests.test_bencode',
                    'bzrlib.tests.test_ancestry',
                    'bzrlib.tests.test_annotate',
                    'bzrlib.tests.test_api',

=== modified file 'bzrlib/tests/test_source.py'
--- a/bzrlib/tests/test_source.py	2007-01-18 16:26:15 +0000
+++ b/bzrlib/tests/test_source.py	2007-07-13 06:20:10 +0000
@@ -203,7 +203,7 @@
                          " bzrlib/tests/test_source.py",
                          # this is broken to prevent a false match
                          "or add '# Copyright (C)"
-                         " 2006 Canonical Ltd' to these files:",
+                         " 2007 Canonical Ltd' to these files:",
                          "",
                         ]
             for fname, comment in incorrect:

=== modified file 'bzrlib/util/bencode.py'
--- a/bzrlib/util/bencode.py	2007-03-16 01:08:28 +0000
+++ b/bzrlib/util/bencode.py	2007-07-13 04:22:17 +0000
@@ -89,163 +89,6 @@
         raise ValueError
     return r
 
-def test_bdecode():
-    try:
-        bdecode('0:0:')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('ie')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('i341foo382e')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('i4e') == 4L
-    assert bdecode('i0e') == 0L
-    assert bdecode('i123456789e') == 123456789L
-    assert bdecode('i-10e') == -10L
-    try:
-        bdecode('i-0e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('i123')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('i6easd')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('35208734823ljdahflajhdf')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('2:abfdjslhfld')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('0:') == ''
-    assert bdecode('3:abc') == 'abc'
-    assert bdecode('10:1234567890') == '1234567890'
-    try:
-        bdecode('02:xy')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('l')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('le') == []
-    try:
-        bdecode('leanfdldjfh')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('l0:0:0:e') == ['', '', '']
-    try:
-        bdecode('relwjhrlewjh')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('li1ei2ei3ee') == [1, 2, 3]
-    assert bdecode('l3:asd2:xye') == ['asd', 'xy']
-    assert bdecode('ll5:Alice3:Bobeli2ei3eee') == [['Alice', 'Bob'], [2, 3]]
-    try:
-        bdecode('d')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('defoobar')
-        assert 0
-    except ValueError:
-        pass
-    assert bdecode('de') == {}
-    assert bdecode('d3:agei25e4:eyes4:bluee') == {'age': 25, 'eyes': 'blue'}
-    assert bdecode('d8:spam.mp3d6:author5:Alice6:lengthi100000eee') == {'spam.mp3': {'author': 'Alice', 'length': 100000}}
-    try:
-        bdecode('d3:fooe')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('di1e0:e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('d1:b0:1:a0:e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('d1:a0:1:a0:e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('i03e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('l01:ae')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('9999:x')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('l0:')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('d0:0:')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('d0:')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('00:')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('l-3:e')
-        assert 0
-    except ValueError:
-        pass
-    try:
-        bdecode('i-03e')
-        assert 0
-    except ValueError:
-        pass
-    bdecode('d0:i3ee')
 
 from types import StringType, IntType, LongType, DictType, ListType, TupleType
 
@@ -299,24 +142,3 @@
     encode_func[type(x)](x, r)
     return ''.join(r)
 
-def test_bencode():
-    assert bencode(4) == 'i4e'
-    assert bencode(0) == 'i0e'
-    assert bencode(-10) == 'i-10e'
-    assert bencode(12345678901234567890L) == 'i12345678901234567890e'
-    assert bencode('') == '0:'
-    assert bencode('abc') == '3:abc'
-    assert bencode('1234567890') == '10:1234567890'
-    assert bencode([]) == 'le'
-    assert bencode([1, 2, 3]) == 'li1ei2ei3ee'
-    assert bencode([['Alice', 'Bob'], [2, 3]]) == 'll5:Alice3:Bobeli2ei3eee'
-    assert bencode({}) == 'de'
-    assert bencode({'age': 25, 'eyes': 'blue'}) == 'd3:agei25e4:eyes4:bluee'
-    assert bencode({'spam.mp3': {'author': 'Alice', 'length': 100000}}) == 'd8:spam.mp3d6:author5:Alice6:lengthi100000eee'
-    assert bencode(Bencached(bencode(3))) == 'i3e'
-    try:
-        bencode({1: 'foo'})
-    except TypeError:
-        return
-    assert 0
-




More information about the bazaar-commits mailing list