Minor test refactoring

* using string literal for binary strings
* sorted includes
This commit is contained in:
Vasily Nemkov 2020-04-06 20:16:36 +03:00
parent 3d471556fb
commit 738e8a7ef8

View File

@ -5,14 +5,15 @@
#include <gtest/gtest.h>
#include <vector>
#include <string_view>
#include <string>
#include <memory>
#include <string>
#include <string_view>
#include <vector>
namespace
{
using namespace DB;
using namespace std::literals::string_literals;
}
struct SplitTokenExtractorTestCase
@ -71,9 +72,6 @@ TEST_P(SplitTokenExtractorTest, next)
<< "\n\t" << token_start << ", " << token_len << ", " << pos << ", " << data->size();
}
// Helper to allow strings with embedded '\0' chars.
#define BINARY_STRING(str) std::string{str, sizeof(str) - 1}
INSTANTIATE_TEST_SUITE_P(NoTokens,
SplitTokenExtractorTest,
::testing::ValuesIn(std::initializer_list<SplitTokenExtractorTestCase>{
@ -98,11 +96,6 @@ INSTANTIATE_TEST_SUITE_P(NoTokens,
INSTANTIATE_TEST_SUITE_P(ShortSingleToken,
SplitTokenExtractorTest,
::testing::ValuesIn(std::initializer_list<SplitTokenExtractorTestCase>{
{
"Empty input sequence produces no tokens.",
"",
{}
},
{
"Short single token",
"foo",
@ -144,7 +137,7 @@ INSTANTIATE_TEST_SUITE_P(MultipleTokens,
},
{
"Multiple tokens separated by non-printable chars",
BINARY_STRING("\0abc\1" "123\2XYZ\4"),
"\0abc\1" "123\2XYZ\4"s,
{
"abc", "123", "XYZ"
}
@ -152,7 +145,7 @@ INSTANTIATE_TEST_SUITE_P(MultipleTokens,
{
"ASCII table is split into numeric, upper case and lower case letters",
BINARY_STRING("\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16"
"\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16"
"\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO"
"PQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87"
"\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c"
@ -160,7 +153,7 @@ INSTANTIATE_TEST_SUITE_P(MultipleTokens,
"\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6"
"\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb"
"\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0"
"\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"),
"\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff"s,
{
"0123456789", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz",
"\x80\x81\x82\x83\x84\x85\x86\x87"