X-Git-Url: http://git.scottworley.com/tl-append/blobdiff_plain/aacfb261e9aa8c28961adf78b86f293165a71b69..eaaa0046af50c3f918b95be93bfd4315b25690c0:/tl-append-test.c

diff --git a/tl-append-test.c b/tl-append-test.c
index 0867280..3eef960 100644
--- a/tl-append-test.c
+++ b/tl-append-test.c
@@ -1,8 +1,20 @@
 #define _POSIX_C_SOURCE 2
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+struct expectation {
+  const char *message;
+};
+
+const struct expectation END = {NULL};
+static struct expectation expectation(const char *message) {
+  struct expectation exp;
+  exp.message = message;
+  return exp;
+}
+
 static void die(const char *message) {
   fputs(message, stderr);
   fputc('\n', stderr);
@@ -14,7 +26,15 @@ static void die_err(const char *message) {
   exit(1);
 }
 
-static void write_to_tl_append(const char *content) {
+static void remove_logfile() {
+  if (remove("tl.log") != 0) {
+    if (errno != ENOENT) {
+      die_err("Error removing log file");
+    }
+  }
+}
+
+static struct expectation write_to_tl_append(const char *content) {
   FILE *p = popen("./tl-append", "w");
   if (p == NULL)
     die_err("Couldn't run tl-append");
@@ -25,25 +45,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(content);
 }
 
 static void verify_log_contents(const char *contents) {
-  char buf[10];
+  size_t len = strlen(contents);
+  char *buf = (char *)malloc(len + 2);
 
   FILE *f = fopen("tl.log", "r");
   if (f == NULL)
     die_err("Error opening log file");
-  if (fgets(buf, sizeof(buf), f) == NULL)
+  buf[fread(buf, 1, len + 1, f)] = '\0';
+  if (ferror(f))
     die("Error reading log file");
-  if (strncmp(contents, buf, sizeof(buf)) != 0)
+  if (strncmp(contents, buf, len + 1) != 0)
     die("Wrong contents in log file");
   if (fclose(f) != 0)
     die_err("Error closing log file");
+  free(buf);
 }
 
 static void write_and_read_line() {
+  remove_logfile();
   write_to_tl_append("foo\n");
   verify_log_contents("foo\n");
 }
 
-int main() { write_and_read_line(); }
+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");
+}
+
+int main() {
+  write_and_read_line();
+  write_and_read_two_lines();
+}