X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Ftesting.h;h=d3da9db42863e6083b68d83202c9e50c99d61eb7;hp=5df1b83a3e0f076b3a35bff53df09b021b9a0ea5;hb=da11ce02eb202b3e01d3e2d1b40f248a84430973;hpb=7bfda8d327240ac73297e4449663814dd0594be5

diff --git a/src/testing.h b/src/testing.h
index 5df1b83a..d3da9db4 100644
--- a/src/testing.h
+++ b/src/testing.h
@@ -1,6 +1,6 @@
 /**
  * collectd - src/tests/macros.h
- * Copyright (C) 2013       Florian octo Forster
+ * Copyright (C) 2013-2015  Florian octo Forster
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -24,44 +24,112 @@
  *   Florian octo Forster <octo at collectd.org>
  */
 
+#ifndef TESTING_H
+#define TESTING_H 1
+
+#include <inttypes.h>
+
 static int fail_count__ = 0;
 static int check_count__ = 0;
 
-#define DEF_TEST(func) static int test_##func ()
+#ifndef DBL_PRECISION
+#define DBL_PRECISION 1e-12
+#endif
+
+#define DEF_TEST(func) static int test_##func(void)
 
-#define RUN_TEST(func) do { \
-  int status; \
-  printf ("Testing %s ...\n", #func); \
-  status = test_ ## func (); \
-  printf ("%s.\n", (status == 0) ? "Success" : "FAILURE"); \
-  if (status != 0) { fail_count__++; } \
-} while (0)
+#define RUN_TEST(func)                                                         \
+  do {                                                                         \
+    int status;                                                                \
+    printf("Testing %s ...\n", #func);                                         \
+    status = test_##func();                                                    \
+    printf("%s.\n", (status == 0) ? "Success" : "FAILURE");                    \
+    if (status != 0) {                                                         \
+      fail_count__++;                                                          \
+    }                                                                          \
+  } while (0)
 
-#define END_TEST exit ((fail_count__ == 0) ? 0 : 1);
+#define END_TEST exit((fail_count__ == 0) ? 0 : 1);
 
-#define OK1(cond, text) do { \
-  _Bool result = (cond); \
-  printf ("%s %i - %s\n", result ? "ok" : "not ok", ++check_count__, text); \
-} while (0)
+#define LOG(result, text)                                                      \
+  printf("%s %i - %s\n", result ? "ok" : "not ok", ++check_count__, text)
+
+#define OK1(cond, text)                                                        \
+  do {                                                                         \
+    _Bool result = (cond);                                                     \
+    LOG(result, text);                                                         \
+    if (!result) {                                                             \
+      return -1;                                                               \
+    }                                                                          \
+  } while (0)
 #define OK(cond) OK1(cond, #cond)
 
-#define STREQ(expect, actual) do { \
-  if (strcmp (expect, actual) != 0) { \
-    printf ("not ok %i - %s incorrect: expected \"%s\", got \"%s\"\n", \
-        ++check_count__, #actual, expect, actual); \
-    return (-1); \
-  } \
-  printf ("ok %i - %s evaluates to \"%s\"\n", ++check_count__, #actual, expect); \
-} while (0)
-
-#define CHECK_NOT_NULL(expr) do { \
-  void *ptr_; \
-  ptr_ = (expr); \
-  OK1(ptr_ != NULL, #expr); \
-} while (0)
-
-#define CHECK_ZERO(expr) do { \
-  long status_; \
-  status_ = (long) (expr); \
-  OK1(status_ == 0L, #expr); \
-} while (0)
+#define EXPECT_EQ_STR(expect, actual)                                          \
+  do {                                                                         \
+    /* Evaluate 'actual' only once. */                                         \
+    const char *got__ = actual;                                                \
+    if (strcmp(expect, got__) != 0) {                                          \
+      printf("not ok %i - %s = \"%s\", want \"%s\"\n", ++check_count__,        \
+             #actual, got__, expect);                                          \
+      return -1;                                                               \
+    }                                                                          \
+    printf("ok %i - %s = \"%s\"\n", ++check_count__, #actual, got__);          \
+  } while (0)
+
+#define EXPECT_EQ_INT(expect, actual)                                          \
+  do {                                                                         \
+    int want__ = (int)expect;                                                  \
+    int got__ = (int)actual;                                                   \
+    if (got__ != want__) {                                                     \
+      printf("not ok %i - %s = %d, want %d\n", ++check_count__, #actual,       \
+             got__, want__);                                                   \
+      return -1;                                                               \
+    }                                                                          \
+    printf("ok %i - %s = %d\n", ++check_count__, #actual, got__);              \
+  } while (0)
+
+#define EXPECT_EQ_UINT64(expect, actual)                                       \
+  do {                                                                         \
+    uint64_t want__ = (uint64_t)expect;                                        \
+    uint64_t got__ = (uint64_t)actual;                                         \
+    if (got__ != want__) {                                                     \
+      printf("not ok %i - %s = %" PRIu64 ", want %" PRIu64 "\n",               \
+             ++check_count__, #actual, got__, want__);                         \
+      return -1;                                                               \
+    }                                                                          \
+    printf("ok %i - %s = %" PRIu64 "\n", ++check_count__, #actual, got__);     \
+  } while (0)
+
+#define EXPECT_EQ_DOUBLE(expect, actual)                                       \
+  do {                                                                         \
+    double want__ = (double)expect;                                            \
+    double got__ = (double)actual;                                             \
+    if ((isnan(want__) && !isnan(got__)) ||                                    \
+        (!isnan(want__) && isnan(got__))) {                                    \
+      printf("not ok %i - %s = %.15g, want %.15g\n", ++check_count__, #actual, \
+             got__, want__);                                                   \
+      return -1;                                                               \
+    } else if (!isnan(want__) && (((want__ - got__) < -DBL_PRECISION) ||       \
+                                  ((want__ - got__) > DBL_PRECISION))) {       \
+      printf("not ok %i - %s = %.15g, want %.15g\n", ++check_count__, #actual, \
+             got__, want__);                                                   \
+      return -1;                                                               \
+    }                                                                          \
+    printf("ok %i - %s = %.15g\n", ++check_count__, #actual, got__);           \
+  } while (0)
+
+#define CHECK_NOT_NULL(expr)                                                   \
+  do {                                                                         \
+    void *ptr_;                                                                \
+    ptr_ = (expr);                                                             \
+    OK1(ptr_ != NULL, #expr);                                                  \
+  } while (0)
+
+#define CHECK_ZERO(expr)                                                       \
+  do {                                                                         \
+    long status_;                                                              \
+    status_ = (long)(expr);                                                    \
+    OK1(status_ == 0L, #expr);                                                 \
+  } while (0)
+
+#endif /* TESTING_H */