1 files changed, 54 insertions, 72 deletions

diff --git a/tests/fstree_from_file.c b/tests/fstree_from_file.c
index 34215c9..c00cabf 100644
--- a/tests/fstree_from_file.c
+++ b/tests/fstree_from_file.c
@@ -7,108 +7,90 @@
 #include "config.h"
 
 #include "fstree.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
+#include "test.h"
 
 #define STR(x) #x
 #define STRVALUE(x) STR(x)
 
 #define TEST_PATH STRVALUE(TESTPATH)
 
-static FILE *open_read(const char *path)
-{
-	FILE *fp = fopen(path, "rb");
-
-	if (fp == NULL) {
-		perror(path);
-		exit(EXIT_FAILURE);
-	}
-
-	return fp;
-}
-
 int main(void)
 {
 	tree_node_t *n;
 	fstree_t fs;
 	FILE *fp;
 
-	fp = open_read(TEST_PATH);
-	assert(fp != NULL);
+	fp = test_open_read(TEST_PATH);
 
-	assert(fstree_init(&fs, NULL) == 0);
-	assert(fstree_from_file(&fs, "testfile", fp) == 0);
+	TEST_ASSERT(fstree_init(&fs, NULL) == 0);
+	TEST_ASSERT(fstree_from_file(&fs, "testfile", fp) == 0);
 
 	fstree_post_process(&fs);
 	n = fs.root->data.dir.children;
 
-	assert(fs.root->link_count == 9);
+	TEST_EQUAL_UI(fs.root->link_count, 9);
 
-	assert(n->mode == (S_IFBLK | 0600));
-	assert(n->uid == 8);
-	assert(n->gid == 9);
-	assert(n->link_count == 1);
-	assert(strcmp(n->name, "blkdev") == 0);
-	assert(n->data.devno == makedev(42, 21));
+	TEST_EQUAL_UI(n->mode, S_IFBLK | 0600);
+	TEST_EQUAL_UI(n->uid, 8);
+	TEST_EQUAL_UI(n->gid, 9);
+	TEST_EQUAL_UI(n->link_count, 1);
+	TEST_STR_EQUAL(n->name, "blkdev");
+	TEST_EQUAL_UI(n->data.devno, makedev(42, 21));
 
 	n = n->next;
-	assert(n->mode == (S_IFCHR | 0600));
-	assert(n->uid == 6);
-	assert(n->gid == 7);
-	assert(n->link_count == 1);
-	assert(strcmp(n->name, "chardev") == 0);
-	assert(n->data.devno == makedev(13, 37));
+	TEST_EQUAL_UI(n->mode, S_IFCHR | 0600);
+	TEST_EQUAL_UI(n->uid, 6);
+	TEST_EQUAL_UI(n->gid, 7);
+	TEST_EQUAL_UI(n->link_count, 1);
+	TEST_STR_EQUAL(n->name, "chardev");
+	TEST_EQUAL_UI(n->data.devno, makedev(13, 37));
 
 	n = n->next;
-	assert(n->mode == (S_IFDIR | 0755));
-	assert(n->uid == 4);
-	assert(n->gid == 5);
-	assert(n->link_count == 2);
-	assert(strcmp(n->name, "dir") == 0);
-	assert(n->data.dir.children == NULL);
+	TEST_EQUAL_UI(n->mode, S_IFDIR | 0755);
+	TEST_EQUAL_UI(n->uid, 4);
+	TEST_EQUAL_UI(n->gid, 5);
+	TEST_EQUAL_UI(n->link_count, 2);
+	TEST_STR_EQUAL(n->name, "dir");
+	TEST_NULL(n->data.dir.children);
 
 	n = n->next;
-	assert(n->mode == (S_IFDIR | 0755));
-	assert(n->uid == 0);
-	assert(n->gid == 0);
-	assert(n->link_count == 3);
-	assert(strcmp(n->name, "foo bar") == 0);
-	assert(n->data.dir.children != NULL);
-
-	assert(n->data.dir.children->next == NULL);
-	assert(n->data.dir.children->mode == (S_IFDIR | 0755));
-	assert(n->data.dir.children->uid == 0);
-	assert(n->data.dir.children->gid == 0);
-	assert(n->data.dir.children->link_count == 2);
-	assert(strcmp(n->data.dir.children->name, " test \"") == 0);
-	assert(n->data.dir.children->data.dir.children == NULL);
+	TEST_EQUAL_UI(n->mode, S_IFDIR | 0755);
+	TEST_EQUAL_UI(n->uid, 0);
+	TEST_EQUAL_UI(n->gid, 0);
+	TEST_EQUAL_UI(n->link_count, 3);
+	TEST_STR_EQUAL(n->name, "foo bar");
+	TEST_NOT_NULL(n->data.dir.children);
+
+	TEST_NULL(n->data.dir.children->next);
+	TEST_EQUAL_UI(n->data.dir.children->mode, S_IFDIR | 0755);
+	TEST_EQUAL_UI(n->data.dir.children->uid, 0);
+	TEST_EQUAL_UI(n->data.dir.children->gid, 0);
+	TEST_EQUAL_UI(n->data.dir.children->link_count, 2);
+	TEST_STR_EQUAL(n->data.dir.children->name, " test \"");
+	TEST_NULL(n->data.dir.children->data.dir.children);
 
 	n = n->next;
-	assert(n->mode == (S_IFIFO | 0644));
-	assert(n->uid == 10);
-	assert(n->gid == 11);
-	assert(n->link_count == 1);
-	assert(strcmp(n->name, "pipe") == 0);
+	TEST_EQUAL_UI(n->mode, S_IFIFO | 0644);
+	TEST_EQUAL_UI(n->uid, 10);
+	TEST_EQUAL_UI(n->gid, 11);
+	TEST_EQUAL_UI(n->link_count, 1);
+	TEST_STR_EQUAL(n->name, "pipe");
 
 	n = n->next;
-	assert(n->mode == (S_IFLNK | 0777));
-	assert(n->uid == 2);
-	assert(n->gid == 3);
-	assert(n->link_count == 1);
-	assert(strcmp(n->name, "slink") == 0);
-	fprintf(stderr, "'%s'\n", n->data.target);
-	assert(strcmp(n->data.target, "slinktarget") == 0);
+	TEST_EQUAL_UI(n->mode, S_IFLNK | 0777);
+	TEST_EQUAL_UI(n->uid, 2);
+	TEST_EQUAL_UI(n->gid, 3);
+	TEST_EQUAL_UI(n->link_count, 1);
+	TEST_STR_EQUAL(n->name, "slink");
+	TEST_STR_EQUAL(n->data.target, "slinktarget");
 
 	n = n->next;
-	assert(n->mode == (S_IFSOCK | 0555));
-	assert(n->uid == 12);
-	assert(n->gid == 13);
-	assert(n->link_count == 1);
-	assert(strcmp(n->name, "sock") == 0);
-	assert(n->next == NULL);
+	TEST_EQUAL_UI(n->mode, S_IFSOCK | 0555);
+	TEST_EQUAL_UI(n->uid, 12);
+	TEST_EQUAL_UI(n->gid, 13);
+	TEST_EQUAL_UI(n->link_count, 1);
+	TEST_STR_EQUAL(n->name, "sock");
+	TEST_NULL(n->next);
 
 	fclose(fp);
 	fstree_cleanup(&fs);