Commit 25e8b201 by Ben Straub

Fix broken tests

parent 909f6265
...@@ -364,16 +364,16 @@ void test_checkout_index__wont_notify_of_expected_line_ending_changes(void) ...@@ -364,16 +364,16 @@ void test_checkout_index__wont_notify_of_expected_line_ending_changes(void)
static void progress(const char *path, float progress, void *payload) static void progress(const char *path, float progress, void *payload)
{ {
GIT_UNUSED(path); GIT_UNUSED(progress); GIT_UNUSED(path); GIT_UNUSED(progress);
int *count = (int*)payload; bool *was_called = (bool*)payload;
(*count)++; *was_called = true;
} }
void test_checkout_index__calls_progress_callback(void) void test_checkout_index__calls_progress_callback(void)
{ {
int count = 0; bool was_called = 0;
g_opts.progress_cb = progress; g_opts.progress_cb = progress;
g_opts.progress_payload = &count; g_opts.progress_payload = &was_called;
cl_git_pass(git_checkout_index(g_repo, &g_opts)); cl_git_pass(git_checkout_index(g_repo, &g_opts));
cl_assert_equal_i(count, 5); cl_assert_equal_i(was_called, true);
} }
...@@ -67,17 +67,17 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void) ...@@ -67,17 +67,17 @@ void test_checkout_tree__can_checkout_a_subdirectory_from_a_subtree(void)
static void progress(const char *path, float progress, void *payload) static void progress(const char *path, float progress, void *payload)
{ {
GIT_UNUSED(path); GIT_UNUSED(progress); GIT_UNUSED(path); GIT_UNUSED(progress);
int *count = (int*)payload; bool *was_called = (bool*)payload;
(*count)++; *was_called = true;
} }
void test_checkout_tree__calls_progress_callback(void) void test_checkout_tree__calls_progress_callback(void)
{ {
int count = 0; bool was_called = 0;
g_opts.progress_cb = progress; g_opts.progress_cb = progress;
g_opts.progress_payload = &count; g_opts.progress_payload = &was_called;
cl_git_pass(git_revparse_single(&g_object, g_repo, "master")); cl_git_pass(git_revparse_single(&g_object, g_repo, "master"));
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts)); cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
cl_assert_equal_i(count, 4); cl_assert_equal_i(was_called, true);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment