Commit 39bcb4deb816573b8f68154f90288ad1e21e1520
2013-02-22T14:44:57
stash: Refactor stash::drop 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 77
diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c
index 16e3d77..548adda 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);
}