Prep v228: Apply more cosmetic changes found in upstream.

[elogind.git] / src / shared / test-tables.h

diff --git a/src/shared/test-tables.h b/src/shared/test-tables.h
index deebec2ed27630e5748cb55e9e7dda1bf47c4d7c..74f1716fe08ee9af42fc7bd1c6f7bdcd1ceef840 100644 (file)
--- a/src/shared/test-tables.h
+++ b/src/shared/test-tables.h
@@ -26,10 +26,11 @@ typedef int (*reverse_t)(const char*);
 static inline void _test_table(const char *name,
                                lookup_t lookup,
                                reverse_t reverse,
-                               int size) {
+                               int size,
+                               bool sparse) {
         int i;
 
-        for (i = 0; i < size + 1; i++) {
+        for (i = -1; i < size + 1; i++) {
                 const char* val = lookup(i);
                 int rev;
 
@@ -39,10 +40,14 @@ static inline void _test_table(const char *name,
                         rev = reverse("--no-such--value----");
 
                 printf("%s: %d → %s → %d\n", name, i, val, rev);
-                if (i < size ? val == NULL || rev != i : val != NULL || rev != -1)
-                        exit(EXIT_FAILURE);
+                assert_se(!(i >= 0 && i < size ?
+                            sparse ? rev != i && rev != -1 : val == NULL || rev != i :
+                            val != NULL || rev != -1));
         }
 }
 
 #define test_table(lower, upper) \
-        _test_table(STRINGIFY(lower), lower##_to_string, lower##_from_string, _##upper##_MAX)
+        _test_table(STRINGIFY(lower), lower##_to_string, lower##_from_string, _##upper##_MAX, false)
+
+#define test_table_sparse(lower, upper) \
+        _test_table(STRINGIFY(lower), lower##_to_string, lower##_from_string, _##upper##_MAX, true)