Commit fdaa924037b66ee898fab503836a3d67194efacc
2012-01-11T15:25:13
Fix up status tests
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/tests/t18-status.c b/tests/t18-status.c
index 3799dc2..270aa7b 100644
--- a/tests/t18-status.c
+++ b/tests/t18-status.c
@@ -64,6 +64,7 @@ END_TEST
static const char *entry_paths0[] = {
"file_deleted",
+ "ignored_file",
"modified_file",
"new_file",
"staged_changes",
@@ -82,6 +83,7 @@ static const char *entry_paths0[] = {
static const unsigned int entry_statuses0[] = {
GIT_STATUS_WT_DELETED,
+ GIT_STATUS_IGNORED,
GIT_STATUS_WT_MODIFIED,
GIT_STATUS_WT_NEW,
GIT_STATUS_INDEX_MODIFIED,
@@ -98,7 +100,7 @@ static const unsigned int entry_statuses0[] = {
GIT_STATUS_WT_NEW,
};
-#define ENTRY_COUNT0 14
+#define ENTRY_COUNT0 15
struct status_entry_counts {
int wrong_status_flags_count;
@@ -185,6 +187,7 @@ END_TEST
static const char *entry_paths2[] = {
"current_file",
"file_deleted",
+ "ignored_file",
"modified_file",
"staged_changes",
"staged_changes_file_deleted",
@@ -202,6 +205,7 @@ static const char *entry_paths2[] = {
static const unsigned int entry_statuses2[] = {
GIT_STATUS_WT_DELETED,
GIT_STATUS_WT_DELETED,
+ GIT_STATUS_IGNORED,
GIT_STATUS_WT_DELETED,
GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED,
GIT_STATUS_WT_DELETED | GIT_STATUS_INDEX_MODIFIED,
@@ -216,7 +220,7 @@ static const unsigned int entry_statuses2[] = {
GIT_STATUS_WT_DELETED,
};
-#define ENTRY_COUNT2 14
+#define ENTRY_COUNT2 15
BEGIN_TEST(statuscb2, "test retrieving status for a purged worktree of an valid repository")
git_repository *repo;
@@ -261,6 +265,7 @@ static const char *entry_paths3[] = {
"current_file/modified_file",
"current_file/new_file",
"file_deleted",
+ "ignored_file",
"modified_file",
"new_file",
"staged_changes",
@@ -286,6 +291,7 @@ static const unsigned int entry_statuses3[] = {
GIT_STATUS_WT_NEW,
GIT_STATUS_WT_NEW,
GIT_STATUS_WT_DELETED,
+ GIT_STATUS_IGNORED,
GIT_STATUS_WT_MODIFIED,
GIT_STATUS_WT_NEW,
GIT_STATUS_INDEX_MODIFIED,
@@ -302,7 +308,7 @@ static const unsigned int entry_statuses3[] = {
GIT_STATUS_WT_DELETED,
};
-#define ENTRY_COUNT3 22
+#define ENTRY_COUNT3 23
BEGIN_TEST(statuscb3, "test retrieving status for a worktree where a file and a subdir have been renamed and some files have been added")
git_repository *repo;