Cleans up test_low_level

test/CMakeLists.txt

@@ -34,6 +34,7 @@ endmacro()
 
 # Unit tests
 make_test(test_low_level)
+make_test(test_parser)
 make_test(test_request)
 make_test(test_serialization)
 make_test(test_low_level_sync_sans_io)

test/Jamfile

@@ -51,6 +51,7 @@ lib redis_test_common
 # access to a Redis server, so we only run the ones that don't require a DB server.
 local tests =
     test_low_level
+    test_parser
     test_request
     test_serialization
     test_low_level_sync_sans_io

test/test_parser.cpp

@@ -0,0 +1,306 @@
+//
+// Copyright (c) 2025 Marcelo Zimbres Silva (mzimbres@gmail.com),
+// Ruben Perez Hidalgo (rubenperez038 at gmail dot com)
+//
+// Distributed under the Boost Software License, Version 1.0. (See accompanying
+// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+//
+
+#include <boost/redis/adapter/any_adapter.hpp>
+#include <boost/redis/resp3/flat_tree.hpp>
+#include <boost/redis/resp3/node.hpp>
+#include <boost/redis/resp3/parser.hpp>
+#include <boost/redis/resp3/type.hpp>
+
+#include <boost/core/lightweight_test.hpp>
+#include <boost/system/detail/error_code.hpp>
+#include <boost/system/error_code.hpp>
+
+#include "print_node.hpp"
+
+#include <iostream>
+#include <string_view>
+#include <vector>
+
+using namespace boost::redis;
+using boost::system::error_code;
+using resp3::type;
+
+namespace {
+
+#define S02a "$?\r\n;0\r\n"
+#define S02b "$?\r\n;4\r\nHell\r\n;5\r\no wor\r\n;1\r\nd\r\n;0\r\n"
+#define S02c "$?\r\n;b\r\nHell\r\n;5\r\no wor\r\n;1\r\nd\r\n;0\r\n"
+#define S02d "$?\r\n;d\r\nHell\r\n;5\r\no wor\r\n;1\r\nd\r\n;0\r\n"
+
+#define S07a ">4\r\n+pubsub\r\n+message\r\n+some-channel\r\n+some message\r\n"
+#define S07b ">0\r\n"
+
+#define S08a "|1\r\n+key-popularity\r\n%2\r\n$1\r\na\r\n,0.1923\r\n$1\r\nb\r\n,0.0012\r\n"
+#define S08b "|0\r\n"
+
+#define S09a "~6\r\n+orange\r\n+apple\r\n+one\r\n+two\r\n+three\r\n+orange\r\n"
+#define S09b "~0\r\n"
+
+#define S16a "s11\r\n"
+
+void test_success()
+{
+   const struct {
+      std::string_view name;
+      std::string_view input;
+      std::vector<resp3::node_view> expected;
+   } test_cases[] = {
+      // clang-format off
+      // Simple string
+      { "simple_string", "+OK\r\n", {
+         { type::simple_string, 1u, 0u, "OK" },
+      } },
+      { "simple_string_empty", "+\r\n", {
+         { type::simple_string, 1u, 0u, "" },
+      } },
+
+      // Simple error
+      { "simple_error", "-Error\r\n", {
+         { type::simple_error, 1u, 0u, "Error" },
+      } },
+      { "simple_error_empty", "-\r\n", {
+         { type::simple_error, 1u, 0u, "" },
+      } },
+
+      // Integer. Not parsed at this point
+      { "integer", ":11\r\n", {
+         { type::number, 1u, 0u, "11" },
+      } },
+      { "integer_negative", ":-3\r\n", {
+         { type::number, 1u, 0u, "-3" },
+      } },
+      { "integer_zero", ":0\r\n", {
+         { type::number, 1u, 0u, "0" },
+      } },
+
+      // Bulk strings
+      { "bulk_string", "$2\r\nhh\r\n", {
+         { type::blob_string, 1u, 0u, "hh" },
+      } },
+      { "bulk_string_newlines", "$26\r\nhhaa\aaaa\raaaaa\r\naaaaaaaaaa\r\n", {
+         { type::blob_string, 1u, 0u, "hhaa\aaaa\raaaaa\r\naaaaaaaaaa" },
+      } },
+      { "bulk_string_empty", "$0\r\n\r\n", {
+         { type::blob_string, 1u, 0u, "" },
+      } },
+
+      // Boolean
+      { "boolean_false", "#f\r\n", {
+         { type::boolean, 1u, 0u, "f" },
+      } },
+      { "boolean_true", "#t\r\n", {
+         { type::boolean, 1u, 0u, "t" },
+      } },
+
+      // Null
+      { "null", "_\r\n", {
+         { type::null, 1u, 0u, "" },
+      } },
+
+      // Double. Not parsed at this point
+      { "double", ",10.5\r\n", {
+         { type::doublean, 1u, 0u, "10.5" },
+      } },
+      { "double_negative", ",-10.5\r\n", {
+         { type::doublean, 1u, 0u, "-10.5" },
+      } },
+      { "double_exp", ",1.5e42\r\n", {
+         { type::doublean, 1u, 0u, "1.5e42" },
+      } },
+      { "double_exp_capital", ",1.5E42\r\n", {
+         { type::doublean, 1u, 0u, "1.5E42" },
+      } },
+      { "double_exp_negative", ",1.5e-42\r\n", {
+         { type::doublean, 1u, 0u, "1.5e-42" },
+      } },
+      { "double_inf", ",inf\r\n", {
+         { type::doublean, 1u, 0u, "inf" },
+      } },
+      { "double_inf_negative", ",-inf\r\n", {
+         { type::doublean, 1u, 0u, "-inf" },
+      } },
+      { "double_nan", ",nan\r\n", {
+         { type::doublean, 1u, 0u, "nan" },
+      } },
+
+      // Big numbers
+      { "big_number", "(3492890328409238509324850943850943825024385\r\n", {
+         { type::big_number, 1u, 0u, "3492890328409238509324850943850943825024385" },
+      } },
+      { "big_number_zero", "(0\r\n", {
+         { type::big_number, 1u, 0u, "0" },
+      } },
+
+      // Bulk errors
+      { "bulk_error", "!21\r\nSYNTAX invalid syntax\r\n", {
+         { type::blob_error, 1u, 0u, "SYNTAX invalid syntax" },
+      } },
+      { "bulk_error_newlines", "!23\r\nSYNTAX\r\ninvalid\r\nsyntax\r\n", {
+         { type::blob_error, 1u, 0u, "SYNTAX\r\ninvalid\r\nsyntax" },
+      } },
+      { "bulk_error_empty", "!0\r\n\r\n", {
+         { type::blob_error, 1u, 0u, "" },
+      } },
+
+      // Verbatim strings
+      { "verbatim_string", "=15\r\ntxt:Some string\r\n", {
+         { type::verbatim_string, 1u, 0u, "txt:Some string" },
+      } },
+      { "verbatim_string_newlines", "=16\r\nt\r\n:Some\r\nstring\r\n", {
+         { type::verbatim_string, 1u, 0u, "t\r\n:Some\r\nstring" },
+      } },
+      { "verbatim_string_only_encoding", "=4\r\ntxt:\r\n", {
+         { type::verbatim_string, 1u, 0u, "txt:" },
+      } },
+      { "verbatim_string_empty", "=0\r\n\r\n", {
+         { type::verbatim_string, 1u, 0u, "" },
+      } },
+
+      // Arrays
+      { "array_1elm", "*1\r\n:11\r\n", {
+         { type::array, 1u, 0u, "" },
+         { type::number, 1u, 1u, "11" },
+      } },
+      { "array_3elm", "*3\r\n$2\r\n11\r\n$2\r\n22\r\n$1\r\n3\r\n", {
+         { type::array, 3u, 0u, "" },
+         { type::blob_string, 1u, 1u, "11" },
+         { type::blob_string, 1u, 1u, "22" },
+         { type::blob_string, 1u, 1u, "3" },
+      } },
+      { "array_empty", "*0\r\n", {
+         { type::array, 0u, 0u, "" },
+      } },
+      { "array_nested", "*1\r\n*1\r\n$2\r\nab\r\n", {
+         { type::array, 1u, 0u, "" },
+         { type::array, 1u, 1u, "" },
+         { type::blob_string, 1u, 2u, "ab" },
+      } },
+      { "array_nested_different_types_sizes", "*2\r\n+hello\r\n*3\r\n-ERR\r\n%1\r\n+name\r\n+OK\r\n*2\r\n+good\r\n_\r\n", {
+         { type::array, 2u, 0u, "" },
+         { type::simple_string, 1u, 1u, "hello" },
+         { type::array, 3u, 1u, "" },
+         { type::simple_error, 1u, 2u, "ERR" },
+         { type::map, 1u, 2u, "" },
+         { type::simple_string, 1u, 3u, "name" },
+         { type::simple_string, 1u, 3u, "OK" },
+         { type::array, 2u, 2u, "" },
+         { type::simple_string, 1u, 3u, "good" },
+         { type::null, 1u, 3u, "" },
+      } },
+      { "array_nested_max", "*1\r\n*1\r\n*1\r\n*1\r\n*1\r\n+OK\r\n", {
+         { type::array, 1u, 0u, "" },
+         { type::array, 1u, 1u, "" },
+         { type::array, 1u, 2u, "" },
+         { type::array, 1u, 3u, "" },
+         { type::array, 1u, 4u, "" },
+         { type::simple_string, 1u, 5u, "OK" },
+      } },
+      { "array_nested_map", "*1\r\n%2\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n", {
+         { type::array, 1u, 0u, "" },
+         { type::map, 2u, 1u, "" },
+         { type::blob_string, 1u, 2u, "key1" },
+         { type::blob_string, 1u, 2u, "value1" },
+         { type::blob_string, 1u, 2u, "key2" },
+         { type::blob_string, 1u, 2u, "value2" },
+      } },
+      { "array_nested_set", "*1\r\n~3\r\n+orange\r\n+apple\r\n+orange\r\n", {
+         { type::array, 1u, 0u, "" },
+         { type::set, 3u, 1u, "" },
+         { type::simple_string, 1u, 2u, "orange" },
+         { type::simple_string, 1u, 2u, "apple" },
+         { type::simple_string, 1u, 2u, "orange" },
+      } },
+
+      // Map
+      { "map_1elm", "%1\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n", {
+         { type::map, 1u, 0u, "" },
+         { type::blob_string, 1u, 1u, "key1" },
+         { type::blob_string, 1u, 1u, "value1" },
+      } },
+      { "map_4elm", "%4\r\n$4\r\nkey1\r\n$6\r\nvalue1\r\n$4\r\nkey2\r\n$6\r\nvalue2\r\n$4\r\nkey3\r\n$6\r\nvalue3\r\n$4\r\nkey3\r\n$6\r\nvalue3\r\n", {
+         { type::map, 4u, 0u, "" },
+         { type::blob_string, 1u, 1u, "key1" },
+         { type::blob_string, 1u, 1u, "value1" },
+         { type::blob_string, 1u, 1u, "key2" },
+         { type::blob_string, 1u, 1u, "value2" },
+         { type::blob_string, 1u, 1u, "key3" },
+         { type::blob_string, 1u, 1u, "value3" },
+         { type::blob_string, 1u, 1u, "key3" },
+         { type::blob_string, 1u, 1u, "value3" },
+      } },
+      { "map_empty", "%0\r\n", {
+         { type::map, 0u, 0u, "" },
+      } },
+      { "map_nested", "%1\r\n+key\r\n%2\r\n+k1\r\n+v1\r\n+k2\r\n+v2\r\n", {
+         { type::map, 1u, 0u, "" },
+         { type::simple_string, 1u, 1u, "key" },
+         { type::map, 2u, 1u, "" },
+         { type::simple_string, 1u, 2u, "k1" },
+         { type::simple_string, 1u, 2u, "v1" },
+         { type::simple_string, 1u, 2u, "k2" },
+         { type::simple_string, 1u, 2u, "v2" },
+      } },
+      { "map_nested_max", "%1\r\n+k1\r\n%1\r\n+k2\r\n%1\r\n+k3\r\n%1\r\n+k4\r\n%1\r\n+k5\r\n+v5\r\n", {
+         { type::map, 1u, 0u, "" },
+         { type::simple_string, 1u, 1u, "k1" },
+         { type::map, 1u, 1u, "" },
+         { type::simple_string, 1u, 2u, "k2" },
+         { type::map, 1u, 2u, "" },
+         { type::simple_string, 1u, 3u, "k3" },
+         { type::map, 1u, 3u, "" },
+         { type::simple_string, 1u, 4u, "k4" },
+         { type::map, 1u, 4u, "" },
+         { type::simple_string, 1u, 5u, "k5" },
+         { type::simple_string, 1u, 5u, "v5" },
+      } },
+      { "map_key_value_types", "%3\r\n_\r\n*0\r\n*2\r\n+a\r\n+b\r\n,3.1\r\n%1\r\n-ERR\r\n(200\r\n:42\r\n", {
+         { type::map, 3u, 0u, "" },
+         { type::null, 1u, 1u, "" },
+         { type::array, 0u, 1u, "" },
+         { type::array, 2u, 1u, "" },
+         { type::simple_string, 1u, 2u, "a" },
+         { type::simple_string, 1u, 2u, "b" },
+         { type::doublean, 1u, 1u, "3.1" },
+         { type::map, 1u, 1u, "" },
+         { type::simple_error, 1u, 2u, "ERR" },
+         { type::big_number, 1u, 2u, "200" },
+         { type::number, 1u, 1u, "42" },
+      } },
+
+      // clang-format on
+   };
+
+   for (const auto& tc : test_cases) {
+      std::cerr << "Running test case " << tc.name << std::endl;
+
+      resp3::parser p;
+      resp3::flat_tree tree;
+      any_adapter adapter{tree};
+      error_code ec;
+      bool done = resp3::parse(p, tc.input, adapter, ec);
+      BOOST_TEST(done);
+      BOOST_TEST(p.done());
+      BOOST_TEST_EQ(p.get_consumed(), tc.input.size());
+      BOOST_TEST_EQ(ec, error_code());
+      BOOST_TEST_ALL_EQ(
+         tree.get_view().begin(),
+         tree.get_view().end(),
+         tc.expected.begin(),
+         tc.expected.end());
+   }
+}
+
+}  // namespace
+
+int main()
+{
+   test_success();
+
+   return boost::report_errors();
+}