X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/27dfbfeb85b47cf506ebae0a760895dd43e2b62d..853b83c48d322e84bc1fffa80255180223cf8aad:/tl-append-test.c

diff --git a/tl-append-test.c b/tl-append-test.c
index 6761b02..3ac174c 100644
--- a/tl-append-test.c
+++ b/tl-append-test.c
@@ -3,6 +3,24 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
+
+typedef struct expectation {
+  time_t a, b;
+  const char *message;
+} ex_t;
+
+const ex_t END = {((time_t)-1), ((time_t)-1), NULL};
+static int is_end(ex_t exp) {
+  return exp.a == END.a && exp.b == END.b && exp.message == END.message;
+}
+static ex_t expectation(time_t a, time_t b, const char *message) {
+  ex_t exp;
+  exp.a = a;
+  exp.b = b;
+  exp.message = message;
+  return exp;
+}
 
 static void die(const char *message) {
   fputs(message, stderr);
@@ -23,7 +41,7 @@ static void remove_logfile() {
   }
 }
 
-static void write_to_tl_append(const char *content) {
+static ex_t write_to_tl_append(const char *content) {
   FILE *p = popen("./tl-append", "w");
   if (p == NULL)
     die_err("Couldn't run tl-append");
@@ -34,34 +52,40 @@ static void write_to_tl_append(const char *content) {
     die_err("Error closing pipe");
   if (status != 0)
     die("tl-append exited abnormally");
+  return expectation((time_t)-1, ((time_t)-1), content);
 }
 
-static void verify_log_contents(const char *contents) {
-  char buf[10];
+static void verify_log_contents(ex_t exps[]) {
 
   FILE *f = fopen("tl.log", "r");
   if (f == NULL)
     die_err("Error opening log file");
-  buf[fread(buf, 1, sizeof(buf), f)] = '\0';
-  if (ferror(f))
-    die("Error reading log file");
-  if (strncmp(contents, buf, sizeof(buf)) != 0)
-    die("Wrong contents in log file");
+  for (size_t i = 0; !is_end(exps[i]); i++) {
+    size_t len = strlen(exps[i].message);
+    char *buf = (char *)malloc(len + 2);
+    if (fgets(buf, len + 1, f) == NULL)
+      die("Error reading log file");
+    if (ferror(f))
+      die("Error reading log file");
+    if (strncmp(exps[i].message, buf, len + 1) != 0)
+      die("Wrong contents in log file");
+    free(buf);
+  }
   if (fclose(f) != 0)
     die_err("Error closing log file");
 }
 
 static void write_and_read_line() {
   remove_logfile();
-  write_to_tl_append("foo\n");
-  verify_log_contents("foo\n");
+  ex_t e = write_to_tl_append("foo\n");
+  verify_log_contents((ex_t[]){e, END});
 }
 
 static void write_and_read_two_lines() {
   remove_logfile();
-  write_to_tl_append("foo\n");
-  write_to_tl_append("bar\n");
-  verify_log_contents("foo\nbar\n");
+  ex_t e1 = write_to_tl_append("foo\n");
+  ex_t e2 = write_to_tl_append("bar\n");
+  verify_log_contents((ex_t[]){e1, e2, END});
 }
 
 int main() {