Commit 99d9d9a470ca9b693f6dbee05f1cfcd98a5d148d
2015-10-26T17:44:36
merge: improve test names in recursive merge tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76
diff --git a/tests/merge/trees/recursive.c b/tests/merge/trees/recursive.c
index cd87967..bff5d7e 100644
--- a/tests/merge/trees/recursive.c
+++ b/tests/merge/trees/recursive.c
@@ -18,7 +18,7 @@ void test_merge_trees_recursive__cleanup(void)
cl_git_sandbox_cleanup();
}
-void test_merge_trees_recursive__one(void)
+void test_merge_trees_recursive__one_base_commit(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -39,7 +39,7 @@ void test_merge_trees_recursive__one(void)
git_index_free(index);
}
-void test_merge_trees_recursive__one_norecursive(void)
+void test_merge_trees_recursive__one_base_commit_norecursive(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -62,7 +62,7 @@ void test_merge_trees_recursive__one_norecursive(void)
git_index_free(index);
}
-void test_merge_trees_recursive__two(void)
+void test_merge_trees_recursive__two_base_commits(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -83,7 +83,7 @@ void test_merge_trees_recursive__two(void)
git_index_free(index);
}
-void test_merge_trees_recursive__two_norecursive(void)
+void test_merge_trees_recursive__two_base_commits_norecursive(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -108,7 +108,7 @@ void test_merge_trees_recursive__two_norecursive(void)
git_index_free(index);
}
-void test_merge_trees_recursive__three(void)
+void test_merge_trees_recursive__two_levels_of_multiple_bases(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -129,7 +129,7 @@ void test_merge_trees_recursive__three(void)
git_index_free(index);
}
-void test_merge_trees_recursive__three_norecursive(void)
+void test_merge_trees_recursive__two_levels_of_multiple_bases_norecursive(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -154,7 +154,7 @@ void test_merge_trees_recursive__three_norecursive(void)
git_index_free(index);
}
-void test_merge_trees_recursive__four(void)
+void test_merge_trees_recursive__three_levels_of_multiple_bases(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
@@ -175,7 +175,7 @@ void test_merge_trees_recursive__four(void)
git_index_free(index);
}
-void test_merge_trees_recursive__four_norecursive(void)
+void test_merge_trees_recursive__three_levels_of_multiple_bases_norecursive(void)
{
git_index *index;
git_merge_options opts = GIT_MERGE_OPTIONS_INIT;