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

More transport test fixes, 4 to go

Browse Source
This commit is contained in:
Pavel Kirienko
2015-10-14 09:48:19 +03:00
parent 706198fa38
commit 34b32ce0c0
3 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/test/transport/transfer_buffer.cpp
+7 -14
View File
@@ -229,7 +229,7 @@ TEST(TransferBufferManager, Basic)
using uavcan::TransferBufferManagerKey;
using uavcan::ITransferBuffer;
static const int POOL_BLOCKS = 8;
static const int POOL_BLOCKS = 100;
uavcan::PoolAllocator<uavcan::MemPoolBlockSize * POOL_BLOCKS, uavcan::MemPoolBlockSize> pool;
typedef TransferBufferManager<MGR_MAX_BUFFER_SIZE> TransferBufferManagerType;
@@ -256,26 +256,19 @@ TEST(TransferBufferManager, Basic)
ASSERT_TRUE((tbb = mgr->create(keys[1])));
ASSERT_EQ(MGR_MAX_BUFFER_SIZE, fillTestData(MGR_TEST_DATA[1], tbb));
ASSERT_EQ(0, mgr->getNumBuffers());
ASSERT_EQ(0, pool.getNumUsedBlocks());
ASSERT_EQ(2, mgr->getNumBuffers());
ASSERT_LT(2, pool.getNumUsedBlocks());
ASSERT_TRUE((tbb = mgr->create(keys[2])));
ASSERT_EQ(1, pool.getNumUsedBlocks()); // Empty dynamic buffer occupies one block
ASSERT_EQ(MGR_MAX_BUFFER_SIZE, fillTestData(MGR_TEST_DATA[2], tbb));
ASSERT_EQ(1, mgr->getNumBuffers());
ASSERT_LT(1, pool.getNumUsedBlocks());
ASSERT_EQ(3, mgr->getNumBuffers());
std::cout << "TransferBufferManager - Basic: Pool usage: " << pool.getNumUsedBlocks() << std::endl;
ASSERT_TRUE((tbb = mgr->create(keys[3])));
ASSERT_LT(0, pool.getNumUsedBlocks());
ASSERT_LT(0, fillTestData(MGR_TEST_DATA[3], tbb));
ASSERT_EQ(2, mgr->getNumBuffers());
// Dynamic 3 - will fail due to OOM
ASSERT_FALSE((tbb = mgr->create(keys[4])));
ASSERT_EQ(2, mgr->getNumBuffers());
ASSERT_EQ(4, mgr->getNumBuffers());
// Making sure all buffers contain proper data
ASSERT_TRUE((tbb = mgr->access(keys[0])));
@@ -292,12 +285,12 @@ TEST(TransferBufferManager, Basic)
mgr->remove(keys[1]);
ASSERT_FALSE(mgr->access(keys[1]));
ASSERT_EQ(1, mgr->getNumBuffers());
ASSERT_EQ(3, mgr->getNumBuffers());
ASSERT_LT(0, pool.getNumFreeBlocks());
mgr->remove(keys[0]);
ASSERT_FALSE(mgr->access(keys[0]));
ASSERT_EQ(0, mgr->getNumBuffers());
ASSERT_EQ(2, mgr->getNumBuffers());
// At this time we have the following NodeID: 2, 127
ASSERT_TRUE((tbb = mgr->access(keys[2])));