1 files changed, 18 insertions, 21 deletions

diff --git a/tests/fstree_init.c b/tests/fstree_init.c
index 3a526d1..5970159 100644
--- a/tests/fstree_init.c
+++ b/tests/fstree_init.c
@@ -8,11 +8,7 @@
 
 #include "fstree.h"
 #include "internal.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
+#include "test.h"
 
 int main(void)
 {
@@ -20,32 +16,33 @@ int main(void)
 	char *str;
 
 	str = strdup("mtime=1337,uid=1000,gid=100,mode=0321");
-	assert(str != NULL);
-	assert(fstree_init(&fs, str) == 0);
+	TEST_NOT_NULL(str);
+	TEST_ASSERT(fstree_init(&fs, str) == 0);
 	free(str);
-	assert(fs.defaults.st_mtime == 1337);
-	assert(fs.defaults.st_uid == 1000);
-	assert(fs.defaults.st_gid == 100);
-	assert(fs.defaults.st_mode == (S_IFDIR | 0321));
+	TEST_EQUAL_UI(fs.defaults.st_mtime, 1337);
+	TEST_EQUAL_UI(fs.defaults.st_uid, 1000);
+	TEST_EQUAL_UI(fs.defaults.st_gid, 100);
+	TEST_EQUAL_UI(fs.defaults.st_mode, S_IFDIR | 0321);
 	fstree_cleanup(&fs);
 
-	assert(fstree_init(&fs, NULL) == 0);
-	assert(fs.defaults.st_mtime == 0 ||
-	       fs.defaults.st_mtime == get_source_date_epoch());
-	assert(fs.defaults.st_uid == 0);
-	assert(fs.defaults.st_gid == 0);
-	assert(fs.defaults.st_mode == (S_IFDIR | 0755));
+	TEST_ASSERT(fstree_init(&fs, NULL) == 0);
+	if (fs.defaults.st_mtime != 0) {
+		TEST_EQUAL_UI(fs.defaults.st_mtime, get_source_date_epoch());
+	}
+	TEST_EQUAL_UI(fs.defaults.st_uid, 0);
+	TEST_EQUAL_UI(fs.defaults.st_gid, 0);
+	TEST_EQUAL_UI(fs.defaults.st_mode, S_IFDIR | 0755);
 	fstree_cleanup(&fs);
 
 	str = strdup("mode=07777");
-	assert(str != NULL);
-	assert(fstree_init(&fs, str) == 0);
+	TEST_NOT_NULL(str);
+	TEST_ASSERT(fstree_init(&fs, str) == 0);
 	free(str);
 	fstree_cleanup(&fs);
 
 	str = strdup("mode=017777");
-	assert(str != NULL);
-	assert(fstree_init(&fs, str) != 0);
+	TEST_NOT_NULL(str);
+	TEST_ASSERT(fstree_init(&fs, str) != 0);
 	free(str);
 
 	return EXIT_SUCCESS;