summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/git/test_repo.py6
-rw-r--r--test/git/test_tree.py68
-rw-r--r--test/testlib/__init__.py1
3 files changed, 48 insertions, 27 deletions
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
index e999ffe8..7f87f78b 100644
--- a/test/git/test_repo.py
+++ b/test/git/test_repo.py
@@ -93,8 +93,8 @@ class TestRepo(object):
tree = self.repo.tree(Head(self.repo, 'master'))
- assert_equal(4, len([c for c in tree.values() if isinstance(c, Blob)]))
- assert_equal(3, len([c for c in tree.values() if isinstance(c, Tree)]))
+ assert_equal(4, len([c for c in tree if isinstance(c, Blob)]))
+ assert_equal(3, len([c for c in tree if isinstance(c, Tree)]))
assert_true(git.called)
@@ -102,7 +102,7 @@ class TestRepo(object):
def test_blob(self, git):
git.return_value = fixture('cat_file_blob')
- blob = self.repo.blob("abc")
+ blob = Blob(self.repo,"abc")
assert_equal("Hello world", blob.data)
assert_true(git.called)
diff --git a/test/git/test_tree.py b/test/git/test_tree.py
index cb8ebb04..e0429db1 100644
--- a/test/git/test_tree.py
+++ b/test/git/test_tree.py
@@ -7,19 +7,20 @@
from test.testlib import *
from git import *
-class TestTree(object):
- def setup(self):
+class TestTree(TestCase):
+
+ def setUp(self):
self.repo = Repo(GIT_REPO)
@patch_object(Git, '_call_process')
def test_contents_should_cache(self, git):
git.return_value = fixture('ls_tree_a') + fixture('ls_tree_b')
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
child = tree['grit']
- child.items()
- child.items()
+ len(child)
+ len(child)
assert_true(git.called)
assert_equal(2, git.call_count)
@@ -27,7 +28,7 @@ class TestTree(object):
def test_content_from_string_tree_should_return_tree(self):
text = fixture('ls_tree_a').splitlines()[-1]
- tree = Tree.content__from_string(None, text)
+ tree = Tree.content_from_string(None, text)
assert_equal(Tree, tree.__class__)
assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id)
@@ -37,7 +38,7 @@ class TestTree(object):
def test_content_from_string_tree_should_return_blob(self):
text = fixture('ls_tree_b').split("\n")[0]
- tree = Tree.content__from_string(None, text)
+ tree = Tree.content_from_string(None, text)
assert_equal(Blob, tree.__class__)
assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id)
@@ -47,12 +48,12 @@ class TestTree(object):
def test_content_from_string_tree_should_return_commit(self):
text = fixture('ls_tree_commit').split("\n")[1]
- tree = Tree.content__from_string(None, text)
+ tree = Tree.content_from_string(None, text)
assert_none(tree)
@raises(TypeError)
def test_content_from_string_invalid_type_should_raise(self):
- Tree.content__from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test")
+ Tree.content_from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test")
@patch_object(Blob, 'size')
@patch_object(Git, '_call_process')
@@ -60,13 +61,37 @@ class TestTree(object):
git.return_value = fixture('ls_tree_a')
blob.return_value = 1
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', (tree/'lib').id)
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
+
+ def test_traverse(self):
+ root = self.repo.tree()
+ 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(max_depth=0)))
+
+ # only choose trees
+ trees_only = lambda i: 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) ))
+
+ # 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 )
@patch_object(Blob, 'size')
@patch_object(Git, '_call_process')
@@ -74,26 +99,24 @@ class TestTree(object):
git.return_value = fixture('ls_tree_a')
blob.return_value = 0
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
assert_not_none(tree/'README.txt')
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
@patch_object(Git, '_call_process')
def test_slash_with_commits(self, git):
git.return_value = fixture('ls_tree_commit')
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
- assert_none(tree/'bar')
+ self.failUnlessRaises(KeyError, tree.__div__, 'bar')
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id)
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
@patch_object(Blob, 'size')
@patch_object(Git, '_call_process')
@@ -101,13 +124,12 @@ class TestTree(object):
git.return_value = fixture('ls_tree_a')
blob.return_value = 1
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', tree['lib'].id)
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
@patch_object(Blob, 'size')
@patch_object(Git, '_call_process')
@@ -115,33 +137,31 @@ class TestTree(object):
git.return_value = fixture('ls_tree_a')
blob.return_value = 0
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
assert_not_none(tree['README.txt'])
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
@patch_object(Git, '_call_process')
def test_dict_with_commits(self, git):
git.return_value = fixture('ls_tree_commit')
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
- assert_none(tree.get('bar'))
+ self.failUnlessRaises(KeyError, tree.__getitem__, 'bar')
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', tree['foo'].id)
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', tree['baz'].id)
assert_true(git.called)
- assert_equal(git.call_args, (('ls_tree', 'master'), {}))
@patch_object(Git, '_call_process')
@raises(KeyError)
def test_dict_with_non_existant_file(self, git):
git.return_value = fixture('ls_tree_commit')
- tree = self.repo.tree('master')
+ tree = self.repo.tree(Head(self.repo,'master'))
tree['bar']
def test_repr(self):
diff --git a/test/testlib/__init__.py b/test/testlib/__init__.py
index 2133eb8c..f364171b 100644
--- a/test/testlib/__init__.py
+++ b/test/testlib/__init__.py
@@ -8,6 +8,7 @@ import inspect
from mock import *
from asserts import *
from helper import *
+from unittest import TestCase
__all__ = [ name for name, obj in locals().items()
if not (name.startswith('_') or inspect.ismodule(obj)) ]
View Lorry Controller Status