diff options
author | Sebastian Thiel <byronimo@gmail.com> | 2009-10-12 14:56:47 +0200 |
---|---|---|
committer | Sebastian Thiel <byronimo@gmail.com> | 2009-10-12 14:56:47 +0200 |
commit | 637eadce54ca8bbe536bcf7c570c025e28e47129 (patch) | |
tree | c8691e6358e2b626b42c19bb6bb893e83464b40c /test | |
parent | f2834177c0fdf6b1af659e460fd3348f468b8ab0 (diff) | |
download | gitpython-637eadce54ca8bbe536bcf7c570c025e28e47129.tar.gz |
renamed from_string and list_from_string to _from_string and _list_from_string to indicate their new status as private method, adjusted all callers respectively
Diffstat (limited to 'test')
-rw-r--r-- | test/git/test_actor.py | 8 | ||||
-rw-r--r-- | test/git/test_commit.py | 2 | ||||
-rw-r--r-- | test/git/test_diff.py | 4 | ||||
-rw-r--r-- | test/git/test_stats.py | 4 | ||||
-rw-r--r-- | test/git/test_tree.py | 8 |
5 files changed, 13 insertions, 13 deletions
diff --git a/test/git/test_actor.py b/test/git/test_actor.py index ae4da507..b7c2af7c 100644 --- a/test/git/test_actor.py +++ b/test/git/test_actor.py @@ -10,19 +10,19 @@ from git import * class TestActor(object): def test_from_string_should_separate_name_and_email(self): - a = Actor.from_string("Michael Trier <mtrier@example.com>") + a = Actor._from_string("Michael Trier <mtrier@example.com>") assert_equal("Michael Trier", a.name) assert_equal("mtrier@example.com", a.email) def test_from_string_should_handle_just_name(self): - a = Actor.from_string("Michael Trier") + a = Actor._from_string("Michael Trier") assert_equal("Michael Trier", a.name) assert_equal(None, a.email) def test_should_display_representation(self): - a = Actor.from_string("Michael Trier <mtrier@example.com>") + a = Actor._from_string("Michael Trier <mtrier@example.com>") assert_equal('<git.Actor "Michael Trier <mtrier@example.com>">', repr(a)) def test_str_should_alias_name(self): - a = Actor.from_string("Michael Trier <mtrier@example.com>") + a = Actor._from_string("Michael Trier <mtrier@example.com>") assert_equal(a.name, str(a))
\ No newline at end of file diff --git a/test/git/test_commit.py b/test/git/test_commit.py index 71dad562..fa49821d 100644 --- a/test/git/test_commit.py +++ b/test/git/test_commit.py @@ -216,7 +216,7 @@ class TestCommit(object): bisect_all=True) assert_true(git.called) - commits = Commit.list_from_string(self.repo, revs) + commits = Commit._list_from_string(self.repo, revs) expected_ids = ( 'cf37099ea8d1d8c7fbf9b6d12d7ec0249d3acb8b', '33ebe7acec14b25c5f84f35a664803fcab2f7781', diff --git a/test/git/test_diff.py b/test/git/test_diff.py index b9834879..b2339455 100644 --- a/test/git/test_diff.py +++ b/test/git/test_diff.py @@ -13,13 +13,13 @@ class TestDiff(object): def test_list_from_string_new_mode(self): output = fixture('diff_new_mode') - diffs = Diff.list_from_string(self.repo, output) + diffs = Diff._list_from_string(self.repo, output) assert_equal(1, len(diffs)) assert_equal(10, len(diffs[0].diff.splitlines())) def test_diff_with_rename(self): output = fixture('diff_rename') - diffs = Diff.list_from_string(self.repo, output) + diffs = Diff._list_from_string(self.repo, output) assert_equal(1, len(diffs)) diff --git a/test/git/test_stats.py b/test/git/test_stats.py index 0063bb2d..706f29a4 100644 --- a/test/git/test_stats.py +++ b/test/git/test_stats.py @@ -11,9 +11,9 @@ class TestStats(object): def setup(self): self.repo = Repo(GIT_REPO) - def test_list_from_string(self): + def test__list_from_string(self): output = fixture('diff_numstat') - stats = Stats.list_from_string(self.repo, output) + stats = Stats._list_from_string(self.repo, output) assert_equal(2, stats.total['files']) assert_equal(52, stats.total['lines']) diff --git a/test/git/test_tree.py b/test/git/test_tree.py index 50d34006..cb8ebb04 100644 --- a/test/git/test_tree.py +++ b/test/git/test_tree.py @@ -27,7 +27,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 +37,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 +47,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') |