Transport test fixes, 10 to go

This commit is contained in:
Pavel Kirienko
2015-10-14 09:06:15 +03:00
parent 3e6102d479
commit 706198fa38
4 changed files with 7 additions and 9 deletions
+1 -1
View File
@@ -52,7 +52,7 @@ static const uavcan::NodeID SELF_NODE_ID(64);
TEST(Dispatcher, Reception)
{
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 8, uavcan::MemPoolBlockSize> pool;
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> pool;
SystemClockMock clockmock(100);
CanDriverMock driver(2, clockmock);
@@ -72,7 +72,7 @@ TEST(MultiFrameIncomingTransfer, Basic)
using uavcan::RxFrame;
using uavcan::MultiFrameIncomingTransfer;
NullAllocator poolmgr; // We don't need dynamic memory
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> poolmgr;
uavcan::TransferBufferManager<256> bufmgr(poolmgr);
const RxFrame frame = makeFrame();
@@ -74,15 +74,13 @@ const uavcan::TransferBufferManagerKey RxFrameGenerator::DEFAULT_KEY(42, uavcan:
template <unsigned BufSize>
struct Context
{
NullAllocator pool; // We don't need dynamic memory for this test
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> pool;
uavcan::TransferReceiver receiver; // Must be default constructible and copyable
uavcan::TransferBufferManager<BufSize> bufmgr;
Context() :
bufmgr(pool)
{
assert(pool.allocate(1) == NULL);
}
{ }
~Context()
{
+3 -3
View File
@@ -29,7 +29,7 @@ static int sendOne(uavcan::TransferSender& sender, const std::string& data,
TEST(TransferSender, Basic)
{
NullAllocator poolmgr;
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> poolmgr;
SystemClockMock clockmock(100);
CanDriverMock driver(2, clockmock);
@@ -190,7 +190,7 @@ struct TransferSenderTestLoopbackFrameListener : public uavcan::LoopbackFrameLis
TEST(TransferSender, Loopback)
{
NullAllocator poolmgr;
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> poolmgr;
SystemClockMock clockmock(100);
CanDriverMock driver(2, clockmock);
@@ -231,7 +231,7 @@ TEST(TransferSender, Loopback)
TEST(TransferSender, PassiveMode)
{
NullAllocator poolmgr;
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * 100, uavcan::MemPoolBlockSize> poolmgr;
SystemClockMock clockmock(100);
CanDriverMock driver(2, clockmock);