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

Test: TestSubscriber renamed to TestListener

Browse Source
This commit is contained in:
Pavel Kirienko
2014-03-18 15:36:31 +04:00
parent aeee4b9e37
commit fc490e93e1
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/transport/dispatcher.cpp
+1 -1
View File
@@ -61,7 +61,7 @@ TEST(Dispatcher, Reception)
makeDataType(uavcan::DataTypeKindService, 1) makeDataType(uavcan::DataTypeKindService, 1)
}; };
typedef TestSubscriber<512, 2, 2> Subscriber; typedef TestListener<512, 2, 2> Subscriber;
typedef std::auto_ptr<Subscriber> SubscriberPtr; typedef std::auto_ptr<Subscriber> SubscriberPtr;
static const int NUM_SUBSCRIBERS = 6; static const int NUM_SUBSCRIBERS = 6;
SubscriberPtr subscribers[NUM_SUBSCRIBERS] = SubscriberPtr subscribers[NUM_SUBSCRIBERS] =
libuavcan/test/transport/transfer_listener.cpp
+5 -5
View File
@@ -38,7 +38,7 @@ TEST(TransferListener, BasicMFT)
uavcan::PoolManager<1> poolmgr; uavcan::PoolManager<1> poolmgr;
poolmgr.addPool(&pool); poolmgr.addPool(&pool);
TestSubscriber<256, 1, 1> subscriber(type, poolmgr); TestListener<256, 1, 1> subscriber(type, poolmgr);
/* /*
* Test data * Test data
@@ -89,7 +89,7 @@ TEST(TransferListener, CrcFailure)
const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A"); const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A");
uavcan::PoolManager<1> poolmgr; // No dynamic memory uavcan::PoolManager<1> poolmgr; // No dynamic memory
TestSubscriber<256, 2, 2> subscriber(type, poolmgr); // Static buffer only, 2 entries TestListener<256, 2, 2> subscriber(type, poolmgr); // Static buffer only, 2 entries
/* /*
* Generating transfers with damaged payload (CRC is not valid) * Generating transfers with damaged payload (CRC is not valid)
@@ -132,7 +132,7 @@ TEST(TransferListener, BasicSFT)
const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A"); const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A");
uavcan::PoolManager<1> poolmgr; // No dynamic memory. At all. uavcan::PoolManager<1> poolmgr; // No dynamic memory. At all.
TestSubscriber<0, 0, 5> subscriber(type, poolmgr); // Max buf size is 0, i.e. SFT-only TestListener<0, 0, 5> subscriber(type, poolmgr); // Max buf size is 0, i.e. SFT-only
TransferListenerEmulator emulator(subscriber, type); TransferListenerEmulator emulator(subscriber, type);
const Transfer transfers[] = const Transfer transfers[] =
@@ -167,7 +167,7 @@ TEST(TransferListener, Cleanup)
const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A"); const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A");
uavcan::PoolManager<1> poolmgr; // No dynamic memory uavcan::PoolManager<1> poolmgr; // No dynamic memory
TestSubscriber<256, 1, 2> subscriber(type, poolmgr); // Static buffer only, 1 entry TestListener<256, 1, 2> subscriber(type, poolmgr); // Static buffer only, 1 entry
/* /*
* Generating transfers * Generating transfers
@@ -221,7 +221,7 @@ TEST(TransferListener, MaximumTransferLength)
const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A"); const uavcan::DataTypeDescriptor type(uavcan::DataTypeKindMessage, 123, uavcan::DataTypeSignature(123456789), "A");
uavcan::PoolManager<1> poolmgr; uavcan::PoolManager<1> poolmgr;
TestSubscriber<uavcan::MaxTransferPayloadLen * 2, 2, 2> subscriber(type, poolmgr); TestListener<uavcan::MaxTransferPayloadLen * 2, 2, 2> subscriber(type, poolmgr);
static const std::string DATA_OK(uavcan::MaxTransferPayloadLen, 'z'); static const std::string DATA_OK(uavcan::MaxTransferPayloadLen, 'z');
libuavcan/test/transport/transfer_sender.cpp
+3 -3
View File
@@ -113,9 +113,9 @@ TEST(TransferSender, Basic)
} }
} }
TestSubscriber<512, 2, 2> sub_msg(TYPES[0], poolmgr); TestListener<512, 2, 2> sub_msg(TYPES[0], poolmgr);
TestSubscriber<512, 2, 2> sub_srv_req(TYPES[1], poolmgr); TestListener<512, 2, 2> sub_srv_req(TYPES[1], poolmgr);
TestSubscriber<512, 2, 2> sub_srv_resp(TYPES[1], poolmgr); TestListener<512, 2, 2> sub_srv_resp(TYPES[1], poolmgr);
dispatcher_rx.registerMessageListener(&sub_msg); dispatcher_rx.registerMessageListener(&sub_msg);
dispatcher_rx.registerServiceRequestListener(&sub_srv_req); dispatcher_rx.registerServiceRequestListener(&sub_srv_req);
libuavcan/test/transport/transfer_test_helpers.hpp
+2 -2
View File
@@ -110,14 +110,14 @@ struct Transfer
* which are dispatched/filtered by uavcan::Dispatcher. * which are dispatched/filtered by uavcan::Dispatcher.
*/ */
template <unsigned int MAX_BUF_SIZE, unsigned int NUM_STATIC_BUFS, unsigned int NUM_STATIC_RECEIVERS> template <unsigned int MAX_BUF_SIZE, unsigned int NUM_STATIC_BUFS, unsigned int NUM_STATIC_RECEIVERS>
class TestSubscriber : public uavcan::TransferListener<MAX_BUF_SIZE, NUM_STATIC_BUFS, NUM_STATIC_RECEIVERS> class TestListener : public uavcan::TransferListener<MAX_BUF_SIZE, NUM_STATIC_BUFS, NUM_STATIC_RECEIVERS>
{ {
typedef uavcan::TransferListener<MAX_BUF_SIZE, NUM_STATIC_BUFS, NUM_STATIC_RECEIVERS> Base; typedef uavcan::TransferListener<MAX_BUF_SIZE, NUM_STATIC_BUFS, NUM_STATIC_RECEIVERS> Base;
std::queue<Transfer> transfers_; std::queue<Transfer> transfers_;
public: public:
TestSubscriber(const uavcan::DataTypeDescriptor& data_type, uavcan::IAllocator& allocator) TestListener(const uavcan::DataTypeDescriptor& data_type, uavcan::IAllocator& allocator)
: Base(data_type, allocator) : Base(data_type, allocator)
{ } { }