tests: unit-tests-{core,tools} no longer require a global io_service
BaseFixture is moved to tests/daemon and renamed to GlobalIoFixture
Refs: #4528
Change-Id: If9184e9f7f1d6072b0103d3ea3ca6c31a9e505c8
diff --git a/tests/daemon/rib-io-fixture.hpp b/tests/daemon/rib-io-fixture.hpp
index 67b803c..5fcefb6 100644
--- a/tests/daemon/rib-io-fixture.hpp
+++ b/tests/daemon/rib-io-fixture.hpp
@@ -26,7 +26,7 @@
#ifndef NFD_TESTS_DAEMON_RIB_IO_FIXTURE_HPP
#define NFD_TESTS_DAEMON_RIB_IO_FIXTURE_HPP
-#include "tests/test-common.hpp"
+#include "tests/daemon/global-io-fixture.hpp"
#include <condition_variable>
#include <mutex>
@@ -37,7 +37,7 @@
/** \brief A base test fixture that provides both main and RIB io_service.
*/
-class RibIoFixture : public virtual BaseFixture
+class RibIoFixture : public GlobalIoFixture
{
protected:
RibIoFixture();
@@ -79,8 +79,11 @@
/** \brief RibIoFixture that also overrides steady clock and system clock.
*/
-class RibIoTimeFixture : public RibIoFixture, public UnitTestTimeFixture
+class RibIoTimeFixture : public RibIoFixture, public ClockFixture
{
+protected:
+ RibIoTimeFixture();
+
private:
void
pollAfterClockTick() override;