diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2013-02-22 14:44:57 +0100 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2013-02-22 15:25:58 +0100 |
| commit | 39bcb4deb816573b8f68154f90288ad1e21e1520 (patch) | |
| tree | bfa763ac294136f843f95fa1a90a7b18c13b50c6 | |
| parent | d788499a102b8b5b02f5d64a6f9bf5c5a7bdb5e3 (diff) | |
| download | libgit2-39bcb4deb816573b8f68154f90288ad1e21e1520.tar.gz | |
stash: Refactor stash::drop tests
| -rw-r--r-- | tests-clar/stash/drop.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c index 16e3d77ac..548addaca 100644 --- a/tests-clar/stash/drop.c +++ b/tests-clar/stash/drop.c @@ -1,6 +1,7 @@ #include "clar_libgit2.h" #include "fileops.h" #include "stash_helpers.h" +#include "refs.h" static git_repository *repo; static git_signature *signature; @@ -24,7 +25,7 @@ void test_stash_drop__cleanup(void) void test_stash_drop__cannot_drop_from_an_empty_stash(void) { - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 0)); + cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); } static void push_three_states(void) @@ -60,9 +61,9 @@ void test_stash_drop__cannot_drop_a_non_existing_stashed_state(void) { push_three_states(); - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 666)); - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 42)); - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 3)); + cl_git_fail_with(git_stash_drop(repo, 666), GIT_ENOTFOUND); + cl_git_fail_with(git_stash_drop(repo, 42), GIT_ENOTFOUND); + cl_git_fail_with(git_stash_drop(repo, 3), GIT_ENOTFOUND); } void test_stash_drop__can_purge_the_stash_from_the_top(void) @@ -73,7 +74,7 @@ void test_stash_drop__can_purge_the_stash_from_the_top(void) cl_git_pass(git_stash_drop(repo, 0)); cl_git_pass(git_stash_drop(repo, 0)); - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 0)); + cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); } void test_stash_drop__can_purge_the_stash_from_the_bottom(void) @@ -84,7 +85,7 @@ void test_stash_drop__can_purge_the_stash_from_the_bottom(void) cl_git_pass(git_stash_drop(repo, 1)); cl_git_pass(git_stash_drop(repo, 0)); - cl_assert_equal_i(GIT_ENOTFOUND, git_stash_drop(repo, 0)); + cl_git_fail_with(git_stash_drop(repo, 0), GIT_ENOTFOUND); } void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) @@ -97,7 +98,7 @@ void test_stash_drop__dropping_an_entry_rewrites_reflog_history(void) push_three_states(); - cl_git_pass(git_reference_lookup(&stash, repo, "refs/stash")); + cl_git_pass(git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)); cl_git_pass(git_reflog_read(&reflog, stash)); entry = git_reflog_entry_byindex(reflog, 1); @@ -126,12 +127,13 @@ void test_stash_drop__dropping_the_last_entry_removes_the_stash(void) push_three_states(); - cl_git_pass(git_reference_lookup(&stash, repo, "refs/stash")); + cl_git_pass(git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE)); git_reference_free(stash); cl_git_pass(git_stash_drop(repo, 0)); cl_git_pass(git_stash_drop(repo, 0)); cl_git_pass(git_stash_drop(repo, 0)); - cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&stash, repo, "refs/stash")); + cl_git_fail_with( + git_reference_lookup(&stash, repo, GIT_REFS_STASH_FILE), GIT_ENOTFOUND); } |