Fix warnings due to types in test

2 files changed, 54 insertions, 54 deletions

diff --git a/test/test_choices.c b/test/test_choices.c
index 9e0ae7d..3ad7d6a 100644
--- a/test/test_choices.c
+++ b/test/test_choices.c
@@ -8,7 +8,7 @@
 
 #include "greatest/greatest.h"
 
-#define ASSERT_INT_EQ(a,b) ASSERT_EQ_FMT((a), (b), "%d")
+#define ASSERT_SIZE_T_EQ(a,b) ASSERT_EQ_FMT((size_t)(a), (b), "%zu")
 
 static options_t default_options;
 static choices_t choices;
@@ -26,15 +26,15 @@ static void teardown(void *udata) {
 }
 
 TEST test_choices_empty() {
-	ASSERT_INT_EQ(0, choices.size);
-	ASSERT_INT_EQ(0, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.size);
+	ASSERT_SIZE_T_EQ(0, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_prev(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_next(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	PASS();
 }
@@ -43,21 +43,21 @@ TEST test_choices_1() {
 	choices_add(&choices, "tags");
 
 	choices_search(&choices, "");
-	ASSERT_INT_EQ(1, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_search(&choices, "t");
-	ASSERT_INT_EQ(1, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_prev(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_next(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	ASSERT(!strcmp(choices_get(&choices, 0), "tags"));
-	ASSERT_INT_EQ(NULL, choices_get(&choices, 1));
+	ASSERT_EQ(NULL, choices_get(&choices, 1));
 
 	PASS();
 }
@@ -68,40 +68,40 @@ TEST test_choices_2() {
 
 	/* Empty search */
 	choices_search(&choices, "");
-	ASSERT_INT_EQ(0, choices.selection);
-	ASSERT_INT_EQ(2, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(2, choices.available);
 
 	choices_next(&choices);
-	ASSERT_INT_EQ(1, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.selection);
 	choices_next(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_prev(&choices);
-	ASSERT_INT_EQ(1, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.selection);
 	choices_prev(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	/* Filtered search */
 	choices_search(&choices, "te");
-	ASSERT_INT_EQ(1, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 	ASSERT_STR_EQ("test", choices_get(&choices, 0));
 
 	choices_next(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	choices_prev(&choices);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	/* No results */
 	choices_search(&choices, "foobar");
-	ASSERT_INT_EQ(0, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 
 	/* Different order due to scoring */
 	choices_search(&choices, "ts");
-	ASSERT_INT_EQ(2, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(2, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
 	ASSERT_STR_EQ("test", choices_get(&choices, 0));
 	ASSERT_STR_EQ("tags", choices_get(&choices, 1));
 
@@ -111,17 +111,17 @@ TEST test_choices_2() {
 TEST test_choices_without_search() {
 	/* Before a search is run, it should return no results */
 
-	ASSERT_INT_EQ(0, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
-	ASSERT_INT_EQ(0, choices.size);
-	ASSERT_INT_EQ(NULL, choices_get(&choices, 0));
+	ASSERT_SIZE_T_EQ(0, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(0, choices.size);
+	ASSERT_EQ(NULL, choices_get(&choices, 0));
 
 	choices_add(&choices, "test");
 
-	ASSERT_INT_EQ(0, choices.available);
-	ASSERT_INT_EQ(0, choices.selection);
-	ASSERT_INT_EQ(1, choices.size);
-	ASSERT_INT_EQ(NULL, choices_get(&choices, 0));
+	ASSERT_SIZE_T_EQ(0, choices.available);
+	ASSERT_SIZE_T_EQ(0, choices.selection);
+	ASSERT_SIZE_T_EQ(1, choices.size);
+	ASSERT_EQ(NULL, choices_get(&choices, 0));
 
 	PASS();
 }
@@ -146,7 +146,7 @@ TEST test_choices_large_input() {
 	choices_search(&choices, "12");
 
 	/* Must match `seq 0 99999 | grep '.*1.*2.*' | wc -l` */
-	ASSERT_INT_EQ(8146, choices.available);
+	ASSERT_SIZE_T_EQ(8146, choices.available);
 
 	ASSERT_STR_EQ("12", choices_get(&choices, 0));
 
diff --git a/test/test_match.c b/test/test_match.c
index 8d52191..17edba4 100644
--- a/test/test_match.c
+++ b/test/test_match.c
@@ -7,7 +7,7 @@
 
 #define SCORE_TOLERANCE 0.000001
 #define ASSERT_SCORE_EQ(a,b) ASSERT_IN_RANGE((a), (b), SCORE_TOLERANCE)
-#define ASSERT_INT_EQ(a,b) ASSERT_EQ_FMT((a), (b), "%d")
+#define ASSERT_SIZE_T_EQ(a,b) ASSERT_EQ_FMT((size_t)(a), (b), "%zu")
 
 /* has_match(char *needle, char *haystack) */
 TEST exact_match_should_return_true() {
@@ -134,9 +134,9 @@ TEST score_dot() {
 TEST positions_consecutive() {
 	size_t positions[3];
 	match_positions("amo", "app/models/foo", positions);
-	ASSERT_INT_EQ(0, positions[0]);
-	ASSERT_INT_EQ(4, positions[1]);
-	ASSERT_INT_EQ(5, positions[2]);
+	ASSERT_SIZE_T_EQ(0, positions[0]);
+	ASSERT_SIZE_T_EQ(4, positions[1]);
+	ASSERT_SIZE_T_EQ(5, positions[2]);
 
 	PASS();
 }
@@ -148,10 +148,10 @@ TEST positions_start_of_word() {
 	 */
 	size_t positions[4];
 	match_positions("amor", "app/models/order", positions);
-	ASSERT_INT_EQ(0, positions[0]);
-	ASSERT_INT_EQ(4, positions[1]);
-	ASSERT_INT_EQ(11, positions[2]);
-	ASSERT_INT_EQ(12, positions[3]);
+	ASSERT_SIZE_T_EQ(0, positions[0]);
+	ASSERT_SIZE_T_EQ(4, positions[1]);
+	ASSERT_SIZE_T_EQ(11, positions[2]);
+	ASSERT_SIZE_T_EQ(12, positions[3]);
 
 	PASS();
 }
@@ -159,12 +159,12 @@ TEST positions_start_of_word() {
 TEST positions_no_bonuses() {
 	size_t positions[2];
 	match_positions("as", "tags", positions);
-	ASSERT_INT_EQ(1, positions[0]);
-	ASSERT_INT_EQ(3, positions[1]);
+	ASSERT_SIZE_T_EQ(1, positions[0]);
+	ASSERT_SIZE_T_EQ(3, positions[1]);
 
 	match_positions("as", "examples.txt", positions);
-	ASSERT_INT_EQ(2, positions[0]);
-	ASSERT_INT_EQ(7, positions[1]);
+	ASSERT_SIZE_T_EQ(2, positions[0]);
+	ASSERT_SIZE_T_EQ(7, positions[1]);
 
 	PASS();
 }
@@ -172,9 +172,9 @@ TEST positions_no_bonuses() {
 TEST positions_multiple_candidates_start_of_words() {
 	size_t positions[3];
 	match_positions("abc", "a/a/b/c/c", positions);
-	ASSERT_INT_EQ(2, positions[0]);
-	ASSERT_INT_EQ(4, positions[1]);
-	ASSERT_INT_EQ(6, positions[2]);
+	ASSERT_SIZE_T_EQ(2, positions[0]);
+	ASSERT_SIZE_T_EQ(4, positions[1]);
+	ASSERT_SIZE_T_EQ(6, positions[2]);
 
 	PASS();
 }
@@ -182,9 +182,9 @@ TEST positions_multiple_candidates_start_of_words() {
 TEST positions_exact_match() {
 	size_t positions[3];
 	match_positions("foo", "foo", positions);
-	ASSERT_INT_EQ(0, positions[0]);
-	ASSERT_INT_EQ(1, positions[1]);
-	ASSERT_INT_EQ(2, positions[2]);
+	ASSERT_SIZE_T_EQ(0, positions[0]);
+	ASSERT_SIZE_T_EQ(1, positions[1]);
+	ASSERT_SIZE_T_EQ(2, positions[2]);
 
 	PASS();
 }