tests: test IP transports under various combos of address family/scope
In particular, link-local addresses are now tested as well.
Additionally, WebSocketTransport send/receive tests are extended
to check transport counters.
Change-Id: I5b35f498a5d8d70cb1f7a2bea3ce99d22370e050
Refs: #1428
diff --git a/tests/daemon/face/multicast-udp-transport-fixture.hpp b/tests/daemon/face/multicast-udp-transport-fixture.hpp
index c2b92b2..7c3ca21 100644
--- a/tests/daemon/face/multicast-udp-transport-fixture.hpp
+++ b/tests/daemon/face/multicast-udp-transport-fixture.hpp
@@ -30,7 +30,6 @@
#include "face/face.hpp"
#include "dummy-receive-link-service.hpp"
-#include "test-netif-ip.hpp"
#include "tests/limited-io.hpp"
namespace nfd {
@@ -47,7 +46,6 @@
MulticastUdpTransportFixture()
: transport(nullptr)
, multicastEp(ip::address::from_string("230.15.19.47"), 7070)
- , defaultAddr(getTestIp(AddressFamily::V4, AddressScope::Global, MulticastInterface::Yes))
, receivedPackets(nullptr)
, remoteSockRx(g_io)
, remoteSockTx(g_io)
@@ -63,12 +61,11 @@
udp::socket sockTx(g_io);
localEp = udp::endpoint(address, 7001);
openMulticastSockets(sockRx, sockTx, localEp.port());
- ndn::nfd::LinkType linkType = ndn::nfd::LINK_TYPE_MULTI_ACCESS;
face = make_unique<Face>(
make_unique<DummyReceiveLinkService>(),
make_unique<MulticastUdpTransport>(localEp, multicastEp, std::move(sockRx),
- std::move(sockTx), linkType));
+ std::move(sockTx), ndn::nfd::LINK_TYPE_MULTI_ACCESS));
transport = static_cast<MulticastUdpTransport*>(face->getTransport());
receivedPackets = &static_cast<DummyReceiveLinkService*>(face->getLinkService())->receivedPackets;
@@ -119,7 +116,6 @@
MulticastUdpTransport* transport;
udp::endpoint localEp;
udp::endpoint multicastEp;
- const ip::address defaultAddr;
std::vector<Transport::Packet>* receivedPackets;
private: