diff options
Diffstat (limited to 'testit.cpp')
| -rw-r--r-- | testit.cpp | 23 |
1 files changed, 10 insertions, 13 deletions
@@ -15,7 +15,7 @@ unsigned char g_sensortype [][2] = { uint8_t find_type_for_sensor_number(uint8_t sensor_number) { int i=0; - uint8_t rc; + uint8_t rc; while (g_sensortype[i][0] != 0xff) { if (g_sensortype[i][1] == sensor_number) { @@ -38,9 +38,6 @@ char g_results_value[64]; int set_sensor_dbus_state_s(unsigned char number, const char *member, const char *value) { - printf("Attempting to log 0x%02x via %s with a value of %s\n", - number, member, value); - strcpy(g_results_method, member); strcpy(g_results_value, value); @@ -48,12 +45,8 @@ int set_sensor_dbus_state_s(unsigned char number, const char *member, const char } int set_sensor_dbus_state_y(unsigned char number, char const* member, uint8_t value) { - - char val[2]; - - printf("Attempting to log Variant Sensor 0x%02x via %s with a value of 0x%02x\n", - number, member, value); + char val[2]; snprintf(val, 2, "%d", value); @@ -81,7 +74,7 @@ uint8_t testrec_procfailed[] = {0x02, 0xa9, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 // Virtual Sensor 5, setting a Value of 0h uint8_t testrec_bootprogress[] = {0x05, 0xa9, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00}; -// Virtual Sensor setting a boot count +// Virtual Sensor setting a boot count uint8_t testrec_bootcount[] = {0x01, 0x09, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; // Invalid sensor number @@ -89,12 +82,16 @@ uint8_t testrec_invalidnumber[]= {0x35, 0xa9, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00 int check_results(int rc, const char *method, const char *value) { - if (strcmp(g_results_method, method)) { - printf("ERROR: Method Failed, expect %s found %s\n", method, g_results_method); + if (strcmp(g_results_method, method)) { + log<level::ERR>("Method Failed", + entry("EXPECT=%s", method), + entry("GOT=%s", g_results_method)); return -1; } if (strcmp(g_results_value, value)) { - printf("ERROR: Value failed, expected %s found %s\n", value, g_results_value); + log<level::ERR>("Value failed", + entry("EXPECT=%s", value), + entry("GOT=%s", g_results_method)); return -2; } |
