Commit 491fda11a89617a2b7425458111eecf0903c2fdb
2023-02-02T20:23:00
test
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
diff --git a/test/sym_test.c b/test/sym_test.c
index 8531034..b966e2e 100644
--- a/test/sym_test.c
+++ b/test/sym_test.c
@@ -18,18 +18,30 @@
#include "../libc3/sym.h"
#include "test.h"
-const s_sym * sym_test_1_test (const s8 *p)
+#define SYM_TEST_INSPECT(test, result) \
+ do { \
+ const s_sym *sym; \
+ s_str str; \
+ assert(test); \
+ assert(result); \
+ test_context("sym_inspect(" # test ") -> " # result); \
+ sym = sym_1(test); \
+ TEST_EQ(sym_inspect(sym, &str), &str); \
+ TEST_STRNCMP(str.ptr.p, (result), str.size); \
+ str_clean(&str); \
+ test_context(NULL); \
+ } while (0)
+
+void sym_test_1 ();
+const s_sym * sym_test_1_test (const s8 *p);
+void sym_test_inspect ();
+
+
+void sym_test ()
{
- uw len;
- const s_sym *sym;
- len = strlen(p);
- TEST_ASSERT((sym = sym_1(p)));
- TEST_EQ(sym->str.size, len);
- TEST_EQ(strncmp(p, sym->str.ptr.p, len), 0);
- TEST_EQ(sym_1(p), sym_1(p));
- return sym;
+ sym_test_1();
+ sym_test_inspect();
}
-
void sym_test_1 ()
{
const s_sym *mod;
@@ -81,26 +93,18 @@ void sym_test_1 ()
sym_test_1_test("éoà \n\r\t\v\"");
}
-void sym_test_delete_all ()
+const s_sym * sym_test_1_test (const s8 *p)
{
- sym_delete_all();
- test_ok();
+ uw len;
+ const s_sym *sym;
+ len = strlen(p);
+ TEST_ASSERT((sym = sym_1(p)));
+ TEST_EQ(sym->str.size, len);
+ TEST_EQ(strncmp(p, sym->str.ptr.p, len), 0);
+ TEST_EQ(sym_1(p), sym_1(p));
+ return sym;
}
-#define SYM_TEST_INSPECT(test, result) \
- do { \
- const s_sym *sym; \
- s_str str; \
- assert(test); \
- assert(result); \
- test_context("sym_inspect(" # test ") -> " # result); \
- sym = sym_1(test); \
- TEST_EQ(sym_inspect(sym, &str), &str); \
- TEST_STRNCMP(str.ptr.p, (result), str.size); \
- str_clean(&str); \
- test_context(NULL); \
- } while (0)
-
void sym_test_inspect ()
{
SYM_TEST_INSPECT("", ":\"\"");
@@ -138,12 +142,3 @@ void sym_test_inspect ()
SYM_TEST_INSPECT("éoà \n\r\t\v\"",
":\"éoà \\n\\r\\t\\v\\\"\"");
}
-
-void sym_test ()
-{
- sym_test_delete_all();
- sym_test_1();
- sym_test_delete_all();
- sym_test_inspect();
- sym_test_delete_all();
-}
diff --git a/test/tuple_test.c b/test/tuple_test.c
index 0d8e08e..4e45272 100644
--- a/test/tuple_test.c
+++ b/test/tuple_test.c
@@ -114,32 +114,32 @@ void tuple_test_init_clean ()
void tuple_test_init_1 ()
{
- TUPLE_TEST_INIT_1("{a, b}");
- TUPLE_TEST_INIT_1("{a, b, c}");
- TUPLE_TEST_INIT_1("{a, b, c, d}");
- TUPLE_TEST_INIT_1("{{a, b}, {c, d}}");
- TUPLE_TEST_INIT_1("{{a, b}, {c, d}, {e, f}}");
- TUPLE_TEST_INIT_1("{{a, b}, {c, d}, {e, f}, {g, h}}");
- TUPLE_TEST_INIT_1("{{a, b}, {c, d}, {e, f}, {g, h}, {i, j}}");
+ TUPLE_TEST_INIT_1("{:a, :b}");
+ TUPLE_TEST_INIT_1("{:a, :b, :c}");
+ TUPLE_TEST_INIT_1("{:a, :b, :c, :d}");
+ TUPLE_TEST_INIT_1("{:{:a, :b}, :{:c, :d}}");
+ TUPLE_TEST_INIT_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}}");
+ TUPLE_TEST_INIT_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}, :{:g, :h}}");
+ TUPLE_TEST_INIT_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}, :{:g, :h}, :{:i, :j}}");
}
void tuple_test_inspect ()
{
- TUPLE_TEST_INSPECT("{a, b}", "{a, b}");
- TUPLE_TEST_INSPECT("{{a, b}, {c, d}}", "{{a, b}, {c, d}}");
- TUPLE_TEST_INSPECT("{{a, b}, {c, d}, {e, f}}",
- "{{a, b}, {c, d}, {e, f}}");
+ TUPLE_TEST_INSPECT("{:a, :b}", "{:a, :b}");
+ TUPLE_TEST_INSPECT("{{:a, :b}, {:c, :d}}", "{{:a, :b}, {:c, :d}}");
+ TUPLE_TEST_INSPECT("{{:a, :b}, {:c, :d}, {:e, :f}}",
+ "{{:a, :b}, {:c, :d}, {:e, :f}}");
}
void tuple_test_new_1 ()
{
- TUPLE_TEST_NEW_1("{a, b}");
- TUPLE_TEST_NEW_1("{a, b, c}");
- TUPLE_TEST_NEW_1("{a, b, c, d}");
- TUPLE_TEST_NEW_1("{{a, b}, {c, d}}");
- TUPLE_TEST_NEW_1("{{a, b}, {c, d}, {e, f}}");
- TUPLE_TEST_NEW_1("{{a, b}, {c, d}, {e, f}, {g, h}}");
- TUPLE_TEST_NEW_1("{{a, b}, {c, d}, {e, f}, {g, h}, {i, j}}");
+ TUPLE_TEST_NEW_1("{:a, :b}");
+ TUPLE_TEST_NEW_1("{:a, :b, :c}");
+ TUPLE_TEST_NEW_1("{:a, :b, :c, :d}");
+ TUPLE_TEST_NEW_1("{:{:a, :b}, :{:c, :d}}");
+ TUPLE_TEST_NEW_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}}");
+ TUPLE_TEST_NEW_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}, :{:g, :h}}");
+ TUPLE_TEST_NEW_1("{:{:a, :b}, :{:c, :d}, :{:e, :f}, :{:g, :h}, :{:i, :j}}");
}
void tuple_test_new_delete ()