mirror of
https://gitlab.freedesktop.org/libinput/libinput.git
synced 2026-02-04 02:20:30 +01:00
test: move the custom parser test structs into the functions
No need to pollute the namespace here. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
parent
fd9e749f1c
commit
4fa7a6b94a
1 changed files with 45 additions and 61 deletions
106
test/test-misc.c
106
test/test-misc.c
|
|
@ -838,15 +838,13 @@ START_TEST(wheel_click_count_parser)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct parser_test_dimension {
|
||||
char *tag;
|
||||
bool success;
|
||||
int x, y;
|
||||
};
|
||||
|
||||
START_TEST(dimension_prop_parser)
|
||||
{
|
||||
struct parser_test_dimension tests[] = {
|
||||
struct parser_test_dimension {
|
||||
char *tag;
|
||||
bool success;
|
||||
int x, y;
|
||||
} tests[] = {
|
||||
{ "10x10", true, 10, 10 },
|
||||
{ "1x20", true, 1, 20 },
|
||||
{ "1x8000", true, 1, 8000 },
|
||||
|
|
@ -887,15 +885,13 @@ START_TEST(dimension_prop_parser)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct parser_test_reliability {
|
||||
char *tag;
|
||||
bool success;
|
||||
enum switch_reliability reliability;
|
||||
};
|
||||
|
||||
START_TEST(reliability_prop_parser)
|
||||
{
|
||||
struct parser_test_reliability tests[] = {
|
||||
struct parser_test_reliability {
|
||||
char *tag;
|
||||
bool success;
|
||||
enum switch_reliability reliability;
|
||||
} tests[] = {
|
||||
{ "reliable", true, RELIABILITY_RELIABLE },
|
||||
{ "unreliable", false, 0 },
|
||||
{ "", false, 0 },
|
||||
|
|
@ -926,17 +922,15 @@ START_TEST(reliability_prop_parser)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct parser_test_calibration {
|
||||
char *prop;
|
||||
bool success;
|
||||
float values[6];
|
||||
};
|
||||
|
||||
START_TEST(calibration_prop_parser)
|
||||
{
|
||||
#define DEFAULT_VALUES { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0 }
|
||||
const float untouched[6] = DEFAULT_VALUES;
|
||||
struct parser_test_calibration tests[] = {
|
||||
struct parser_test_calibration {
|
||||
char *prop;
|
||||
bool success;
|
||||
float values[6];
|
||||
} tests[] = {
|
||||
{ "", false, DEFAULT_VALUES },
|
||||
{ "banana", false, DEFAULT_VALUES },
|
||||
{ "1 2 3 a 5 6", false, DEFAULT_VALUES },
|
||||
|
|
@ -979,15 +973,13 @@ START_TEST(calibration_prop_parser)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct parser_test_range {
|
||||
char *tag;
|
||||
bool success;
|
||||
int hi, lo;
|
||||
};
|
||||
|
||||
START_TEST(range_prop_parser)
|
||||
{
|
||||
struct parser_test_range tests[] = {
|
||||
struct parser_test_range {
|
||||
char *tag;
|
||||
bool success;
|
||||
int hi, lo;
|
||||
} tests[] = {
|
||||
{ "10:8", true, 10, 8 },
|
||||
{ "100:-1", true, 100, -1 },
|
||||
{ "-203813:-502023", true, -203813, -502023 },
|
||||
|
|
@ -1254,15 +1246,13 @@ START_TEST(safe_atou_base_8_test)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct atod_test {
|
||||
char *str;
|
||||
bool success;
|
||||
double val;
|
||||
};
|
||||
|
||||
START_TEST(safe_atod_test)
|
||||
{
|
||||
struct atod_test tests[] = {
|
||||
struct atod_test {
|
||||
char *str;
|
||||
bool success;
|
||||
double val;
|
||||
} tests[] = {
|
||||
{ "10", true, 10 },
|
||||
{ "20", true, 20 },
|
||||
{ "-1", true, -1 },
|
||||
|
|
@ -1303,15 +1293,13 @@ START_TEST(safe_atod_test)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct strsplit_test {
|
||||
const char *string;
|
||||
const char *delim;
|
||||
const char *results[10];
|
||||
};
|
||||
|
||||
START_TEST(strsplit_test)
|
||||
{
|
||||
struct strsplit_test tests[] = {
|
||||
struct strsplit_test {
|
||||
const char *string;
|
||||
const char *delim;
|
||||
const char *results[10];
|
||||
} tests[] = {
|
||||
{ "one two three", " ", { "one", "two", "three", NULL } },
|
||||
{ "one", " ", { "one", NULL } },
|
||||
{ "one two ", " ", { "one", "two", NULL } },
|
||||
|
|
@ -1347,20 +1335,18 @@ START_TEST(strsplit_test)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct kvsplit_dbl_test {
|
||||
const char *string;
|
||||
const char *psep;
|
||||
const char *kvsep;
|
||||
ssize_t nresults;
|
||||
struct {
|
||||
double a;
|
||||
double b;
|
||||
} results[32];
|
||||
};
|
||||
|
||||
START_TEST(kvsplit_double_test)
|
||||
{
|
||||
struct kvsplit_dbl_test tests[] = {
|
||||
struct kvsplit_dbl_test {
|
||||
const char *string;
|
||||
const char *psep;
|
||||
const char *kvsep;
|
||||
ssize_t nresults;
|
||||
struct {
|
||||
double a;
|
||||
double b;
|
||||
} results[32];
|
||||
} tests[] = {
|
||||
{ "1:2;3:4;5:6", ";", ":", 3, { {1, 2}, {3, 4}, {5, 6}}},
|
||||
{ "1.0x2.3 -3.2x4.5 8.090909x-6.00", " ", "x", 3, { {1.0, 2.3}, {-3.2, 4.5}, {8.090909, -6}}},
|
||||
|
||||
|
|
@ -1399,15 +1385,13 @@ START_TEST(kvsplit_double_test)
|
|||
}
|
||||
END_TEST
|
||||
|
||||
struct strjoin_test {
|
||||
char *strv[10];
|
||||
const char *joiner;
|
||||
const char *result;
|
||||
};
|
||||
|
||||
START_TEST(strjoin_test)
|
||||
{
|
||||
struct strjoin_test tests[] = {
|
||||
struct strjoin_test {
|
||||
char *strv[10];
|
||||
const char *joiner;
|
||||
const char *result;
|
||||
} tests[] = {
|
||||
{ { "one", "two", "three", NULL }, " ", "one two three" },
|
||||
{ { "one", NULL }, "x", "one" },
|
||||
{ { "one", "two", NULL }, "x", "onextwo" },
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue