fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 10:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Support for different DTID limits depending on data type kind; tests are failing now!

Browse Source
This commit is contained in:
Pavel Kirienko
2015-04-29 03:08:07 +03:00
parent feb534a45f
commit eafcfa1733
11 changed files with 86 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/data_type.cpp
+10 -3
View File
@@ -129,7 +129,8 @@ TEST(DataTypeID, Basic)
uavcan::DataTypeID id;
ASSERT_EQ(0xFFFF, id.get());
ASSERT_FALSE(id.isValid());
ASSERT_FALSE(id.isValidForDataTypeKind(uavcan::DataTypeKindMessage));
ASSERT_FALSE(id.isValidForDataTypeKind(uavcan::DataTypeKindService));
id = 123;
uavcan::DataTypeID id2 = 456;
@@ -137,8 +138,10 @@ TEST(DataTypeID, Basic)
ASSERT_EQ(123, id.get());
ASSERT_EQ(456, id2.get());
ASSERT_TRUE(id.isValid());
ASSERT_TRUE(id2.isValid());
ASSERT_TRUE(id.isValidForDataTypeKind(uavcan::DataTypeKindMessage));
ASSERT_TRUE(id.isValidForDataTypeKind(uavcan::DataTypeKindService));
ASSERT_TRUE(id2.isValidForDataTypeKind(uavcan::DataTypeKindMessage));
ASSERT_TRUE(id2.isValidForDataTypeKind(uavcan::DataTypeKindService));
ASSERT_TRUE(id < id2);
ASSERT_TRUE(id <= id2);
@@ -152,4 +155,8 @@ TEST(DataTypeID, Basic)
ASSERT_FALSE(id2 > id);
ASSERT_TRUE(id2 >= id);
ASSERT_TRUE(id == id2);
id = 1024;
ASSERT_TRUE(id.isValidForDataTypeKind(uavcan::DataTypeKindMessage));
ASSERT_FALSE(id.isValidForDataTypeKind(uavcan::DataTypeKindService));
}
libuavcan/test/protocol/logger.cpp
+2
View File
@@ -87,6 +87,7 @@ TEST(Logger, Basic)
ASSERT_LE(0, logger.logError("foo", "Error"));
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(10));
ASSERT_TRUE(log_sub.collector.msg.get());
ASSERT_EQ(log_sub.collector.msg->level.value, uavcan::protocol::debug::LogLevel::ERROR);
ASSERT_EQ(log_sub.collector.msg->source, "foo");
ASSERT_EQ(log_sub.collector.msg->text, "Error");
@@ -134,6 +135,7 @@ TEST(Logger, Cpp11Formatting)
ASSERT_LE(0, logger.logWarning("foo", "char='%*', %* is %*", '$', "double", 12.34));
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(10));
ASSERT_TRUE(log_sub.collector.msg.get());
ASSERT_EQ(log_sub.collector.msg->level.value, uavcan::protocol::debug::LogLevel::WARNING);
ASSERT_EQ(log_sub.collector.msg->source, "foo");
ASSERT_EQ(log_sub.collector.msg->text, "char='$', double is 12.34");
libuavcan/test/transport/frame.cpp
+1 -1
View File
@@ -230,7 +230,7 @@ TEST(Frame, FrameToString)
rx_frame.toString());
// RX frame max len
rx_frame = RxFrame(Frame(uavcan::DataTypeID::Max, uavcan::TransferTypeMessageUnicast,
rx_frame = RxFrame(Frame(uavcan::DataTypeID::MaxPossibleDataTypeIDValue, uavcan::TransferTypeMessageUnicast,
uavcan::NodeID::Max, uavcan::NodeID::Max - 1, Frame::MaxIndex,
uavcan::TransferID::Max, true),
uavcan::MonotonicTime::getMax(), uavcan::UtcTime::getMax(), 3);
libuavcan/test/transport/transfer_receiver.cpp
+1 -1
View File
@@ -428,7 +428,7 @@ TEST(TransferReceiver, UtcTransferTimestamping)
TEST(TransferReceiver, HeaderParsing)
{
Context<32> context;
RxFrameGenerator gen(789);
RxFrameGenerator gen(123);
uavcan::TransferReceiver& rcv = context.receiver;
uavcan::ITransferBufferManager& bufmgr = context.bufmgr;