Merge Dave's fixes for the compatibility tests and web.

[jelmer/dulwich-libgit2.git] / dulwich / tests / test_objects.py

diff --git a/dulwich/tests/test_objects.py b/dulwich/tests/test_objects.py
index 39e10a7e1376b209a3c157a00e8740d462945dbe..c5555a3b38ddbeda6ed13dc7ed9be2deeabd1897 100644 (file)
--- a/dulwich/tests/test_objects.py
+++ b/dulwich/tests/test_objects.py
@@ -17,6 +17,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
+
+"""Tests for git base objects."""
+
+# TODO: Round-trip parse-serialize-parse and serialize-parse-serialize tests.
+
+
 import os
 import stat
 import unittest
@@ -26,7 +32,9 @@ from dulwich.objects import (
     Tree,
     Commit,
     Tag,
+    format_timezone,
     hex_to_sha,
+    parse_timezone,
     )
 
 a_sha = '6f670c0fb53f9463760b7295fbb814e965fb20c8'
@@ -60,6 +68,10 @@ class BlobReadTests(unittest.TestCase):
         self.assertEqual(b.data, 'test 1\n')
         self.assertEqual(b.sha().hexdigest(), a_sha)
   
+    def test_hash(self):
+        b = self.get_blob(a_sha)
+        self.assertEqual(hash(b.id), hash(b))
+
     def test_parse_empty_blob_object(self):
         sha = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
         b = self.get_blob(sha)
@@ -72,6 +84,18 @@ class BlobReadTests(unittest.TestCase):
         b = Blob.from_string(string)
         self.assertEqual(b.data, string)
         self.assertEqual(b.sha().hexdigest(), b_sha)
+
+    def test_chunks(self):
+        string = 'test 5\n'
+        b = Blob.from_string(string)
+        self.assertEqual([string], b.chunked)
+
+    def test_set_chunks(self):
+        b = Blob()
+        b.chunked = ['te', 'st', ' 5\n']
+        self.assertEqual('test 5\n', b.data)
+        b.chunked = ['te', 'st', ' 6\n']
+        self.assertEqual('test 6\n', b.as_raw_string())
   
     def test_parse_legacy_blob(self):
         string = 'test 3\n'
@@ -170,6 +194,10 @@ class CommitSerializationTests(unittest.TestCase):
         c1.set_raw_string(c.as_raw_string())
         self.assertEquals(30, c1.commit_time)
 
+    def test_raw_length(self):
+        c = self.make_base()
+        self.assertEquals(len(c.as_raw_string()), c.raw_length())
+
     def test_simple(self):
         c = self.make_base()
         self.assertEquals(c.id, '5dac377bdded4c9aeb8dff595f0faeebcc8498cc')
@@ -193,6 +221,41 @@ class CommitSerializationTests(unittest.TestCase):
         self.assertTrue(" -0100\n" in c.as_raw_string())
 
 
+class CommitDeserializationTests(unittest.TestCase):
+
+    def test_simple(self):
+        c = Commit.from_string(
+                'tree d80c186a03f423a81b39df39dc87fd269736ca86\n'
+                'parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd\n'
+                'parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6\n'
+                'author James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                '\n'
+                'Merge ../b\n')
+        self.assertEquals('Merge ../b\n', c.message)
+        self.assertEquals('James Westby <jw+debian@jameswestby.net>',
+            c.author)
+        self.assertEquals('James Westby <jw+debian@jameswestby.net>',
+            c.committer)
+        self.assertEquals('d80c186a03f423a81b39df39dc87fd269736ca86',
+            c.tree)
+        self.assertEquals(['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
+                          '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'],
+            c.parents)
+
+    def test_custom(self):
+        c = Commit.from_string(
+                'tree d80c186a03f423a81b39df39dc87fd269736ca86\n'
+                'parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd\n'
+                'parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6\n'
+                'author James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'extra-field data\n'
+                '\n'
+                'Merge ../b\n')
+        self.assertEquals([('extra-field', 'data')], c.extra)
+
+
 class TreeSerializationTests(unittest.TestCase):
 
     def test_simple(self):
@@ -217,7 +280,7 @@ class TagSerializeTests(unittest.TestCase):
         x.tagger = "Jelmer Vernooij <jelmer@samba.org>"
         x.name = "0.1"
         x.message = "Tag 0.1"
-        x.object = (3, "d80c186a03f423a81b39df39dc87fd269736ca86")
+        x.object = (Blob, "d80c186a03f423a81b39df39dc87fd269736ca86")
         x.tag_time = 423423423
         x.tag_timezone = 0
         self.assertEquals("""object d80c186a03f423a81b39df39dc87fd269736ca86
@@ -268,3 +331,28 @@ OK2XeQOiEeXtT76rV4t2WR4=
         self.assertEquals("v2.6.22-rc7", x.name)
 
 
+class TimezoneTests(unittest.TestCase):
+
+    def test_parse_timezone_utc(self):
+        self.assertEquals(0, parse_timezone("+0000"))
+
+    def test_generate_timezone_utc(self):
+        self.assertEquals("+0000", format_timezone(0))
+
+    def test_parse_timezone_cet(self):
+        self.assertEquals(60 * 60, parse_timezone("+0100"))
+
+    def test_format_timezone_cet(self):
+        self.assertEquals("+0100", format_timezone(60 * 60))
+
+    def test_format_timezone_pdt(self):
+        self.assertEquals("-0400", format_timezone(-4 * 60 * 60))
+
+    def test_parse_timezone_pdt(self):
+        self.assertEquals(-4 * 60 * 60, parse_timezone("-0400"))
+
+    def test_format_timezone_pdt_half(self):
+        self.assertEquals("-0440", format_timezone(int(((-4 * 60) - 40) * 60)))
+
+    def test_parse_timezone_pdt_half(self):
+        self.assertEquals(((-4 * 60) - 40) * 60, parse_timezone("-0440"))