From 54713fc5deab5de318d79035a0927d828ae239f5 Mon Sep 17 00:00:00 2001 From: Christopher Peplin Date: Thu, 2 Jan 2014 15:28:06 -0500 Subject: Draft implemenation of receiving and parsing single fram diag messages. --- tests/common.c | 6 ------ tests/test_core.c | 10 ++++++---- 2 files changed, 6 insertions(+), 10 deletions(-) (limited to 'tests') diff --git a/tests/common.c b/tests/common.c index e35ef529..99b2f7c4 100644 --- a/tests/common.c +++ b/tests/common.c @@ -35,12 +35,6 @@ void mock_send_can(const uint16_t arbitration_id, const uint8_t* data, void mock_set_timer(uint16_t time_ms, void (*callback)) { } -void response_received_handler(const DiagnosticResponse* response) { - last_response_was_received = true; - // TODO not sure if we can copy the struct like this - last_response_received = *response; -} - void setup() { SHIMS = diagnostic_init_shims(debug, mock_send_can, mock_set_timer); memset(last_can_payload_sent, 0, sizeof(last_can_payload_sent)); diff --git a/tests/test_core.c b/tests/test_core.c index a466e8e0..2730cd73 100644 --- a/tests/test_core.c +++ b/tests/test_core.c @@ -8,7 +8,12 @@ extern void setup(); extern bool last_response_was_received; extern DiagnosticResponse last_response_received; extern DiagnosticShims SHIMS; -extern DiagnosticResponseReceived response_received_handler; + +void response_received_handler(const DiagnosticResponse* response) { + last_response_was_received = true; + // TODO not sure if we can copy the struct like this + last_response_received = *response; +} START_TEST (test_receive_wrong_arb_id) { @@ -45,11 +50,9 @@ START_TEST (test_send_diag_request) fail_unless(response.success); fail_unless(response.completed); fail_unless(handle.completed); - fail_unless(last_response_was_received); ck_assert(last_response_received.success); ck_assert_int_eq(last_response_received.arbitration_id, request.arbitration_id + 0x8); - // TODO should we set it back to the original mode, or leave as mode + 0x40? ck_assert_int_eq(last_response_received.mode, request.mode); ck_assert_int_eq(last_response_received.pid, 0); ck_assert_int_eq(last_response_received.payload_length, 1); @@ -71,7 +74,6 @@ START_TEST (test_request_pid_standard) ck_assert(last_response_received.success); ck_assert_int_eq(last_response_received.arbitration_id, 0x7df + 0x8); - // TODO should we set it back to the original mode, or leave as mode + 0x40? ck_assert_int_eq(last_response_received.mode, 0x1); ck_assert_int_eq(last_response_received.pid, 0x2); ck_assert_int_eq(last_response_received.payload_length, 1); -- cgit 1.2.3-korg