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

All tests are passing

Browse Source
This commit is contained in:
Pavel Kirienko
2015-07-08 23:54:11 +03:00
parent 7125eeb5c2
commit e063556567
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/protocol/node_status_monitor.hpp
+1 -1
View File
@@ -29,7 +29,7 @@ public:
uint8_t sub_mode : 3;
NodeStatus() :
health(protocol::NodeStatus::HEALTH_OK),
health(protocol::NodeStatus::HEALTH_CRITICAL),
mode(protocol::NodeStatus::MODE_OFFLINE),
sub_mode(0)
{
libuavcan/test/dsdl_test/dsdl_uavcan_compilability.cpp
+3 -1
View File
@@ -35,7 +35,9 @@ TEST(Dsdl, Streaming)
static const std::string Reference =
"status: \n"
" uptime_sec: 0\n"
" status_code: 0\n"
" health: 0\n"
" mode: 0\n"
" sub_mode: 0\n"
" vendor_specific_status_code: 0\n"
"software_version: \n"
" major: 0\n"
libuavcan/test/protocol/node_status_monitor.cpp
+6 -6
View File
@@ -111,11 +111,11 @@ TEST(NodeStatusMonitor, Basic)
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(10)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(10)).mode);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(9)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(9)).mode);
ASSERT_EQ(NodeStatus::HEALTH_WARNING, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(11)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(11)).mode);
@@ -143,11 +143,11 @@ TEST(NodeStatusMonitor, Basic)
*/
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(10)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(10)).mode);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(10)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(9)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(9)).mode);
ASSERT_EQ(NodeStatus::HEALTH_WARNING, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_TRUE(nsm.isNodeKnown(uavcan::NodeID(11)));
ASSERT_EQ(NodeStatus::MODE_OPERATIONAL, nsm.getNodeStatus(uavcan::NodeID(11)).mode);
@@ -167,10 +167,10 @@ TEST(NodeStatusMonitor, Basic)
nsm.forgetNode(127);
ASSERT_FALSE(nsm.isNodeKnown(uavcan::NodeID(127)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(127)).mode);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(127)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(127)).health);
nsm.forgetNode(9);
ASSERT_FALSE(nsm.isNodeKnown(uavcan::NodeID(9)));
ASSERT_EQ(NodeStatus::MODE_OFFLINE, nsm.getNodeStatus(uavcan::NodeID(9)).mode);
ASSERT_EQ(NodeStatus::HEALTH_OK, nsm.getNodeStatus(uavcan::NodeID(9)).health);
ASSERT_EQ(NodeStatus::HEALTH_CRITICAL, nsm.getNodeStatus(uavcan::NodeID(9)).health);
}
libuavcan/test/protocol/node_status_provider.cpp
+2 -2
View File
@@ -71,7 +71,7 @@ TEST(NodeStatusProvider, Basic)
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(10));
ASSERT_TRUE(status_sub.collector.msg.get()); // Was published at startup
ASSERT_EQ(uavcan::protocol::NodeStatus::HEALTH_OK, status_sub.collector.msg->health);
ASSERT_EQ(uavcan::protocol::NodeStatus::HEALTH_ERROR, status_sub.collector.msg->health);
ASSERT_EQ(0, status_sub.collector.msg->vendor_specific_status_code);
ASSERT_GE(1, status_sub.collector.msg->uptime_sec);
@@ -86,7 +86,7 @@ TEST(NodeStatusProvider, Basic)
nodes.spinBoth(uavcan::MonotonicDuration::fromMSec(10));
ASSERT_EQ(uavcan::protocol::NodeStatus::HEALTH_OK, status_sub.collector.msg->health);
ASSERT_EQ(uavcan::protocol::NodeStatus::HEALTH_ERROR, status_sub.collector.msg->health);
ASSERT_EQ(1234, status_sub.collector.msg->vendor_specific_status_code);
ASSERT_GE(1, status_sub.collector.msg->uptime_sec);