diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-05 09:22:35 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-06-22 17:02:55 +0200 |
| commit | d6073b30f38f95aa25b1545cccac38261b359de1 (patch) | |
| tree | 7a5a84001d63bf1574913757a01c50b14ac85aab /tests/submodule/modify.c | |
| parent | 486ba4cdd3d30c202d0c7ed202d6122a7e2b5164 (diff) | |
| download | libgit2-d6073b30f38f95aa25b1545cccac38261b359de1.tar.gz | |
submodule: make `_set_url()` affect the configuration
With this one, we can get rid of the edit_and_save test.
Diffstat (limited to 'tests/submodule/modify.c')
| -rw-r--r-- | tests/submodule/modify.c | 45 |
1 files changed, 6 insertions, 39 deletions
diff --git a/tests/submodule/modify.c b/tests/submodule/modify.c index d0902b3e1..9c387a3b5 100644 --- a/tests/submodule/modify.c +++ b/tests/submodule/modify.c @@ -185,47 +185,14 @@ void test_submodule_modify__set_branch(void) git_submodule_free(sm); } -void test_submodule_modify__edit_and_save(void) +void test_submodule_modify__set_url(void) { - git_submodule *sm1, *sm2; - char *old_url; - git_repository *r2; - - cl_git_pass(git_submodule_lookup(&sm1, g_repo, "sm_changed_head")); - - old_url = git__strdup(git_submodule_url(sm1)); - - /* modify properties of submodule */ - cl_git_pass(git_submodule_set_url(sm1, SM_LIBGIT2_URL)); - cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm1)); - - /* revert without saving (and confirm setters return old value) */ - cl_git_pass(git_submodule_set_url(sm1, old_url)); - - /* check that revert was successful */ - cl_assert_equal_s(old_url, git_submodule_url(sm1)); - - /* modify properties of submodule (again) */ - cl_git_pass(git_submodule_set_url(sm1, SM_LIBGIT2_URL)); - - /* call save */ - cl_git_pass(git_submodule_save(sm1)); - - /* call reload and check that the new values are loaded */ - cl_git_pass(git_submodule_reload(sm1, 0)); - - cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm1)); - - /* open a second copy of the repo and compare submodule */ - cl_git_pass(git_repository_open(&r2, "submod2")); - cl_git_pass(git_submodule_lookup(&sm2, r2, "sm_changed_head")); - - cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm2)); + git_submodule *sm; - git_submodule_free(sm1); - git_submodule_free(sm2); - git_repository_free(r2); - git__free(old_url); + cl_git_pass(git_submodule_set_url(g_repo, "sm_changed_head", SM_LIBGIT2_URL)); + cl_git_pass(git_submodule_lookup(&sm, g_repo, "sm_changed_head")); + cl_assert_equal_s(SM_LIBGIT2_URL, git_submodule_url(sm)); + git_submodule_free(sm); } void test_submodule_modify__save_last(void) |
