[tests] Easier creation of CAN messages from uint64_t for testing code

Author: strongly-typed

src/modm/architecture/interface/can_message.hpp

@@ -14,6 +14,7 @@
 #define MODM_CAN_MESSAGE_HPP
 
 #include <stdint.h>
+#include <string.h>  // strlen
 #include <algorithm>
 #include <modm/architecture/utils.hpp>
 
@@ -29,6 +30,16 @@ struct Message
 	{
 	}
 
+	// Create CAN message from long data in Network Order.
+	inline Message(uint32_t inIdentifier, uint8_t inLength, const uint64_t &inData, bool extended=false) :
+		identifier(inIdentifier), length(std::min(inLength, uint8_t(8)))
+	{
+		flags.extended = extended;
+		const uint8_t *inDataB = reinterpret_cast<const uint8_t *>(&inData);
+		for (uint8_t ii = 0; ii < length; ++ii)
+ 			data[ii] = inDataB[length - ii - 1];
+	}
+
 	inline uint32_t
 	getIdentifier() const
 	{

test/modm/architecture/interface/can_message_test.cpp

@@ -44,3 +44,23 @@ CanMessageTest::testEqualOperator()
 	msgB.data[1] = 0x11;
 	TEST_ASSERT_FALSE(msgA == msgB);
 }
+
+void
+CanMessageTest::testConstructor()
+{
+	modm::can::Message msgA(0x123, 7, 0x19821122aaffEE);
+	TEST_ASSERT_EQUALS(msgA.data[0], 0x19);
+	TEST_ASSERT_EQUALS(msgA.data[1], 0x82);
+	TEST_ASSERT_EQUALS(msgA.data[2], 0x11);
+	TEST_ASSERT_EQUALS(msgA.data[3], 0x22);
+	TEST_ASSERT_EQUALS(msgA.data[4], 0xaa);
+	TEST_ASSERT_EQUALS(msgA.data[5], 0xff);
+	TEST_ASSERT_EQUALS(msgA.data[6], 0xee);
+	TEST_ASSERT_EQUALS(msgA.getLength(), 7);
+	TEST_ASSERT_FALSE(msgA.isExtended());
+
+	modm::can::Message msgB(0x432, 1, 0xab, true);
+	TEST_ASSERT_EQUALS(msgB.data[0], 0xab);
+	TEST_ASSERT_EQUALS(msgB.getLength(), 1);
+	TEST_ASSERT_TRUE(msgB.isExtended());
+}

test/modm/architecture/interface/can_message_test.hpp

@@ -2,7 +2,7 @@
  * Copyright (c) 2009, Martin Rosekeit
  * Copyright (c) 2009-2010, Fabian Greif
  * Copyright (c) 2012, 2015, Niklas Hauser
- * Copyright (c) 2016, Sascha Schade
+ * Copyright (c) 2016-2020, Sascha Schade
  *
  * This file is part of the modm project.
  *
@@ -24,6 +24,9 @@ class CanMessageTest : public unittest::TestSuite
 public:
 	void
 	testEqualOperator();
+
+	void
+	testConstructor();
 };
 
 #endif // MODM_UNITTEST_CAN_MESSAGE_HPP

test/modm/driver/can/can_lawicel_formatter_test.cpp

@@ -23,7 +23,7 @@
 void
 CanLawicelFormatterTest::testIdentifierToStringExtended()
 {
-	modm::can::Message msg(0x75395165, 0);
+	modm::can::Message msg(0x75395165);
 
 	char buffer[128];
 	for (int i = 0; i < 128; ++i) {
@@ -44,7 +44,7 @@ CanLawicelFormatterTest::testIdentifierToStringExtended()
 void
 CanLawicelFormatterTest::testIdentifierToStringStandard()
 {
-	modm::can::Message msg(0x123, 0);
+	modm::can::Message msg(0x123);
 	msg.flags.extended = false;
 
 	char buffer[128];
@@ -61,12 +61,7 @@ CanLawicelFormatterTest::testIdentifierToStringStandard()
 void
 CanLawicelFormatterTest::testMessageToStringStandard()
 {
-	modm::can::Message msg(0x123, 4);
-	msg.flags.extended = false;
-	msg.data[0] = 0x44;
-	msg.data[1] = 0xff;
-	msg.data[2] = 0x1A;
-	msg.data[3] = 0x12;
+	modm::can::Message msg(0x123, 4, 0x44ff1a12, false);
 
 	char buffer[128];
 	for (int i = 0; i < 128; ++i) {
@@ -87,12 +82,7 @@ CanLawicelFormatterTest::testMessageToStringStandard()
 void
 CanLawicelFormatterTest::testMessageToStringExtended()
 {
-	modm::can::Message msg(0x123, 4);
-	msg.flags.extended = true;
-	msg.data[0] = 0x44;
-	msg.data[1] = 0xff;
-	msg.data[2] = 0x1A;
-	msg.data[3] = 0x12;
+	modm::can::Message msg(0x123, 4, 0x44ff1a12, true);
 
 	char buffer[128];
 	for (int i = 0; i < 128; ++i) {
@@ -151,12 +141,7 @@ CanLawicelFormatterTest::testRoundtripMessage()
 void
 CanLawicelFormatterTest::testRoudtripString()
 {
-	modm::can::Message msg(0x123, 4);
-	msg.flags.extended = true;
-	msg.data[0] = 0x44;
-	msg.data[1] = 0xff;
-	msg.data[2] = 0x1A;
-	msg.data[3] = 0x12;
+	modm::can::Message msg(0x123, 4, 0x44ff1a12, true);
 
 	char buffer[128];
 	for (int i = 0; i < 128; ++i) {