diff --git a/libuavcan/test/transport/dispatcher.cpp b/libuavcan/test/transport/dispatcher.cpp index e2daa02f63..b33ace4931 100644 --- a/libuavcan/test/transport/dispatcher.cpp +++ b/libuavcan/test/transport/dispatcher.cpp @@ -52,7 +52,7 @@ static const uavcan::NodeID SELF_NODE_ID(64); TEST(Dispatcher, Reception) { - uavcan::PoolAllocator pool; + uavcan::PoolAllocator pool; SystemClockMock clockmock(100); CanDriverMock driver(2, clockmock); diff --git a/libuavcan/test/transport/incoming_transfer.cpp b/libuavcan/test/transport/incoming_transfer.cpp index 8c52dab8d8..735d0027b6 100644 --- a/libuavcan/test/transport/incoming_transfer.cpp +++ b/libuavcan/test/transport/incoming_transfer.cpp @@ -72,7 +72,7 @@ TEST(MultiFrameIncomingTransfer, Basic) using uavcan::RxFrame; using uavcan::MultiFrameIncomingTransfer; - NullAllocator poolmgr; // We don't need dynamic memory + uavcan::PoolAllocator poolmgr; uavcan::TransferBufferManager<256> bufmgr(poolmgr); const RxFrame frame = makeFrame(); diff --git a/libuavcan/test/transport/transfer_receiver.cpp b/libuavcan/test/transport/transfer_receiver.cpp index f58f21a3d6..878a41a70f 100644 --- a/libuavcan/test/transport/transfer_receiver.cpp +++ b/libuavcan/test/transport/transfer_receiver.cpp @@ -74,15 +74,13 @@ const uavcan::TransferBufferManagerKey RxFrameGenerator::DEFAULT_KEY(42, uavcan: template struct Context { - NullAllocator pool; // We don't need dynamic memory for this test + uavcan::PoolAllocator pool; uavcan::TransferReceiver receiver; // Must be default constructible and copyable uavcan::TransferBufferManager bufmgr; Context() : bufmgr(pool) - { - assert(pool.allocate(1) == NULL); - } + { } ~Context() { diff --git a/libuavcan/test/transport/transfer_sender.cpp b/libuavcan/test/transport/transfer_sender.cpp index 62205c68c1..ff5595e19a 100644 --- a/libuavcan/test/transport/transfer_sender.cpp +++ b/libuavcan/test/transport/transfer_sender.cpp @@ -29,7 +29,7 @@ static int sendOne(uavcan::TransferSender& sender, const std::string& data, TEST(TransferSender, Basic) { - NullAllocator poolmgr; + uavcan::PoolAllocator poolmgr; SystemClockMock clockmock(100); CanDriverMock driver(2, clockmock); @@ -190,7 +190,7 @@ struct TransferSenderTestLoopbackFrameListener : public uavcan::LoopbackFrameLis TEST(TransferSender, Loopback) { - NullAllocator poolmgr; + uavcan::PoolAllocator poolmgr; SystemClockMock clockmock(100); CanDriverMock driver(2, clockmock); @@ -231,7 +231,7 @@ TEST(TransferSender, Loopback) TEST(TransferSender, PassiveMode) { - NullAllocator poolmgr; + uavcan::PoolAllocator poolmgr; SystemClockMock clockmock(100); CanDriverMock driver(2, clockmock);