status test: always test the new file path

This commit is contained in:
Edward Thomson 2015-03-31 16:06:33 -04:00 committed by Edward Thomson
parent 64842d8756
commit f286e2715d

View File

@ -73,16 +73,20 @@ static void check_status(
cl_assert_equal_i_fmt(expected->status, actual->status, "%04x"); cl_assert_equal_i_fmt(expected->status, actual->status, "%04x");
if (oldname) if (expected->oldname) {
cl_assert(git__strcmp(oldname, expected->oldname) == 0); cl_assert(oldname != NULL);
else cl_assert_equal_s(oldname, expected->oldname);
cl_assert(expected->oldname == NULL); } else {
cl_assert(oldname == NULL);
}
if (actual->status & (GIT_STATUS_INDEX_RENAMED|GIT_STATUS_WT_RENAMED)) { if (actual->status & (GIT_STATUS_INDEX_RENAMED|GIT_STATUS_WT_RENAMED)) {
if (newname) if (expected->newname) {
cl_assert(git__strcmp(newname, expected->newname) == 0); cl_assert(newname != NULL);
else cl_assert_equal_s(newname, expected->newname);
cl_assert(expected->newname == NULL); } else {
cl_assert(newname == NULL);
}
} }
} }
} }