Diff: test.cpp

Revision:

8:b9c096965c00

Parent:

7:c65c4c98d237

Child:

9:04063c29ab43

Child:

10:612739c6d27d

--- a/test.cpp	Tue Feb 14 01:13:18 2017 +0000
+++ b/test.cpp	Tue Feb 14 02:38:18 2017 +0000
@@ -193,15 +193,16 @@
     //Read parsed frame from the mailbox
     osEvent event = parsed_frames.get();
     assert(event.status == osEventMail);
-    vector<char> *parsed_frame = (vector<char>*)event.value.p;    
+    ingoing_value_t *parsed_frame = (ingoing_value_t*)event.value.p;    
     
-    assert(vectors_are_equal(expected_parsed_frame, *parsed_frame)); 
+    assert(vectors_are_equal(expected_parsed_frame, ingoing_value_to_vector(*parsed_frame))); 
+   
     parsed_frames.free(parsed_frame);   
 }
 
 void parsed_frame_to_string_button_event_released_test()
 {
-    const char parsed_frame_array[] = {FRAME_TYPE_RECEIVE_PACKET, EVENT_TYPE_BUTTON, 0x00};
+    const char parsed_frame_array[] = {FRAME_TYPE_RECEIVE_PACKET, EVENT_TYPE_BUTTON, BUTTON_RELEASED};
     const vector<char> parsed_frame = construct_vector(parsed_frame_array, 3);
     const char expected_string[] = "Button state: released";
     
@@ -213,7 +214,7 @@
 
 void parsed_frame_to_string_button_event_pressed_test()
 {
-    const char parsed_frame_array[] = {FRAME_TYPE_RECEIVE_PACKET, EVENT_TYPE_BUTTON, 0x01};
+    const char parsed_frame_array[] = {FRAME_TYPE_RECEIVE_PACKET, EVENT_TYPE_BUTTON, BUTTON_PRESSED};
     const vector<char> parsed_frame = construct_vector(parsed_frame_array, 3);
     const char expected_string[] = "Button state: pressed";