1 files changed, 30 insertions, 8 deletions

diff --git a/test/lexer_test.c b/test/lexer_test.c
index 1fc93cc..4a31bbf 100644
--- a/test/lexer_test.c
+++ b/test/lexer_test.c
@@ -30,18 +30,19 @@ make_lexer_from_static_src(lexer_t *lexer, char *src, int srclen)
 }
 
 void
-assert_tokenize_number(char *str, char *expected)
+assert_token(token_kind_t expected_kind, char *source, char *expected)
 {
 	lexer_t lexer;
 	token_t token;
 
-	make_lexer_from_static_src(&lexer, str, strlen(str));
+	make_lexer_from_static_src(&lexer, source, strlen(source));
 	lexer_next_token(&lexer, &token);
 
 	char actual[token.value.size + 1];
 	string_view_to_str(&token.value, actual);
 
-	assert_string_equal("TOKEN_NUMBER", token_kind_to_str(token.kind));
+	assert_string_equal(token_kind_to_str(expected_kind), token_kind_to_str(token.kind));
+	assert_int(expected_kind, ==, token.kind);
 	assert_string_equal(expected, actual);
 }
 
@@ -49,18 +50,39 @@ static MunitResult
 test_tokenize_number(const  MunitParameter params[],
                      void  *user_data_or_fixture)
 {
-	lexer_t lexer;
-	token_t token;
+	assert_token(TOKEN_NUMBER, "1", "1");
+	assert_token(TOKEN_NUMBER, " 13 ", "13");
+	assert_token(TOKEN_NUMBER, " \n 13 ", "13");
+
+  return MUNIT_OK;
+}
+
+static MunitResult
+test_tokenize_op(const  MunitParameter params[],
+                     void  *user_data_or_fixture)
+{
+	assert_token(TOKEN_OP, "  + 2",  "+");
+	assert_token(TOKEN_OP, "  - \n", "-");
+	assert_token(TOKEN_OP, "  * ;",  "*");
+	assert_token(TOKEN_OP, "  / ",   "/");
 
-	assert_tokenize_number("1", "1");
-	assert_tokenize_number(" 13 ", "13");
-	assert_tokenize_number(" \n 13 ", "13");
+  return MUNIT_OK;
+}
+
+static MunitResult
+test_tokenize_unknown(const  MunitParameter params[],
+                      void  *user_data_or_fixture)
+{
+	assert_token(TOKEN_UNKNOWN, " @ ",  "@");
+	assert_token(TOKEN_UNKNOWN, " $ ",  "$");
 
   return MUNIT_OK;
 }
 
 static MunitTest tests[] = {
   { "/test_tokenize_digit", test_tokenize_number, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL },
+  { "/test_tokenize_op", test_tokenize_op, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL },
+  { "/test_tokenize_unknown", test_tokenize_unknown, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL },
   { NULL, NULL, NULL, NULL, MUNIT_TEST_OPTION_NONE, NULL }
 };