X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Ftest_receive.c;h=2ce3feff3d950ea9c1bffc87b592ed5a207c6295;hb=482c7eafcb35a4031ab6f2241b14ac495735b7cd;hp=d624a1fc92aa2c5828d8e3483fd8b3cb40e90ade;hpb=9fadf3909846796d3666c5b8f9cbec9fc4e979c4;p=apps%2Flow-level-can-service.git

diff --git a/tests/test_receive.c b/tests/test_receive.c
index d624a1f..2ce3fef 100644
--- a/tests/test_receive.c
+++ b/tests/test_receive.c
@@ -6,7 +6,7 @@
 #include <stdarg.h>
 
 extern IsoTpShims SHIMS;
-extern IsoTpHandler ISOTP_HANDLER;
+extern IsoTpHandle HANDLE;
 
 extern uint16_t last_can_frame_sent_arb_id;
 extern uint8_t last_can_payload_sent;
@@ -27,8 +27,9 @@ extern void setup();
 
 START_TEST (test_receive_wrong_id)
 {
-    const uint64_t data = 0;
-    isotp_receive_can_frame(&ISOTP_HANDLER, 0x100, data, sizeof(data));
+    const uint8_t data[CAN_MESSAGE_BYTE_SIZE] = {0};
+    IsoTpMessage message = isotp_receive_can_frame(&SHIMS, &HANDLE, 0x100, data, 1);
+    fail_if(message.completed);
     fail_if(message_was_received);
 }
 END_TEST
@@ -36,16 +37,18 @@ END_TEST
 START_TEST (test_receive_bad_pci)
 {
     // 4 is a reserved number for the PCI field - only 0-3 are allowed
-    const uint64_t data = {0x4000000000000000};
-    isotp_receive_can_frame(&ISOTP_HANDLER, 0x2a, data, sizeof(data));
+    const uint8_t data[CAN_MESSAGE_BYTE_SIZE] = {0x40};
+    IsoTpMessage message = isotp_receive_can_frame(&SHIMS, &HANDLE, 0x2a, data, 1);
+    fail_if(message.completed);
     fail_if(message_was_received);
 }
 END_TEST
 
 START_TEST (test_receive_single_frame_empty_payload)
 {
-    const uint64_t data = {0x0012340000000000};
-    isotp_receive_can_frame(&ISOTP_HANDLER, 0x2a, data, sizeof(data));
+    const uint8_t data[CAN_MESSAGE_BYTE_SIZE] = {0x00, 0x12, 0x34};
+    IsoTpMessage message = isotp_receive_can_frame(&SHIMS, &HANDLE, 0x2a, data, 3);
+    fail_unless(message.completed);
     fail_unless(message_was_received);
     ck_assert_int_eq(last_message_received_arb_id, 0x2a);
     ck_assert_int_eq(last_message_received_payload_size, 0);
@@ -54,8 +57,9 @@ END_TEST
 
 START_TEST (test_receive_single_frame)
 {
-    const uint64_t data = {0x0212340000000000};
-    isotp_receive_can_frame(&ISOTP_HANDLER, 0x2a, data, sizeof(data));
+    const uint8_t data[CAN_MESSAGE_BYTE_SIZE] = {0x02, 0x12, 0x34};
+    IsoTpMessage message = isotp_receive_can_frame(&SHIMS, &HANDLE, 0x2a, data, 3);
+    fail_unless(message.completed);
     fail_unless(message_was_received);
     ck_assert_int_eq(last_message_received_arb_id, 0x2a);
     ck_assert_int_eq(last_message_received_payload_size, 2);