1 files changed, 74 insertions, 55 deletions
diff --git a/test/git/test_tree.py b/test/git/test_tree.py
index 04b8c41a..3f8ab851 100644
--- a/test/git/test_tree.py
+++ b/test/git/test_tree.py
@@ -7,60 +7,79 @@
 import os
 from test.testlib import *
 from git import *
+from cStringIO import StringIO
 
-class TestTree(TestCase):
-    
-    def setUp(self):
-        self.repo = Repo(GIT_REPO)
-
-    
-        
-    def test_traverse(self):
-        root = self.repo.tree('0.1.6')
-        num_recursive = 0
-        all_items = list()
-        for obj in root.traverse():
-            if "/" in obj.path:
-                num_recursive += 1
-                
-            assert isinstance(obj, (Blob, Tree))
-            all_items.append(obj)
-        # END for each object
-        # limit recursion level to 0 - should be same as default iteration
-        assert all_items
-        assert 'CHANGES' in root
-        assert len(list(root)) == len(list(root.traverse(depth=1)))
-        
-        # only choose trees
-        trees_only = lambda i,d: i.type == "tree"
-        trees = list(root.traverse(predicate = trees_only))
-        assert len(trees) == len(list( i for i in root.traverse() if trees_only(i,0) ))
-        
-        # test prune
-        lib_folder = lambda t,d: t.path == "lib"
-        pruned_trees = list(root.traverse(predicate = trees_only,prune = lib_folder))
-        assert len(pruned_trees) < len(trees)
-        
-        # trees and blobs
-        assert len(set(trees)|set(root.trees)) == len(trees)
-        assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len( root.blobs )
-        subitem = trees[0][0]
-        assert "/" in subitem.path
-        assert subitem.name == os.path.basename(subitem.path)
-        
-        # assure that at some point the traversed paths have a slash in them
-        found_slash = False
-        for item in root.traverse():
-            assert os.path.isabs(item.abspath)
-            if '/' in item.path:
-                found_slash = True
-            # END check for slash
-            
-            # slashes in paths are supported as well 
-            assert root[item.path] == item == root/item.path
-        # END for each item
-        assert found_slash
+class TestTree(TestBase):
+	
+	def test_serializable(self):
+		# tree at the given commit contains a submodule as well
+		roottree = self.rorepo.tree('6c1faef799095f3990e9970bc2cb10aa0221cf9c')
+		for item in roottree.traverse(ignore_self=False):
+			if item.type != Tree.type:
+				continue
+			# END skip non-trees
+			orig_data = item.data
+			orig_cache = item._cache
+			
+			stream = StringIO()
+			item._serialize(stream)
+			assert stream.getvalue() == orig_data
+			
+			stream.seek(0)
+			testtree = Tree(self.rorepo, Tree.NULL_HEX_SHA, 0, '')
+			testtree._deserialize(stream)
+			assert testtree._cache == orig_cache
+			
+			# add an item, serialize with presort
+			self.fail("presort")
+		# END for each item in tree
+	
+	def test_traverse(self):
+		root = self.rorepo.tree('0.1.6')
+		num_recursive = 0
+		all_items = list()
+		for obj in root.traverse():
+			if "/" in obj.path:
+				num_recursive += 1
+				
+			assert isinstance(obj, (Blob, Tree))
+			all_items.append(obj)
+		# END for each object
+		# limit recursion level to 0 - should be same as default iteration
+		assert all_items
+		assert 'CHANGES' in root
+		assert len(list(root)) == len(list(root.traverse(depth=1)))
+		
+		# only choose trees
+		trees_only = lambda i,d: i.type == "tree"
+		trees = list(root.traverse(predicate = trees_only))
+		assert len(trees) == len(list( i for i in root.traverse() if trees_only(i,0) ))
+		
+		# test prune
+		lib_folder = lambda t,d: t.path == "lib"
+		pruned_trees = list(root.traverse(predicate = trees_only,prune = lib_folder))
+		assert len(pruned_trees) < len(trees)
+		
+		# trees and blobs
+		assert len(set(trees)|set(root.trees)) == len(trees)
+		assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len( root.blobs )
+		subitem = trees[0][0]
+		assert "/" in subitem.path
+		assert subitem.name == os.path.basename(subitem.path)
+		
+		# assure that at some point the traversed paths have a slash in them
+		found_slash = False
+		for item in root.traverse():
+			assert os.path.isabs(item.abspath)
+			if '/' in item.path:
+				found_slash = True
+			# END check for slash
+			
+			# slashes in paths are supported as well 
+			assert root[item.path] == item == root/item.path
+		# END for each item
+		assert found_slash
   
-    def test_repr(self):
-        tree = Tree(self.repo, 'abc')
-        assert_equal('<git.Tree "abc">', repr(tree))
+	def test_repr(self):
+		tree = Tree(self.rorepo, 'abc')
+		assert_equal('<git.Tree "abc">', repr(tree))