Skip to content

Commit

Permalink
Merge pull request #468 from openxc/timestampfix
Browse files Browse the repository at this point in the history 
timestamp unit tests fixed
  • Loading branch information
@GenoJAFord
GenoJAFord committed Nov 2, 2020
2 parents 590e848 + 3f234e2 commit 7cff489
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/payload/json.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ int openxc::payload::json::serialize(openxc_VehicleMessage* message,
size_t finalLength = 0;
if(root != NULL) {
bool status = true;
if(message->type != openxc_VehicleMessage_Type_UNUSED) {
if(message->timestamp != 0) {
cJSON_AddNumberToObject(root, "timestamp", message->timestamp);
}
if(message->type == openxc_VehicleMessage_Type_SIMPLE) {
Expand Down
31 changes: 15 additions & 16 deletions src/tests/canread_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ START_TEST (test_send_numerical)
uint8_t snapshot[QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE) + 1];
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot, "{\"timestamp\":0,\"name\":\"test\",\"value\":42}\0");
ck_assert_str_eq((char*)snapshot, "{\"name\":\"test\",\"value\":42}\0");
}
END_TEST

Expand All @@ -153,7 +153,7 @@ START_TEST (test_preserve_float_precision)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":42.500000}\0");
"{\"name\":\"test\",\"value\":42.500000}\0");
}
END_TEST

Expand All @@ -167,7 +167,7 @@ START_TEST (test_send_boolean)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":false}\0");
"{\"name\":\"test\",\"value\":false}\0");
}
END_TEST

Expand All @@ -181,7 +181,7 @@ START_TEST (test_send_string)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":\"string\"}\0");
"{\"name\":\"test\",\"value\":\"string\"}\0");
}
END_TEST

Expand All @@ -204,7 +204,7 @@ START_TEST (test_send_evented_boolean)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":\"value\",\"event\":false}\0");
"{\"name\":\"test\",\"value\":\"value\",\"event\":false}\0");
}
END_TEST

Expand All @@ -227,7 +227,7 @@ START_TEST (test_send_evented_string)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":\"value\",\"event\":\"event\"}\0");
"{\"name\":\"test\",\"value\":\"value\",\"event\":\"event\"}\0");
}
END_TEST

Expand All @@ -249,7 +249,7 @@ START_TEST (test_send_evented_float)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"test\",\"value\":\"value\",\"event\":43}\0");
"{\"name\":\"test\",\"value\":\"value\",\"event\":43}\0");
}
END_TEST

Expand Down Expand Up @@ -315,7 +315,7 @@ START_TEST (test_passthrough_message)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"bus\":1,\"id\":42,\"data\":\"0x123456789abcdef1\"}\0");
"{\"bus\":1,\"id\":42,\"data\":\"0x123456789abcdef1\"}\0");
}
END_TEST

Expand Down Expand Up @@ -354,7 +354,7 @@ START_TEST (test_default_decoder)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"torque_at_transmission\",\"value\":-19990}\0");
"{\"name\":\"torque_at_transmission\",\"value\":-19990}\0");
}
END_TEST

Expand Down Expand Up @@ -383,12 +383,11 @@ START_TEST (test_translate_many_signals)
}
fail_unless(USB_PROCESSED);
// 8 signals sent - depends on queue size
//ck_assert_int_eq(11 * 34 + 2, SENT_BYTES); // Protobuff 2 result
ck_assert_int_eq(676, SENT_BYTES);
ck_assert_int_eq(11 * 34 + 2, SENT_BYTES);
// 1 in the output queue
fail_if(queueEmpty());
//ck_assert_int_eq(1 * 34, QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE)); // Protobuff 2 result
ck_assert_int_eq(96, QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE));
ck_assert_int_eq(170, QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE));
}
END_TEST

Expand All @@ -406,7 +405,7 @@ START_TEST (test_translate_float)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"torque_at_transmission\",\"value\":42}\0");
"{\"name\":\"torque_at_transmission\",\"value\":42}\0");
}
END_TEST

Expand Down Expand Up @@ -465,7 +464,7 @@ START_TEST (test_translate_string)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"torque_at_transmission\",\"value\":\"foo\"}\0");
"{\"name\":\"torque_at_transmission\",\"value\":\"foo\"}\0");
}
END_TEST

Expand Down Expand Up @@ -549,7 +548,7 @@ START_TEST (test_preserve_last_value)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"torque_at_transmission\",\"value\":-19990}\0");
"{\"name\":\"torque_at_transmission\",\"value\":-19990}\0");
}
END_TEST

Expand All @@ -566,7 +565,7 @@ START_TEST (test_dont_send_same)
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot,
"{\"timestamp\":0,\"name\":\"brake_pedal_status\",\"value\":true}\0");
"{\"name\":\"brake_pedal_status\",\"value\":true}\0");

QUEUE_INIT(uint8_t, OUTPUT_QUEUE);
can::read::translateSignal(testSignal,
Expand Down
8 changes: 4 additions & 4 deletions src/tests/diagnostics_tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ START_TEST (test_add_basic_request)
uint8_t snapshot[QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE) + 1];
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot, "{\"timestamp\":0,\"bus\":1,\"id\":2016,\"mode\":1,\"success\":true,\"pid\":2,\"payload\":\"0x45\"}\0");
ck_assert_str_eq((char*)snapshot, "{\"bus\":1,\"id\":2016,\"mode\":1,\"success\":true,\"pid\":2,\"payload\":\"0x45\"}\0");
}
END_TEST

Expand Down Expand Up @@ -374,7 +374,7 @@ START_TEST (test_add_request_other_bus)
uint8_t snapshot[QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE) + 1];
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot, "{\"timestamp\":0,\"name\":\"mypid\",\"value\":69}\0");
ck_assert_str_eq((char*)snapshot, "{\"name\":\"mypid\",\"value\":69}\0");
}
END_TEST

Expand All @@ -391,7 +391,7 @@ START_TEST (test_add_request_with_name)
uint8_t snapshot[QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE) + 1];
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot, "{\"timestamp\":0,\"name\":\"mypid\",\"value\":69}\0");
ck_assert_str_eq((char*)snapshot, "{\"name\":\"mypid\",\"value\":69}\0");
}
END_TEST

Expand Down Expand Up @@ -466,7 +466,7 @@ START_TEST (test_add_request_with_name_and_decoder)
uint8_t snapshot[QUEUE_LENGTH(uint8_t, OUTPUT_QUEUE) + 1];
QUEUE_SNAPSHOT(uint8_t, OUTPUT_QUEUE, snapshot, sizeof(snapshot));
snapshot[sizeof(snapshot) - 1] = NULL;
ck_assert_str_eq((char*)snapshot, "{\"timestamp\":0,\"name\":\"mypid\",\"value\":138}\0");
ck_assert_str_eq((char*)snapshot, "{\"name\":\"mypid\",\"value\":138}\0");
}
END_TEST

Expand Down

0 comments on commit 7cff489

Please sign in to comment.