Diff: TESTS/TargetTest.cpp

Revision:

41:d60c9ced57ab

Parent:

37:8fc7845ae95b

Child:

45:e4bf209c1e54

--- a/TESTS/TargetTest.cpp	Sun Apr 09 21:22:08 2017 +0000
+++ b/TESTS/TargetTest.cpp	Sun Apr 09 18:59:01 2017 -0400
@@ -45,9 +45,12 @@
 
 TEST_F(TargetTest, WhenTargetTimesOutThenTransmitRightMessage)
 {
-    const std::vector<uint8_t> expected_message = target.generate_message(32, Target::RESULT_MISSED, 42);
+    uint8_t expected_message[4];
+    target.generate_message(32, Target::RESULT_MISSED, 42, expected_message);
 
-    EXPECT_CALL(mock_xbee_transmitter, transmit(expected_message, coordinator_address))
+    EXPECT_CALL(mock_xbee_transmitter, 
+        transmit(::testing::_, 4, coordinator_address))
+	.With(::testing::Args<0,1>(::testing::ContainerEq(expected_message)))
         .Times(1);
 
     target.timeout(42);
@@ -55,9 +58,12 @@
 
 TEST_F(TargetTest, WhenTargetIsHitThenTransmitRightMessage)
 {
-    const std::vector<uint8_t> expected_message = target.generate_message(32, Target::RESULT_HIT, 42);
+    uint8_t expected_message[4];
+    target.generate_message(32, Target::RESULT_HIT, 42, expected_message);
 
-    EXPECT_CALL(mock_xbee_transmitter, transmit(expected_message, coordinator_address))
+    EXPECT_CALL(mock_xbee_transmitter, 
+        transmit(::testing::_, 4, coordinator_address))
+	.With(::testing::Args<0,1>(::testing::ContainerEq(expected_message)))
         .Times(1);
 
     target.hit(42);
@@ -68,13 +74,14 @@
     const int target_number = 0x05;
     const int time_taken_ms = 0x4254;
 
-    const std::vector<uint8_t> message = target.generate_message(target_number, Target::RESULT_HIT, time_taken_ms);
+    uint8_t message[4];
+    target.generate_message(target_number, Target::RESULT_HIT, time_taken_ms, message);
 
-    std::vector<uint8_t> expected_message;
-    expected_message.push_back(0x05);
-    expected_message.push_back(Target::RESULT_HIT);
-    expected_message.push_back(0x42);
-    expected_message.push_back(0x54);
+    uint8_t expected_message[4];
+    expected_message[0] = 0x05;
+    expected_message[1] = Target::RESULT_HIT;
+    expected_message[2] = 0x42;
+    expected_message[3] = 0x54;
     EXPECT_THAT(message, ::testing::ContainerEq(expected_message));
 }
 
@@ -83,13 +90,14 @@
     const int target_number = 0x05;
     const int time_taken_ms = 0x4254;
 
-    const std::vector<uint8_t> message = target.generate_message(target_number, Target::RESULT_MISSED, time_taken_ms);
+    uint8_t message[4];
+    target.generate_message(target_number, Target::RESULT_MISSED, time_taken_ms, message);
 
-    std::vector<uint8_t> expected_message;
-    expected_message.push_back(0x05);
-    expected_message.push_back(Target::RESULT_MISSED);
-    expected_message.push_back(0x42);
-    expected_message.push_back(0x54);
+    uint8_t expected_message[4];
+    expected_message[0] = 0x05;
+    expected_message[1] = Target::RESULT_MISSED;
+    expected_message[2] = 0x42;
+    expected_message[3] = 0x54;
     EXPECT_THAT(message, ::testing::ContainerEq(expected_message));
 }