summaryrefslogtreecommitdiff
path: root/tests-clar
diff options
context:
space:
mode:
Diffstat (limited to 'tests-clar')
-rw-r--r--tests-clar/checkout/tree.c7
-rw-r--r--tests-clar/clone/nonetwork.c10
-rw-r--r--tests-clar/refs/revparse.c138
-rw-r--r--tests-clar/stash/drop.c10
-rw-r--r--tests-clar/stash/save.c13
5 files changed, 112 insertions, 66 deletions
diff --git a/tests-clar/checkout/tree.c b/tests-clar/checkout/tree.c
index 5a2eacea1..0748b22e0 100644
--- a/tests-clar/checkout/tree.c
+++ b/tests-clar/checkout/tree.c
@@ -30,7 +30,6 @@ void test_checkout_tree__cannot_checkout_a_non_treeish(void)
{
/* blob */
cl_git_pass(git_revparse_single(&g_object, g_repo, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"));
-
cl_git_fail(git_checkout_tree(g_repo, g_object, NULL));
}
@@ -283,8 +282,7 @@ void test_checkout_tree__can_checkout_with_pattern(void)
g_opts.checkout_strategy =
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED;
- cl_git_pass(git_revparse_single(&g_object, g_repo,
- "8496071c1b46c854b31185ea97743be6a8774479"));
+ cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
cl_git_pass(
@@ -323,8 +321,7 @@ void test_checkout_tree__can_disable_pattern_match(void)
g_opts.checkout_strategy =
GIT_CHECKOUT_FORCE | GIT_CHECKOUT_REMOVE_UNTRACKED;
- cl_git_pass(git_revparse_single(&g_object, g_repo,
- "8496071c1b46c854b31185ea97743be6a8774479"));
+ cl_git_pass(git_revparse_single(&g_object, g_repo, "8496071c1b46c854b31185ea97743be6a8774479"));
cl_git_pass(git_checkout_tree(g_repo, g_object, &g_opts));
cl_git_pass(
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index 2c4cba4eb..c4b482234 100644
--- a/tests-clar/clone/nonetwork.c
+++ b/tests-clar/clone/nonetwork.c
@@ -214,23 +214,23 @@ void test_clone_nonetwork__can_checkout_given_branch(void)
void test_clone_nonetwork__can_detached_head(void)
{
- git_object *commit;
+ git_object *obj;
git_repository *cloned;
git_reference *cloned_head;
cl_git_pass(git_clone(&g_repo, cl_git_fixture_url("testrepo.git"), "./foo", &g_options));
- cl_git_pass(git_revparse_single(&commit, g_repo, "master~1"));
- cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(commit)));
+ cl_git_pass(git_revparse_single(&obj, g_repo, "master~1"));
+ cl_git_pass(git_repository_set_head_detached(g_repo, git_object_id(obj)));
cl_git_pass(git_clone(&cloned, "./foo", "./foo1", &g_options));
cl_assert(git_repository_head_detached(cloned));
cl_git_pass(git_repository_head(&cloned_head, cloned));
- cl_assert(!git_oid_cmp(git_object_id(commit), git_reference_target(cloned_head)));
+ cl_assert(!git_oid_cmp(git_object_id(obj), git_reference_target(cloned_head)));
- git_commit_free((git_commit*)commit);
+ git_object_free(obj);
git_reference_free(cloned_head);
git_repository_free(cloned);
diff --git a/tests-clar/refs/revparse.c b/tests-clar/refs/revparse.c
index 66ee391a7..74472b175 100644
--- a/tests-clar/refs/revparse.c
+++ b/tests-clar/refs/revparse.c
@@ -27,6 +27,37 @@ static void test_object_inrepo(const char *spec, const char *expected_oid, git_r
git_object_free(obj);
}
+static void test_id_inrepo(
+ const char *spec,
+ const char *expected_left,
+ const char *expected_right,
+ git_revparse_mode_t expected_flags,
+ git_repository *repo)
+{
+ git_revspec revspec;
+ int error = git_revparse(&revspec, repo, spec);
+
+ if (expected_left) {
+ char str[64] = {0};
+ cl_assert_equal_i(0, error);
+ git_oid_fmt(str, git_object_id(revspec.from));
+ cl_assert_equal_s(str, expected_left);
+ git_object_free(revspec.from);
+ } else {
+ cl_assert_equal_i(GIT_ENOTFOUND, error);
+ }
+
+ if (expected_right) {
+ char str[64] = {0};
+ git_oid_fmt(str, git_object_id(revspec.to));
+ cl_assert_equal_s(str, expected_right);
+ git_object_free(revspec.to);
+ }
+
+ if (expected_flags)
+ cl_assert_equal_i(expected_flags, revspec.flags);
+}
+
static void test_object(const char *spec, const char *expected_oid)
{
test_object_inrepo(spec, expected_oid, g_repo);
@@ -35,30 +66,38 @@ static void test_object(const char *spec, const char *expected_oid)
static void test_rangelike(const char *rangelike,
const char *expected_left,
const char *expected_right,
- int expected_threedots)
+ git_revparse_mode_t expected_revparseflags)
{
char objstr[64] = {0};
- git_object *left = NULL, *right = NULL;
- int threedots;
+ git_revspec revspec;
int error;
- error = git_revparse_rangelike(&left, &right, &threedots, g_repo, rangelike);
+ error = git_revparse(&revspec, g_repo, rangelike);
if (expected_left != NULL) {
cl_assert_equal_i(0, error);
- cl_assert_equal_i(threedots, expected_threedots);
- git_oid_fmt(objstr, git_object_id(left));
+ cl_assert_equal_i(revspec.flags, expected_revparseflags);
+ git_oid_fmt(objstr, git_object_id(revspec.from));
cl_assert_equal_s(objstr, expected_left);
- git_oid_fmt(objstr, git_object_id(right));
+ git_oid_fmt(objstr, git_object_id(revspec.to));
cl_assert_equal_s(objstr, expected_right);
} else
cl_assert(error != 0);
- git_object_free(left);
- git_object_free(right);
+ git_object_free(revspec.from);
+ git_object_free(revspec.to);
}
+static void test_id(
+ const char *spec,
+ const char *expected_left,
+ const char *expected_right,
+ git_revparse_mode_t expected_flags)
+{
+ test_id_inrepo(spec, expected_left, expected_right, expected_flags, g_repo);
+}
+
void test_refs_revparse__initialize(void)
{
cl_git_pass(git_repository_open(&g_repo, cl_fixture("testrepo.git")));
@@ -76,7 +115,7 @@ void test_refs_revparse__nonexistant_object(void)
test_object("this-does-not-exist~2", NULL);
}
-static void assert_invalid_spec(const char *invalid_spec)
+static void assert_invalid_single_spec(const char *invalid_spec)
{
cl_assert_equal_i(
GIT_EINVALIDSPEC, git_revparse_single(&g_obj, g_repo, invalid_spec));
@@ -84,9 +123,9 @@ static void assert_invalid_spec(const char *invalid_spec)
void test_refs_revparse__invalid_reference_name(void)
{
- assert_invalid_spec("this doesn't make sense");
- assert_invalid_spec("Inv@{id");
- assert_invalid_spec("");
+ assert_invalid_single_spec("this doesn't make sense");
+ assert_invalid_single_spec("Inv@{id");
+ assert_invalid_single_spec("");
}
void test_refs_revparse__shas(void)
@@ -125,11 +164,11 @@ void test_refs_revparse__describe_output(void)
void test_refs_revparse__nth_parent(void)
{
- assert_invalid_spec("be3563a^-1");
- assert_invalid_spec("^");
- assert_invalid_spec("be3563a^{tree}^");
- assert_invalid_spec("point_to_blob^{blob}^");
- assert_invalid_spec("this doesn't make sense^1");
+ assert_invalid_single_spec("be3563a^-1");
+ assert_invalid_single_spec("^");
+ assert_invalid_single_spec("be3563a^{tree}^");
+ assert_invalid_single_spec("point_to_blob^{blob}^");
+ assert_invalid_single_spec("this doesn't make sense^1");
test_object("be3563a^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
test_object("be3563a^", "9fd738e8f7967c078dceed8190330fc8648ee56a");
@@ -156,7 +195,7 @@ void test_refs_revparse__not_tag(void)
void test_refs_revparse__to_type(void)
{
- assert_invalid_spec("wrapped_tag^{trip}");
+ assert_invalid_single_spec("wrapped_tag^{trip}");
test_object("point_to_blob^{commit}", NULL);
cl_assert_equal_i(
GIT_EAMBIGUOUS, git_revparse_single(&g_obj, g_repo, "wrapped_tag^{blob}"));
@@ -169,15 +208,15 @@ void test_refs_revparse__to_type(void)
void test_refs_revparse__linear_history(void)
{
- assert_invalid_spec("~");
+ assert_invalid_single_spec("~");
test_object("foo~bar", NULL);
- assert_invalid_spec("master~bar");
- assert_invalid_spec("master~-1");
- assert_invalid_spec("master~0bar");
- assert_invalid_spec("this doesn't make sense~2");
- assert_invalid_spec("be3563a^{tree}~");
- assert_invalid_spec("point_to_blob^{blob}~");
+ assert_invalid_single_spec("master~bar");
+ assert_invalid_single_spec("master~-1");
+ assert_invalid_single_spec("master~0bar");
+ assert_invalid_single_spec("this doesn't make sense~2");
+ assert_invalid_single_spec("be3563a^{tree}~");
+ assert_invalid_single_spec("point_to_blob^{blob}~");
test_object("master~0", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750");
test_object("master~1", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -188,10 +227,10 @@ void test_refs_revparse__linear_history(void)
void test_refs_revparse__chaining(void)
{
- assert_invalid_spec("master@{0}@{0}");
- assert_invalid_spec("@{u}@{-1}");
- assert_invalid_spec("@{-1}@{-1}");
- assert_invalid_spec("@{-3}@{0}");
+ assert_invalid_single_spec("master@{0}@{0}");
+ assert_invalid_single_spec("@{u}@{-1}");
+ assert_invalid_single_spec("@{-1}@{-1}");
+ assert_invalid_single_spec("@{-3}@{0}");
test_object("master@{0}~1^1", "9fd738e8f7967c078dceed8190330fc8648ee56a");
test_object("@{u}@{0}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -207,8 +246,8 @@ void test_refs_revparse__chaining(void)
void test_refs_revparse__upstream(void)
{
- assert_invalid_spec("e90810b@{u}");
- assert_invalid_spec("refs/tags/e90810b@{u}");
+ assert_invalid_single_spec("e90810b@{u}");
+ assert_invalid_single_spec("refs/tags/e90810b@{u}");
test_object("refs/heads/e90810b@{u}", NULL);
test_object("master@{upstream}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -220,7 +259,7 @@ void test_refs_revparse__upstream(void)
void test_refs_revparse__ordinal(void)
{
- assert_invalid_spec("master@{-2}");
+ assert_invalid_single_spec("master@{-2}");
/* TODO: make the test below actually fail
* cl_git_fail(git_revparse_single(&g_obj, g_repo, "master@{1a}"));
@@ -242,9 +281,9 @@ void test_refs_revparse__ordinal(void)
void test_refs_revparse__previous_head(void)
{
- assert_invalid_spec("@{-xyz}");
- assert_invalid_spec("@{-0}");
- assert_invalid_spec("@{-1b}");
+ assert_invalid_single_spec("@{-xyz}");
+ assert_invalid_single_spec("@{-0}");
+ assert_invalid_single_spec("@{-1b}");
test_object("@{-42}", NULL);
@@ -304,7 +343,7 @@ void test_refs_revparse__revwalk(void)
{
test_object("master^{/not found in any commit}", NULL);
test_object("master^{/merge}", NULL);
- assert_invalid_spec("master^{/((}");
+ assert_invalid_single_spec("master^{/((}");
test_object("master^{/anoth}", "5b5b025afb0b4c913b4c338a42934a3863bf3644");
test_object("master^{/Merge}", "be3563ae3f795b2b4353bcce3a527ad0a4f7f644");
@@ -385,8 +424,8 @@ void test_refs_revparse__date(void)
void test_refs_revparse__colon(void)
{
- assert_invalid_spec(":/");
- assert_invalid_spec("point_to_blob:readme.txt");
+ assert_invalid_single_spec(":/");
+ assert_invalid_single_spec("point_to_blob:readme.txt");
cl_git_fail(git_revparse_single(&g_obj, g_repo, ":2:README")); /* Not implemented */
test_object(":/not found in any commit", NULL);
@@ -627,15 +666,32 @@ void test_refs_revparse__try_to_retrieve_branch_before_abbrev_sha(void)
void test_refs_revparse__range(void)
{
+ assert_invalid_single_spec("be3563a^1..be3563a");
+
test_rangelike("be3563a^1..be3563a",
"9fd738e8f7967c078dceed8190330fc8648ee56a",
"be3563ae3f795b2b4353bcce3a527ad0a4f7f644",
- 0);
+ GIT_REVPARSE_RANGE);
test_rangelike("be3563a^1...be3563a",
"9fd738e8f7967c078dceed8190330fc8648ee56a",
"be3563ae3f795b2b4353bcce3a527ad0a4f7f644",
- 1);
+ GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
test_rangelike("be3563a^1.be3563a", NULL, NULL, 0);
}
+
+void test_refs_revparse__parses_range_operator(void)
+{
+ test_id("HEAD", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750", NULL, GIT_REVPARSE_SINGLE);
+ test_id("HEAD~3..HEAD",
+ "4a202b346bb0fb0db7eff3cffeb3c70babbd2045",
+ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+ GIT_REVPARSE_RANGE);
+
+ test_id("HEAD~3...HEAD",
+ "4a202b346bb0fb0db7eff3cffeb3c70babbd2045",
+ "a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
+ GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
+}
+
diff --git a/tests-clar/stash/drop.c b/tests-clar/stash/drop.c
index d171390da..12f922630 100644
--- a/tests-clar/stash/drop.c
+++ b/tests-clar/stash/drop.c
@@ -146,8 +146,6 @@ void retrieve_top_stash_id(git_oid *out)
cl_git_pass(git_reference_name_to_id(out, repo, GIT_REFS_STASH_FILE));
cl_assert_equal_i(true, git_oid_cmp(out, git_object_id(top_stash)) == 0);
-
- git_object_free(top_stash);
}
void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void)
@@ -160,15 +158,11 @@ void test_stash_drop__dropping_the_top_stash_updates_the_stash_reference(void)
retrieve_top_stash_id(&oid);
cl_git_pass(git_revparse_single(&next_top_stash, repo, "stash@{1}"));
- cl_assert_equal_i(
- false, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
+ cl_assert_equal_i(false, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
cl_git_pass(git_stash_drop(repo, 0));
retrieve_top_stash_id(&oid);
- cl_assert_equal_i(
- true, git_oid_cmp(&oid, git_object_id(next_top_stash)) == 0);
-
- git_object_free(next_top_stash);
+ cl_git_pass(git_oid_cmp(&oid, git_object_id(next_top_stash)));
}
diff --git a/tests-clar/stash/save.c b/tests-clar/stash/save.c
index 588dfc3ea..eae116ac5 100644
--- a/tests-clar/stash/save.c
+++ b/tests-clar/stash/save.c
@@ -37,10 +37,10 @@ void test_stash_save__cleanup(void)
static void assert_object_oid(const char* revision, const char* expected_oid, git_otype type)
{
- git_object *object;
int result;
+ git_object *obj;
- result = git_revparse_single(&object, repo, revision);
+ result = git_revparse_single(&obj, repo, revision);
if (!expected_oid) {
cl_assert_equal_i(GIT_ENOTFOUND, result);
@@ -48,10 +48,9 @@ static void assert_object_oid(const char* revision, const char* expected_oid, gi
} else
cl_assert_equal_i(0, result);
- cl_assert_equal_i(type, git_object_type(object));
- cl_git_pass(git_oid_streq(git_object_id(object), expected_oid));
-
- git_object_free(object);
+ cl_git_pass(git_oid_streq(git_object_id(obj), expected_oid));
+ cl_assert_equal_i(type, git_object_type(obj));
+ git_object_free(obj);
}
static void assert_blob_oid(const char* revision, const char* expected_oid)
@@ -147,7 +146,7 @@ static void assert_commit_message_contains(const char *revision, const char *fra
{
git_commit *commit;
- cl_git_pass(git_revparse_single(((git_object **)&commit), repo, revision));
+ cl_git_pass(git_revparse_single((git_object**)&commit, repo, revision));
cl_assert(strstr(git_commit_message(commit), fragment) != NULL);
View Lorry Controller Status