mirror
/
libx52
mirror of https://github.com/nirenjan/libx52.git
1
0
Fork 0
Code Releases Wiki Activity

Fix comparision issue in test_common.c 

Prior to this change, the comparision loop ran until it found a zero
value in either the index or the value field, rather than looping until
both were zero.

This change fixes that bug, and also adds additional debug functions to
print the expected and observed values.
pull/22/head
nirenjan 2020-06-12 17:09:09 -07:00
parent 8b49b91267
commit 02165a8712
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/libx52/test_common.c
View File

@ -48,24 +48,24 @@ bool x52_test_assert_expected(libx52_device *dev, struct ivpair *data)
int written = 0;
struct x52_vendor_data *vdata = (struct x52_vendor_data *)dev->hdl;
while(data->index != 0 && data->value != 0 && written < vdata->written) {
if ((data->index != vdata->data[written].index) ||
(data->value != vdata->data[written].value)) {
while((data[written].index != 0 || data[written].value != 0) && written < vdata->written) {
if ((data[written].index != vdata->data[written].index) ||
(data[written].value != vdata->data[written].value)) {
ADD_DIAG("Mismatched data at position %d:", written);
ADD_DIAG("\tExpected: {%04x, %04x}", data->index, data->value);
ADD_DIAG("\tExpected: {%04x, %04x}", data[written].index, data[written].value);
ADD_DIAG("\tObserved: {%04x, %04x}", vdata->data[written].index, vdata->data[written].value);
return false;
}
data++;
written++;
}
if (data->index != 0 || data->value != 0) {
if (data[written].index != 0 || data[written].value != 0) {
ADD_DIAG("data written %d", written);
ADD_DIAG("Insufficient data written, got only %d, additional expected:", written);
while (data->index != 0 && data->value != 0) {
ADD_DIAG("\t%04x %04x", data->index, data->value);
data++;
while (data[written].index != 0 && data[written].value != 0) {
ADD_DIAG("\t%04x %04x", data[written].index, data[written].value);
written++;
}
return false;
}
@ -86,6 +86,28 @@ void x52_test_print_diagnostics(void)
}
}
static void _x52_test_print_data(struct ivpair *data)
{
while (data->index != 0 || data->value != 0) {
printf("%04x/%04x ", data->index, data->value);
data++;
}
puts("");
}
void x52_test_print_observed_data(libx52_device *dev)
{
struct x52_vendor_data *vdata = (struct x52_vendor_data *)dev->hdl;
printf("Observed: ");
_x52_test_print_data(vdata->data);
}
void x52_test_print_expected_data(struct ivpair *data)
{
printf("Expected: ");
_x52_test_print_data(data);
}
/*
* Initialize libx52, close any device handles, create a dummy handle
* and override the vendor command function.

3
lib/libx52/test_common.h
View File

@ -45,4 +45,7 @@ void x52_test_print_diagnostics(void);
/* Cleanup test data */
void x52_test_cleanup(libx52_device *dev);
void x52_test_print_observed_data(libx52_device *dev);
void x52_test_print_expected_data(struct ivpair *data);
#endif // !defined _TEST_COMMON_H