rollback strvec to previous version

[protos/libecoli.git] / lib / ecoli_test.h

diff --git a/lib/ecoli_test.h b/lib/ecoli_test.h
index 45d1d4e..1cebe95 100644 (file)
--- a/lib/ecoli_test.h
+++ b/lib/ecoli_test.h
@@ -31,11 +31,13 @@
 #include <sys/queue.h>
 
 #include <ecoli_log.h>
-#include <ecoli_tk.h>
+#include <ecoli_node.h>
 
-#define EC_REGISTER_TEST(t)                                            \
-       static void ec_init_##t(void);                                  \
-       static void __attribute__((constructor, used)) ec_init_##t(void) \
+// XXX check if already exists?
+#define EC_TEST_REGISTER(t)                                            \
+       static void ec_test_init_##t(void);                             \
+       static void __attribute__((constructor, used))                  \
+       ec_test_init_##t(void)                                          \
        {                                                               \
                 ec_test_register(&t);                                  \
        }
@@ -66,39 +68,40 @@ struct ec_test {
 void ec_test_register(struct ec_test *test);
 
 int ec_test_all(void);
-
-int ec_test_check_tk_parse(const struct ec_tk *tk, const char *input,
-       const char *expected);
-
-#define TEST_ERR()                                                     \
-       ec_log(EC_LOG_ERR, "%s:%d: error: test failed\n",               \
-               __FILE__, __LINE__);                                    \
-
-#define EC_TEST_CHECK_TK_PARSE(tk, input, expected) ({                 \
-       int ret = ec_test_check_tk_parse(tk, input, expected);          \
-       if (ret)                                                        \
-               TEST_ERR();                                             \
-       ret;                                                            \
-})
-
-int ec_test_check_tk_complete(const struct ec_tk *tk, const char *input,
-       const char *expected);
-
-#define EC_TEST_CHECK_TK_COMPLETE(tk, input, expected) ({              \
-       int ret = ec_test_check_tk_complete(tk, input, expected);       \
-       if (ret)                                                        \
-               TEST_ERR();                                             \
-       ret;                                                            \
+int ec_test_one(const char *name);
+
+/* expected == -1 means no match */
+int ec_test_check_parse(struct ec_node *node, int expected, ...);
+
+#define EC_TEST_ERR(fmt, ...)                                          \
+       EC_LOG(EC_LOG_ERR, "%s:%d: error: " fmt "\n",                   \
+               __FILE__, __LINE__, ##__VA_ARGS__);                     \
+
+/* XXX this is not an assert, it does not abort */
+#define EC_TEST_ASSERT_STR(cond, fmt, ...)                             \
+       do {                                                            \
+               if (!(cond))                                            \
+                       EC_TEST_ERR("assert failure: (" #cond ") " fmt, \
+                               ##__VA_ARGS__);                         \
+       } while (0)
+
+#define EC_TEST_ASSERT(cond) EC_TEST_ASSERT_STR(cond, "")
+
+/* node, input, [expected1, expected2, ...] */
+#define EC_TEST_CHECK_PARSE(node, args...) ({                          \
+       int ret_ = ec_test_check_parse(node, args, EC_NODE_ENDLIST);    \
+       if (ret_)                                                       \
+               EC_TEST_ERR("parse test failed");                       \
+       ret_;                                                           \
 })
 
-int ec_test_check_tk_complete_list(const struct ec_tk *tk,
-       const char *input, ...);
+int ec_test_check_complete(struct ec_node *node, ...);
 
-#define EC_TEST_CHECK_TK_COMPLETE_LIST(tk, input, expected...) ({      \
-       int ret = ec_test_check_tk_complete_list(tk, input, expected);  \
-       if (ret)                                                        \
-               TEST_ERR();                                             \
-       ret;                                                            \
+#define EC_TEST_CHECK_COMPLETE(node, args...) ({                       \
+       int ret_ = ec_test_check_complete(node, args);                  \
+       if (ret_)                                                       \
+               EC_TEST_ERR("complete test failed");                    \
+       ret_;                                                           \
 })
 
 #endif