about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am1
-rw-r--r--tests/test_parser.c314
-rw-r--r--tests/test_parser.h41
-rw-r--r--tests/testsuite.c45
4 files changed, 221 insertions, 180 deletions
diff --git a/Makefile.am b/Makefile.am
index c2c9f53e..7f4ff20b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,6 +85,7 @@ test_sources = \
 	tests/test_command.c \
 	tests/test_history.c \
 	tests/test_jid.c \
+	tests/test_parser.c \
     tests/testsuite.c
 
 main_source = src/main.c
diff --git a/tests/test_parser.c b/tests/test_parser.c
index 6295aafd..49fc4354 100644
--- a/tests/test_parser.c
+++ b/tests/test_parser.c
@@ -1,493 +1,449 @@
+#include <stdarg.h>
+#include <stddef.h>
+#include <setjmp.h>
+#include <cmocka.h>
 #include <stdlib.h>
-#include <string.h>
-#include <head-unit.h>
+
 #include "tools/parser.h"
 
 void
-parse_null_returns_null(void)
+parse_null_returns_null(void **state)
 {
     char *inp = NULL;
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_empty_returns_null(void)
+parse_empty_returns_null(void **state)
 {
     char *inp = "";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_space_returns_null(void)
+parse_space_returns_null(void **state)
 {
     char *inp = "   ";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_cmd_no_args_returns_null(void)
+parse_cmd_no_args_returns_null(void **state)
 {
     char *inp = "/cmd";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_space_returns_null(void)
+parse_cmd_with_space_returns_null(void **state)
 {
     char *inp = "/cmd   ";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_too_few_returns_null(void)
+parse_cmd_with_too_few_returns_null(void **state)
 {
     char *inp = "/cmd arg1";
     gchar **result = parse_args(inp, 2, 3);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_too_many_returns_null(void)
+parse_cmd_with_too_many_returns_null(void **state)
 {
     char *inp = "/cmd arg1 arg2 arg3 arg4";
     gchar **result = parse_args(inp, 1, 3);
 
-    assert_is_null(result);
+    assert_null(result);
     g_strfreev(result);
 }
 
 void
-parse_cmd_one_arg(void)
+parse_cmd_one_arg(void **state)
 {
     char *inp = "/cmd arg1";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_int_equals(1, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
+    assert_int_equal(1, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_two_args(void)
+parse_cmd_two_args(void **state)
 {
     char *inp = "/cmd arg1 arg2";
     gchar **result = parse_args(inp, 1, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_three_args(void)
+parse_cmd_three_args(void **state)
 {
     char *inp = "/cmd arg1 arg2 arg3";
     gchar **result = parse_args(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("arg3", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("arg3", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_three_args_with_spaces(void)
+parse_cmd_three_args_with_spaces(void **state)
 {
     char *inp = "  /cmd    arg1  arg2     arg3 ";
     gchar **result = parse_args(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("arg3", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("arg3", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_freetext(void)
+parse_cmd_with_freetext(void **state)
 {
     char *inp = "/cmd this is some free text";
     gchar **result = parse_args_with_freetext(inp, 1, 1);
 
-    assert_int_equals(1, g_strv_length(result));
-    assert_string_equals("this is some free text", result[0]);
+    assert_int_equal(1, g_strv_length(result));
+    assert_string_equal("this is some free text", result[0]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_one_arg_with_freetext(void)
+parse_cmd_one_arg_with_freetext(void **state)
 {
     char *inp = "/cmd arg1 this is some free text";
     gchar **result = parse_args_with_freetext(inp, 1, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("this is some free text", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("this is some free text", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_two_args_with_freetext(void)
+parse_cmd_two_args_with_freetext(void **state)
 {
     char *inp = "/cmd arg1 arg2 this is some free text";
     gchar **result = parse_args_with_freetext(inp, 1, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("this is some free text", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("this is some free text", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_min_zero(void)
+parse_cmd_min_zero(void **state)
 {
     char *inp = "/cmd";
     gchar **result = parse_args(inp, 0, 2);
 
-    assert_int_equals(0, g_strv_length(result));
-    assert_is_null(result[0]);
+    assert_int_equal(0, g_strv_length(result));
+    assert_null(result[0]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_min_zero_with_freetext(void)
+parse_cmd_min_zero_with_freetext(void **state)
 {
     char *inp = "/cmd";
     gchar **result = parse_args_with_freetext(inp, 0, 2);
 
-    assert_int_equals(0, g_strv_length(result));
-    assert_is_null(result[0]);
+    assert_int_equal(0, g_strv_length(result));
+    assert_null(result[0]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_quoted(void)
+parse_cmd_with_quoted(void **state)
 {
     char *inp = "/cmd \"arg1\" arg2";
     gchar **result = parse_args(inp, 2, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_quoted_and_space(void)
+parse_cmd_with_quoted_and_space(void **state)
 {
     char *inp = "/cmd \"the arg1\" arg2";
     gchar **result = parse_args(inp, 2, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("the arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("the arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_quoted_and_many_spaces(void)
+parse_cmd_with_quoted_and_many_spaces(void **state)
 {
     char *inp = "/cmd \"the arg1 is here\" arg2";
     gchar **result = parse_args(inp, 2, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("the arg1 is here", result[0]);
-    assert_string_equals("arg2", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("the arg1 is here", result[0]);
+    assert_string_equal("arg2", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_many_quoted_and_many_spaces(void)
+parse_cmd_with_many_quoted_and_many_spaces(void **state)
 {
     char *inp = "/cmd \"the arg1 is here\" \"and arg2 is right here\"";
     gchar **result = parse_args(inp, 2, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("the arg1 is here", result[0]);
-    assert_string_equals("and arg2 is right here", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("the arg1 is here", result[0]);
+    assert_string_equal("and arg2 is right here", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_freetext_with_quoted(void)
+parse_cmd_freetext_with_quoted(void **state)
 {
     char *inp = "/cmd \"arg1\" arg2 hello there whats up";
     gchar **result = parse_args_with_freetext(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("hello there whats up", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("hello there whats up", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_freetext_with_quoted_and_space(void)
+parse_cmd_freetext_with_quoted_and_space(void **state)
 {
     char *inp = "/cmd \"the arg1\" arg2 another bit of freetext";
     gchar **result = parse_args_with_freetext(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("the arg1", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("another bit of freetext", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("the arg1", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("another bit of freetext", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_freetext_with_quoted_and_many_spaces(void)
+parse_cmd_freetext_with_quoted_and_many_spaces(void **state)
 {
     char *inp = "/cmd \"the arg1 is here\" arg2 some more freetext";
     gchar **result = parse_args_with_freetext(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("the arg1 is here", result[0]);
-    assert_string_equals("arg2", result[1]);
-    assert_string_equals("some more freetext", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("the arg1 is here", result[0]);
+    assert_string_equal("arg2", result[1]);
+    assert_string_equal("some more freetext", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_freetext_with_many_quoted_and_many_spaces(void)
+parse_cmd_freetext_with_many_quoted_and_many_spaces(void **state)
 {
     char *inp = "/cmd \"the arg1 is here\" \"and arg2 is right here\" and heres the free text";
     gchar **result = parse_args_with_freetext(inp, 3, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("the arg1 is here", result[0]);
-    assert_string_equals("and arg2 is right here", result[1]);
-    assert_string_equals("and heres the free text", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("the arg1 is here", result[0]);
+    assert_string_equal("and arg2 is right here", result[1]);
+    assert_string_equal("and heres the free text", result[2]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_quoted_freetext(void)
+parse_cmd_with_quoted_freetext(void **state)
 {
     char *inp = "/cmd arg1 here is \"some\" quoted freetext";
     gchar **result = parse_args_with_freetext(inp, 1, 2);
 
-    assert_int_equals(2, g_strv_length(result));
-    assert_string_equals("arg1", result[0]);
-    assert_string_equals("here is \"some\" quoted freetext", result[1]);
+    assert_int_equal(2, g_strv_length(result));
+    assert_string_equal("arg1", result[0]);
+    assert_string_equal("here is \"some\" quoted freetext", result[1]);
     g_strfreev(result);
 }
 
 void
-parse_cmd_with_third_arg_quoted_0_min_3_max(void)
+parse_cmd_with_third_arg_quoted_0_min_3_max(void **state)
 {
     char *inp = "/group add friends \"The User\"";
     gchar **result = parse_args_with_freetext(inp, 0, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("add", result[0]);
-    assert_string_equals("friends", result[1]);
-    assert_string_equals("The User", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("add", result[0]);
+    assert_string_equal("friends", result[1]);
+    assert_string_equal("The User", result[2]);
 }
 
 void
-parse_cmd_with_second_arg_quoted_0_min_3_max(void)
+parse_cmd_with_second_arg_quoted_0_min_3_max(void **state)
 {
     char *inp = "/group add \"The Group\" friend";
     gchar **result = parse_args_with_freetext(inp, 0, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("add", result[0]);
-    assert_string_equals("The Group", result[1]);
-    assert_string_equals("friend", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("add", result[0]);
+    assert_string_equal("The Group", result[1]);
+    assert_string_equal("friend", result[2]);
 }
 
 void
-parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void)
+parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void **state)
 {
     char *inp = "/group add \"The Group\" \"The User\"";
     gchar **result = parse_args_with_freetext(inp, 0, 3);
 
-    assert_int_equals(3, g_strv_length(result));
-    assert_string_equals("add", result[0]);
-    assert_string_equals("The Group", result[1]);
-    assert_string_equals("The User", result[2]);
+    assert_int_equal(3, g_strv_length(result));
+    assert_string_equal("add", result[0]);
+    assert_string_equal("The Group", result[1]);
+    assert_string_equal("The User", result[2]);
 }
 
 void
-count_one_token(void)
+count_one_token(void **state)
 {
     char *inp = "one";
     int result = count_tokens(inp);
 
-    assert_int_equals(1, result);
+    assert_int_equal(1, result);
 }
 
 void
-count_one_token_quoted_no_whitespace(void)
+count_one_token_quoted_no_whitespace(void **state)
 {
     char *inp = "\"one\"";
     int result = count_tokens(inp);
 
-    assert_int_equals(1, result);
+    assert_int_equal(1, result);
 }
 
 void
-count_one_token_quoted_with_whitespace(void)
+count_one_token_quoted_with_whitespace(void **state)
 {
     char *inp = "\"one two\"";
     int result = count_tokens(inp);
 
-    assert_int_equals(1, result);
+    assert_int_equal(1, result);
 }
 
 void
-count_two_tokens(void)
+count_two_tokens(void **state)
 {
     char *inp = "one two";
     int result = count_tokens(inp);
 
-    assert_int_equals(2, result);
+    assert_int_equal(2, result);
 }
 
 void
-count_two_tokens_first_quoted(void)
+count_two_tokens_first_quoted(void **state)
 {
     char *inp = "\"one and\" two";
     int result = count_tokens(inp);
 
-    assert_int_equals(2, result);
+    assert_int_equal(2, result);
 }
 
 void
-count_two_tokens_second_quoted(void)
+count_two_tokens_second_quoted(void **state)
 {
     char *inp = "one \"two and\"";
     int result = count_tokens(inp);
 
-    assert_int_equals(2, result);
+    assert_int_equal(2, result);
 }
 
 void
-count_two_tokens_both_quoted(void)
+count_two_tokens_both_quoted(void **state)
 {
     char *inp = "\"one and then\" \"two and\"";
     int result = count_tokens(inp);
 
-    assert_int_equals(2, result);
+    assert_int_equal(2, result);
 }
 
 void
-get_first_of_one(void)
+get_first_of_one(void **state)
 {
     char *inp = "one";
     char *result = get_start(inp, 2);
 
-    assert_string_equals("one", result);
+    assert_string_equal("one", result);
 }
 
 void
-get_first_of_two(void)
+get_first_of_two(void **state)
 {
     char *inp = "one two";
     char *result = get_start(inp, 2);
 
-    assert_string_equals("one ", result);
+    assert_string_equal("one ", result);
 }
 
 void
-get_first_two_of_three(void)
+get_first_two_of_three(void **state)
 {
     char *inp = "one two three";
     char *result = get_start(inp, 3);
 
-    assert_string_equals("one two ", result);
+    assert_string_equal("one two ", result);
 }
 
 void
-get_first_two_of_three_first_quoted(void)
+get_first_two_of_three_first_quoted(void **state)
 {
     char *inp = "\"one\" two three";
     char *result = get_start(inp, 3);
 
-    assert_string_equals("\"one\" two ", result);
+    assert_string_equal("\"one\" two ", result);
 }
 
 void
-get_first_two_of_three_second_quoted(void)
+get_first_two_of_three_second_quoted(void **state)
 {
     char *inp = "one \"two\" three";
     char *result = get_start(inp, 3);
 
-    assert_string_equals("one \"two\" ", result);
+    assert_string_equal("one \"two\" ", result);
 }
 
 void
-get_first_two_of_three_first_and_second_quoted(void)
+get_first_two_of_three_first_and_second_quoted(void **state)
 {
     char *inp = "\"one\" \"two\" three";
     char *result = get_start(inp, 3);
 
-    assert_string_equals("\"one\" \"two\" ", result);
-}
-
-void
-register_parser_tests(void)
-{
-    TEST_MODULE("parser tests");
-    TEST(parse_null_returns_null);
-    TEST(parse_empty_returns_null);
-    TEST(parse_space_returns_null);
-    TEST(parse_cmd_no_args_returns_null);
-    TEST(parse_cmd_with_space_returns_null);
-    TEST(parse_cmd_one_arg);
-    TEST(parse_cmd_two_args);
-    TEST(parse_cmd_three_args);
-    TEST(parse_cmd_three_args_with_spaces);
-    TEST(parse_cmd_with_freetext);
-    TEST(parse_cmd_one_arg_with_freetext);
-    TEST(parse_cmd_two_args_with_freetext);
-    TEST(parse_cmd_with_too_few_returns_null);
-    TEST(parse_cmd_with_too_many_returns_null);
-    TEST(parse_cmd_min_zero);
-    TEST(parse_cmd_min_zero_with_freetext);
-    TEST(parse_cmd_with_quoted);
-    TEST(parse_cmd_with_quoted_and_space);
-    TEST(parse_cmd_with_quoted_and_many_spaces);
-    TEST(parse_cmd_with_many_quoted_and_many_spaces);
-    TEST(parse_cmd_freetext_with_quoted);
-    TEST(parse_cmd_freetext_with_quoted_and_space);
-    TEST(parse_cmd_freetext_with_quoted_and_many_spaces);
-    TEST(parse_cmd_freetext_with_many_quoted_and_many_spaces);
-    TEST(parse_cmd_with_quoted_freetext);
-    TEST(count_one_token);
-    TEST(count_one_token_quoted_no_whitespace);
-    TEST(count_one_token_quoted_with_whitespace);
-    TEST(count_two_tokens);
-    TEST(count_two_tokens_first_quoted);
-    TEST(count_two_tokens_second_quoted);
-    TEST(count_two_tokens_both_quoted);
-    TEST(get_first_of_one);
-    TEST(get_first_of_two);
-    TEST(get_first_two_of_three);
-    TEST(get_first_two_of_three_first_quoted);
-    TEST(get_first_two_of_three_second_quoted);
-    TEST(get_first_two_of_three_first_and_second_quoted);
-    TEST(parse_cmd_with_third_arg_quoted_0_min_3_max);
-    TEST(parse_cmd_with_second_arg_quoted_0_min_3_max);
-    TEST(parse_cmd_with_second_and_third_arg_quoted_0_min_3_max);
+    assert_string_equal("\"one\" \"two\" ", result);
 }
diff --git a/tests/test_parser.h b/tests/test_parser.h
new file mode 100644
index 00000000..7b178c3d
--- /dev/null
+++ b/tests/test_parser.h
@@ -0,0 +1,41 @@
+void parse_null_returns_null(void **state);
+void parse_empty_returns_null(void **state);
+void parse_space_returns_null(void **state);
+void parse_cmd_no_args_returns_null(void **state);
+void parse_cmd_with_space_returns_null(void **state);
+void parse_cmd_with_too_few_returns_null(void **state);
+void parse_cmd_with_too_many_returns_null(void **state);
+void parse_cmd_one_arg(void **state);
+void parse_cmd_two_args(void **state);
+void parse_cmd_three_args(void **state);
+void parse_cmd_three_args_with_spaces(void **state);
+void parse_cmd_with_freetext(void **state);
+void parse_cmd_one_arg_with_freetext(void **state);
+void parse_cmd_two_args_with_freetext(void **state);
+void parse_cmd_min_zero(void **state);
+void parse_cmd_min_zero_with_freetext(void **state);
+void parse_cmd_with_quoted(void **state);
+void parse_cmd_with_quoted_and_space(void **state);
+void parse_cmd_with_quoted_and_many_spaces(void **state);
+void parse_cmd_with_many_quoted_and_many_spaces(void **state);
+void parse_cmd_freetext_with_quoted(void **state);
+void parse_cmd_freetext_with_quoted_and_space(void **state);
+void parse_cmd_freetext_with_quoted_and_many_spaces(void **state);
+void parse_cmd_freetext_with_many_quoted_and_many_spaces(void **state);
+void parse_cmd_with_quoted_freetext(void **state);
+void parse_cmd_with_third_arg_quoted_0_min_3_max(void **state);
+void parse_cmd_with_second_arg_quoted_0_min_3_max(void **state);
+void parse_cmd_with_second_and_third_arg_quoted_0_min_3_max(void **state);
+void count_one_token(void **state);
+void count_one_token_quoted_no_whitespace(void **state);
+void count_one_token_quoted_with_whitespace(void **state);
+void count_two_tokens(void **state);
+void count_two_tokens_first_quoted(void **state);
+void count_two_tokens_second_quoted(void **state);
+void count_two_tokens_both_quoted(void **state);
+void get_first_of_one(void **state);
+void get_first_of_two(void **state);
+void get_first_two_of_three(void **state);
+void get_first_two_of_three_first_quoted(void **state);
+void get_first_two_of_three_second_quoted(void **state);
+void get_first_two_of_three_first_and_second_quoted(void **state);
diff --git a/tests/testsuite.c b/tests/testsuite.c
index 9e3ddf32..482d71c0 100644
--- a/tests/testsuite.c
+++ b/tests/testsuite.c
@@ -8,6 +8,7 @@
 #include "test_command.h"
 #include "test_history.h"
 #include "test_jid.h"
+#include "test_parser.h"
 
 int main(int argc, char* argv[]) {
     const UnitTest tests[] = {
@@ -93,7 +94,49 @@ int main(int argc, char* argv[]) {
         unit_test(create_with_slash_in_resource),
         unit_test(create_with_at_in_resource),
         unit_test(create_with_at_and_slash_in_resource),
-        unit_test(create_full_with_trailing_slash)
+        unit_test(create_full_with_trailing_slash),
+
+        unit_test(parse_null_returns_null),
+        unit_test(parse_empty_returns_null),
+        unit_test(parse_space_returns_null),
+        unit_test(parse_cmd_no_args_returns_null),
+        unit_test(parse_cmd_with_space_returns_null),
+        unit_test(parse_cmd_with_too_few_returns_null),
+        unit_test(parse_cmd_with_too_many_returns_null),
+        unit_test(parse_cmd_one_arg),
+        unit_test(parse_cmd_two_args),
+        unit_test(parse_cmd_three_args),
+        unit_test(parse_cmd_three_args_with_spaces),
+        unit_test(parse_cmd_with_freetext),
+        unit_test(parse_cmd_one_arg_with_freetext),
+        unit_test(parse_cmd_two_args_with_freetext),
+        unit_test(parse_cmd_min_zero),
+        unit_test(parse_cmd_min_zero_with_freetext),
+        unit_test(parse_cmd_with_quoted),
+        unit_test(parse_cmd_with_quoted_and_space),
+        unit_test(parse_cmd_with_quoted_and_many_spaces),
+        unit_test(parse_cmd_with_many_quoted_and_many_spaces),
+        unit_test(parse_cmd_freetext_with_quoted),
+        unit_test(parse_cmd_freetext_with_quoted_and_space),
+        unit_test(parse_cmd_freetext_with_quoted_and_many_spaces),
+        unit_test(parse_cmd_freetext_with_many_quoted_and_many_spaces),
+        unit_test(parse_cmd_with_quoted_freetext),
+        unit_test(parse_cmd_with_third_arg_quoted_0_min_3_max),
+        unit_test(parse_cmd_with_second_arg_quoted_0_min_3_max),
+        unit_test(parse_cmd_with_second_and_third_arg_quoted_0_min_3_max),
+        unit_test(count_one_token),
+        unit_test(count_one_token_quoted_no_whitespace),
+        unit_test(count_one_token_quoted_with_whitespace),
+        unit_test(count_two_tokens),
+        unit_test(count_two_tokens_first_quoted),
+        unit_test(count_two_tokens_second_quoted),
+        unit_test(count_two_tokens_both_quoted),
+        unit_test(get_first_of_one),
+        unit_test(get_first_of_two),
+        unit_test(get_first_two_of_three),
+        unit_test(get_first_two_of_three_first_quoted),
+        unit_test(get_first_two_of_three_second_quoted),
+        unit_test(get_first_two_of_three_first_and_second_quoted),
     };
     return run_tests(tests);
 }