X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=test%2Fsuites%2Fapi%2Futil.h;h=83be721c3c10aa35f243744c76767b6a63628387;hb=58f9d655358bc0c68bfadbc2946b964c2ac774b7;hp=639a6c4c51f6592648b50ffb98a9a5ebb83b7c4b;hpb=8d75235ff22dc4aced697e198c3c024f1f4b88fe;p=jansson.git

diff --git a/test/suites/api/util.h b/test/suites/api/util.h
index 639a6c4..83be721 100644
--- a/test/suites/api/util.h
+++ b/test/suites/api/util.h
@@ -1,20 +1,55 @@
 /*
- * Copyright (c) 2009, 2010 Petri Lehtinen <petri@digip.org>
+ * Copyright (c) 2009-2011 Petri Lehtinen <petri@digip.org>
  *
  * Jansson is free software; you can redistribute it and/or modify
  * it under the terms of the MIT license. See LICENSE for details.
  */
 
-#ifndef TESTPROGS_UTIL_H
-#define TESTPROGS_UTIL_H
+#ifndef UTIL_H
+#define UTIL_H
 
+#include <stdio.h>
 #include <stdlib.h>
+#include <jansson.h>
+
+#define failhdr fprintf(stderr, "%s:%s:%d: ", __FILE__, __FUNCTION__, __LINE__)
 
 #define fail(msg)                                                \
     do {                                                         \
-        fprintf(stderr, "%s:%s:%d: %s\n",                        \
-                __FILE__, __FUNCTION__, __LINE__, msg);          \
+        failhdr;                                                 \
+        fprintf(stderr, "%s\n", msg);                            \
         exit(1);                                                 \
     } while(0)
 
+/* Assumes json_error_t error */
+#define check_error(text_, source_, line_, column_, position_)          \
+    do {                                                                \
+        if(strcmp(error.text, text_) != 0) {                            \
+            failhdr;                                                    \
+            fprintf(stderr, "text: \"%s\" != \"%s\"\n", error.text, text_); \
+            exit(1);                                                    \
+        }                                                               \
+        if(strcmp(error.source, source_) != 0) {                        \
+            failhdr;                                                    \
+                                                                        \
+            fprintf(stderr, "source: \"%s\" != \"%s\"\n", error.source, source_); \
+            exit(1);                                                    \
+        }                                                               \
+        if(error.line != line_) {                                       \
+            failhdr;                                                    \
+            fprintf(stderr, "line: %d != %d\n", error.line, line_);     \
+            exit(1);                                                    \
+        }                                                               \
+        if(error.column != column_) {                                   \
+            failhdr;                                                    \
+            fprintf(stderr, "column: %d != %d\n", error.column, column_); \
+            exit(1);                                                    \
+        }                                                               \
+        if(error.position != position_) {                               \
+            failhdr;                                                    \
+            fprintf(stderr, "position: %d != %d\n", error.position, position_); \
+            exit(1);                                                    \
+        }                                                               \
+    } while(0)
+
 #endif