From 4d0ec07c1a9b34f5e11df598877c36fca1516164 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Mon, 7 Jan 2013 23:44:26 +0100
Subject: [PATCH] make TT_USER > TT_ERR, remove TT_MAX
---
src/Makefile | 1 +
src/hammer.h | 3 +--
src/t_misc.c | 16 ++++++++++++++++
src/test_suite.c | 2 ++
4 files changed, 20 insertions(+), 2 deletions(-)
create mode 100644 src/t_misc.c
diff --git a/src/Makefile b/src/Makefile
index 128de050..47e136df 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -45,6 +45,7 @@ TESTS := t_benchmark.o \
t_bitreader.o \
t_bitwriter.o \
t_parser.o \
+ t_misc.o \
test_suite.o
OUTPUTS := libhammer.a \
diff --git a/src/hammer.h b/src/hammer.h
index 0791769d..5a0c6257 100644
--- a/src/hammer.h
+++ b/src/hammer.h
@@ -43,9 +43,8 @@ typedef enum HTokenType_ {
TT_SINT,
TT_UINT,
TT_SEQUENCE,
- TT_USER = 64,
TT_ERR,
- TT_MAX
+ TT_USER = 64
} HTokenType;
typedef struct HCountedArray_ {
diff --git a/src/t_misc.c b/src/t_misc.c
new file mode 100644
index 00000000..5c08a2eb
--- /dev/null
+++ b/src/t_misc.c
@@ -0,0 +1,16 @@
+#include <glib.h>
+#include "test_suite.h"
+#include "hammer.h"
+
+static void test_tt_user(void) {
+ g_check_cmpint(TT_USER, >, TT_NONE);
+ g_check_cmpint(TT_USER, >, TT_BYTES);
+ g_check_cmpint(TT_USER, >, TT_SINT);
+ g_check_cmpint(TT_USER, >, TT_UINT);
+ g_check_cmpint(TT_USER, >, TT_SEQUENCE);
+ g_check_cmpint(TT_USER, >, TT_ERR);
+}
+
+void register_misc_tests(void) {
+ g_test_add_func("/core/misc/tt_user", test_tt_user);
+}
diff --git a/src/test_suite.c b/src/test_suite.c
index 8d2913a5..e01d020b 100644
--- a/src/test_suite.c
+++ b/src/test_suite.c
@@ -22,6 +22,7 @@
extern void register_bitreader_tests();
extern void register_bitwriter_tests();
extern void register_parser_tests();
+extern void register_misc_tests();
extern void register_benchmark_tests();
int main(int argc, char** argv) {
@@ -31,6 +32,7 @@ int main(int argc, char** argv) {
register_bitreader_tests();
register_bitwriter_tests();
register_parser_tests();
+ register_misc_tests();
register_benchmark_tests();
g_test_run();
--
GitLab