fixing RRC measurement test after logmap refactor

This commit is contained in:
Andre Puschmann 2020-01-31 10:57:39 +01:00
parent 3d7598a4cb
commit 9720449cbb
1 changed files with 6 additions and 12 deletions

View File

@ -107,7 +107,7 @@ private:
class nas_test : public srsue::nas class nas_test : public srsue::nas
{ {
public: public:
nas_test(srslte::log* log_, srslte::timer_handler* t) : srsue::nas(log_, t) {} nas_test(srslte::timer_handler* t) : srsue::nas(t) {}
bool is_attached() override { return false; } bool is_attached() override { return false; }
}; };
@ -172,18 +172,12 @@ public:
rrc_test(srslte::log* log_) : rrc(log_) rrc_test(srslte::log* log_) : rrc(log_)
{ {
pool = srslte::byte_buffer_pool::get_instance(); pool = srslte::byte_buffer_pool::get_instance();
nastest = new nas_test(log_, &global_timers); nastest = std::unique_ptr<nas_test>(new nas_test(&global_timers));
pdcptest = new pdcp_test(log_, &global_timers); pdcptest = std::unique_ptr<pdcp_test>(new pdcp_test(log_, &global_timers));
}; };
~rrc_test()
{
delete nastest;
delete pdcptest;
}
void init() void init()
{ {
rrc::init(&phytest, nullptr, nullptr, pdcptest, nastest, nullptr, nullptr, &global_timers, nullptr, {}); rrc::init(&phytest, nullptr, nullptr, pdcptest.get(), nastest.get(), nullptr, nullptr, &global_timers, nullptr, {});
} }
void run_tti(uint32_t tti_) void run_tti(uint32_t tti_)
@ -265,8 +259,8 @@ public:
phy_test phytest; phy_test phytest;
private: private:
pdcp_test* pdcptest; std::unique_ptr<pdcp_test> pdcptest;
nas_test* nastest; std::unique_ptr<nas_test> nastest;
uint32_t tti = 0; uint32_t tti = 0;
srslte::byte_buffer_pool* pool = nullptr; srslte::byte_buffer_pool* pool = nullptr;
}; };