summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2019-01-19 01:36:40 +0000
committerGitHub <noreply@github.com>2019-01-19 01:36:40 +0000
commitb2c2dc643b2bd3d440a25a2ce3d64427dc28d4de (patch)
tree771ce3175bd58276ae06a6908dd6d54a3a847f95 /tests
parentc352e5617ac56feec258e9a094460aa4da6e00ec (diff)
parent83151018ef0228b53739cbc2bc785a673752c349 (diff)
downloadlibgit2-b2c2dc643b2bd3d440a25a2ce3d64427dc28d4de.tar.gz
Merge pull request #4940 from libgit2/ethomson/git_obj
More `git_obj` to `git_object` updates
Diffstat (limited to 'tests')
-rw-r--r--tests/object/raw/data.h2
-rw-r--r--tests/object/raw/type2string.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/object/raw/data.h b/tests/object/raw/data.h
index 07ace60fc..57431e70e 100644
--- a/tests/object/raw/data.h
+++ b/tests/object/raw/data.h
@@ -319,5 +319,5 @@ static git_rawobj some_obj = {
static git_rawobj junk_obj = {
NULL,
0,
- GIT_OBJECT_BAD
+ GIT_OBJECT_INVALID
};
diff --git a/tests/object/raw/type2string.c b/tests/object/raw/type2string.c
index 0c2070500..ebd81f552 100644
--- a/tests/object/raw/type2string.c
+++ b/tests/object/raw/type2string.c
@@ -6,7 +6,7 @@
void test_object_raw_type2string__convert_type_to_string(void)
{
- cl_assert_equal_s(git_object_type2string(GIT_OBJECT_BAD), "");
+ cl_assert_equal_s(git_object_type2string(GIT_OBJECT_INVALID), "");
cl_assert_equal_s(git_object_type2string(0), ""); /* EXT1 */
cl_assert_equal_s(git_object_type2string(GIT_OBJECT_COMMIT), "commit");
cl_assert_equal_s(git_object_type2string(GIT_OBJECT_TREE), "tree");
@@ -23,8 +23,8 @@ void test_object_raw_type2string__convert_type_to_string(void)
void test_object_raw_type2string__convert_string_to_type(void)
{
- cl_assert(git_object_string2type(NULL) == GIT_OBJECT_BAD);
- cl_assert(git_object_string2type("") == GIT_OBJECT_BAD);
+ cl_assert(git_object_string2type(NULL) == GIT_OBJECT_INVALID);
+ cl_assert(git_object_string2type("") == GIT_OBJECT_INVALID);
cl_assert(git_object_string2type("commit") == GIT_OBJECT_COMMIT);
cl_assert(git_object_string2type("tree") == GIT_OBJECT_TREE);
cl_assert(git_object_string2type("blob") == GIT_OBJECT_BLOB);
@@ -32,13 +32,13 @@ void test_object_raw_type2string__convert_string_to_type(void)
cl_assert(git_object_string2type("OFS_DELTA") == GIT_OBJECT_OFS_DELTA);
cl_assert(git_object_string2type("REF_DELTA") == GIT_OBJECT_REF_DELTA);
- cl_assert(git_object_string2type("CoMmIt") == GIT_OBJECT_BAD);
- cl_assert(git_object_string2type("hohoho") == GIT_OBJECT_BAD);
+ cl_assert(git_object_string2type("CoMmIt") == GIT_OBJECT_INVALID);
+ cl_assert(git_object_string2type("hohoho") == GIT_OBJECT_INVALID);
}
void test_object_raw_type2string__check_type_is_loose(void)
{
- cl_assert(git_object_typeisloose(GIT_OBJECT_BAD) == 0);
+ cl_assert(git_object_typeisloose(GIT_OBJECT_INVALID) == 0);
cl_assert(git_object_typeisloose(0) == 0); /* EXT1 */
cl_assert(git_object_typeisloose(GIT_OBJECT_COMMIT) == 1);
cl_assert(git_object_typeisloose(GIT_OBJECT_TREE) == 1);