fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-05 01:51:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Meaningful error codes instead of plain -1

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-28 19:21:08 +04:00
parent 4886e2194f
commit ae63ad5db5
34 changed files with 112 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/marshal/array.cpp
+2 -2
View File
@@ -552,7 +552,7 @@ TEST(Array, TailArrayOptimizationErrors)
a2.push_back(56); // Garbage
ASSERT_EQ(1, a2.size());
// Will fail - declared length is more than 5 items
ASSERT_EQ(-1, A::decode(a2, sc_rd, uavcan::TailArrayOptDisabled));
ASSERT_GT(0, A::decode(a2, sc_rd, uavcan::TailArrayOptDisabled));
// Must be cleared
ASSERT_TRUE(a2.empty());
}
@@ -563,7 +563,7 @@ TEST(Array, TailArrayOptimizationErrors)
a2.push_back(56); // Garbage
ASSERT_EQ(1, a2.size());
// Will fail - no length field, but the stream is too long
ASSERT_EQ(-1, A::decode(a2, sc_rd, uavcan::TailArrayOptEnabled));
ASSERT_GT(0, A::decode(a2, sc_rd, uavcan::TailArrayOptEnabled));
// Will contain some garbage
ASSERT_EQ(5, a2.size());
// Interpreted stream - see the values above
libuavcan/test/node/node.cpp
+1 -1
View File
@@ -67,7 +67,7 @@ TEST(Node, Basic)
* Init the first node
*/
ASSERT_FALSE(node1.isStarted());
ASSERT_EQ(-1, node1.spin(uavcan::MonotonicDuration::fromMSec(20))); // Not initialized - will fail
ASSERT_EQ(-uavcan::ErrNotInited, node1.spin(uavcan::MonotonicDuration::fromMSec(20)));
ASSERT_LE(0, node1.start(result));
ASSERT_TRUE(node1.isStarted());
libuavcan/test/node/service_client.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ TEST(ServiceClient, Basic)
// Server
uavcan::ServiceServer<root_ns_a::StringService> server(nodes.a);
ASSERT_EQ(1, server.start(stringServiceServerCallback));
ASSERT_EQ(0, server.start(stringServiceServerCallback));
{
// Caller
libuavcan/test/node/subscriber.cpp
+5 -5
View File
@@ -82,7 +82,7 @@ TEST(Subscriber, Basic)
sizeof(uavcan::Subscriber<uavcan::mavlink::Message, Listener::ExtendedBinder>) << std::endl;
// Null binder - will fail
ASSERT_EQ(-1, sub_extended.start(Listener::ExtendedBinder(NULL, NULL)));
ASSERT_EQ(-uavcan::ErrInvalidParam, sub_extended.start(Listener::ExtendedBinder(NULL, NULL)));
Listener listener;
@@ -125,10 +125,10 @@ TEST(Subscriber, Basic)
*/
ASSERT_EQ(0, node.getDispatcher().getNumMessageListeners());
ASSERT_EQ(1, sub_extended.start(listener.bindExtended()));
ASSERT_EQ(1, sub_extended2.start(listener.bindExtended()));
ASSERT_EQ(1, sub_simple.start(listener.bindSimple()));
ASSERT_EQ(1, sub_simple2.start(listener.bindSimple()));
ASSERT_EQ(0, sub_extended.start(listener.bindExtended()));
ASSERT_EQ(0, sub_extended2.start(listener.bindExtended()));
ASSERT_EQ(0, sub_simple.start(listener.bindSimple()));
ASSERT_EQ(0, sub_simple2.start(listener.bindSimple()));
ASSERT_EQ(4, node.getDispatcher().getNumMessageListeners());
libuavcan/test/transport/can/io.cpp
+5 -4
View File
@@ -94,12 +94,12 @@ TEST(CanIOManager, Reception)
* Perf counters
*/
driver.select_failure = true;
EXPECT_EQ(-1, iomgr.receive(frame, uavcan::MonotonicTime(), flags));
EXPECT_EQ(-uavcan::ErrDriver, iomgr.receive(frame, uavcan::MonotonicTime(), flags));
driver.select_failure = false;
driver.ifaces.at(1).pushRx(frames[0][0]);
driver.ifaces.at(1).rx_failure = true;
EXPECT_EQ(-1, iomgr.receive(frame, uavcan::MonotonicTime(), flags));
EXPECT_EQ(-uavcan::ErrDriver, iomgr.receive(frame, uavcan::MonotonicTime(), flags));
driver.ifaces.at(0).num_errors = 9000;
driver.ifaces.at(1).num_errors = 100500;
@@ -268,8 +268,9 @@ TEST(CanIOManager, Transmission)
*/
// Select failure
driver.select_failure = true;
EXPECT_EQ(-1, iomgr.receive(rx_frame, tsMono(2000), flags));
EXPECT_EQ(-1, iomgr.send(frames[0], tsMono(2100), tsMono(2000), ALL_IFACES_MASK, CanTxQueue::Volatile, flags));
EXPECT_EQ(-uavcan::ErrDriver, iomgr.receive(rx_frame, tsMono(2000), flags));
EXPECT_EQ(-uavcan::ErrDriver,
iomgr.send(frames[0], tsMono(2100), tsMono(2000), ALL_IFACES_MASK, CanTxQueue::Volatile, flags));
EXPECT_EQ(1200, clockmock.monotonic);
EXPECT_EQ(1200, clockmock.utc);
ASSERT_EQ(0, flags);