diff options
author | Carlos Martín Nieto <cmn@dwim.me> | 2014-08-28 13:34:42 +0200 |
---|---|---|
committer | Carlos Martín Nieto <cmn@dwim.me> | 2014-08-28 13:34:42 +0200 |
commit | e07aebb4e2b6ab544153c294914118ae2f2f512c (patch) | |
tree | 65dbbe55c56fdbb04e0133a88d7864f40f49d5dd | |
parent | 844d226c9d3e1b8f1d58c5a5d57148de6c66d0cf (diff) | |
download | libgit2-e07aebb4e2b6ab544153c294914118ae2f2f512c.tar.gz |
Fix ahead-behind tests
The logic was reversed. I have checked manually each pair with git and
adjusted the expectation to what git status prints.
-rw-r--r-- | tests/revwalk/mergebase.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/tests/revwalk/mergebase.c b/tests/revwalk/mergebase.c index 2c7184fc7..8f1f6ef21 100644 --- a/tests/revwalk/mergebase.c +++ b/tests/revwalk/mergebase.c @@ -33,12 +33,12 @@ void test_revwalk_mergebase__single1(void) cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 2); - cl_assert_equal_sz(behind, 1); + cl_assert_equal_sz(ahead, 1); + cl_assert_equal_sz(behind, 2); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &two, &one)); - cl_assert_equal_sz(ahead, 1); - cl_assert_equal_sz(behind, 2); + cl_assert_equal_sz(ahead, 2); + cl_assert_equal_sz(behind, 1); } void test_revwalk_mergebase__single2(void) @@ -54,12 +54,12 @@ void test_revwalk_mergebase__single2(void) cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 4); - cl_assert_equal_sz(behind, 1); - - cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &two, &one)); cl_assert_equal_sz(ahead, 1); cl_assert_equal_sz(behind, 4); + + cl_git_pass(git_graph_ahead_behind( &ahead, &behind, _repo, &two, &one)); + cl_assert_equal_sz(ahead, 4); + cl_assert_equal_sz(behind, 1); } void test_revwalk_mergebase__merged_branch(void) @@ -78,12 +78,12 @@ void test_revwalk_mergebase__merged_branch(void) cl_assert_equal_oid(&expected, &result); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(ahead, 0); - cl_assert_equal_sz(behind, 3); - - cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &two, &one)); cl_assert_equal_sz(ahead, 3); cl_assert_equal_sz(behind, 0); + + cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &two, &one)); + cl_assert_equal_sz(ahead, 0); + cl_assert_equal_sz(behind, 3); } void test_revwalk_mergebase__two_way_merge(void) @@ -95,13 +95,13 @@ void test_revwalk_mergebase__two_way_merge(void) cl_git_pass(git_oid_fromstr(&two, "a953a018c5b10b20c86e69fef55ebc8ad4c5a417")); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo2, &one, &two)); - cl_assert_equal_sz(ahead, 2); - cl_assert_equal_sz(behind, 8); + cl_assert_equal_sz(ahead, 8); + cl_assert_equal_sz(behind, 2); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo2, &two, &one)); - cl_assert_equal_sz(ahead, 8); - cl_assert_equal_sz(behind, 2); + cl_assert_equal_sz(ahead, 2); + cl_assert_equal_sz(behind, 8); } void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void) @@ -119,8 +119,8 @@ void test_revwalk_mergebase__no_common_ancestor_returns_ENOTFOUND(void) cl_assert_equal_i(GIT_ENOTFOUND, error); cl_git_pass(git_graph_ahead_behind(&ahead, &behind, _repo, &one, &two)); - cl_assert_equal_sz(2, ahead); - cl_assert_equal_sz(4, behind); + cl_assert_equal_sz(4, ahead); + cl_assert_equal_sz(2, behind); } void test_revwalk_mergebase__prefer_youngest_merge_base(void) |