GitHub-Mirror/kovri
0
0
Fork 0
mirror of https://github.com/monero-project/kovri synced 2025-10-06 00:32:51 +02:00
Code Issues Releases Wiki Activity

Tests: RouterInfo: fixes for Boost macros

Browse Source 
For some supported Boost versions, BOOST_CHECK_EQUAL and BOOST_CHECK_NE
macros have issues comparing nullptr. Issue affects Boost versions at
least up to 1.63.
This commit is contained in:
oneiric
2018-07-25 04:25:50 +00:00
parent a383f48e18
commit 50815d4c4f
1 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tests/unit_tests/core/router/info.cc
View File

@@ -91,12 +91,12 @@ BOOST_AUTO_TEST_CASE(GetAddress)
keys, {{"127.0.0.1", 54321}, {"::1", 12345}}, {true, true});
// Yes ipv4
BOOST_CHECK_NE(ri.GetV4Address(Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetV4Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::SSU) != nullptr);
// Yes ipv6
BOOST_CHECK_NE(ri.GetV6Address(Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetV6Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::SSU) != nullptr);
}
BOOST_AUTO_TEST_CASE(GetAddressIPv4only)
@@ -104,24 +104,24 @@ BOOST_AUTO_TEST_CASE(GetAddressIPv4only)
core::RouterInfo ri(keys, {{"127.0.0.1", 54321}}, {true, true});
// Yes ipv4
BOOST_CHECK_NE(ri.GetV4Address(Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetV4Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::SSU) != nullptr);
BOOST_CHECK_NE(ri.GetAddress(false, Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetAddress(false, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAddress(false, Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetAddress(false, Transport::SSU) != nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(false, Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(false, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAnyAddress(false, Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetAnyAddress(false, Transport::SSU) != nullptr);
// No ipv6
BOOST_CHECK_EQUAL(ri.GetV6Address(Transport::NTCP), nullptr);
BOOST_CHECK_EQUAL(ri.GetV6Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::NTCP) == nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::SSU) == nullptr);
BOOST_CHECK_EQUAL(ri.GetAddress(true, Transport::NTCP), nullptr);
BOOST_CHECK_EQUAL(ri.GetAddress(true, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAddress(true, Transport::NTCP) == nullptr);
BOOST_CHECK(ri.GetAddress(true, Transport::SSU) == nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(true, Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(true, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAnyAddress(true, Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetAnyAddress(true, Transport::SSU) != nullptr);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(true, Transport::NTCP)->host.is_v6(), false);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(true, Transport::SSU)->host.is_v6(), false);
@@ -132,24 +132,24 @@ BOOST_AUTO_TEST_CASE(GetAddressIPv6only)
core::RouterInfo ri(keys, {{"::1", 54321}}, {true, true});
// No ipv4
BOOST_CHECK_EQUAL(ri.GetV4Address(Transport::NTCP), nullptr);
BOOST_CHECK_EQUAL(ri.GetV4Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::NTCP) == nullptr);
BOOST_CHECK(ri.GetV4Address(Transport::SSU) == nullptr);
BOOST_CHECK_EQUAL(ri.GetAddress(false, Transport::NTCP), nullptr);
BOOST_CHECK_EQUAL(ri.GetAddress(false, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAddress(false, Transport::NTCP) == nullptr);
BOOST_CHECK(ri.GetAddress(false, Transport::SSU) == nullptr);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(false, Transport::NTCP), nullptr);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(false, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAnyAddress(false, Transport::NTCP) == nullptr);
BOOST_CHECK(ri.GetAnyAddress(false, Transport::SSU) == nullptr);
// Yes ipv6
BOOST_CHECK_NE(ri.GetV6Address(Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetV6Address(Transport::SSU), nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetV6Address(Transport::SSU) != nullptr);
BOOST_CHECK_NE(ri.GetAddress(true, Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetAddress(true, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAddress(true, Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetAddress(true, Transport::SSU) != nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(true, Transport::NTCP), nullptr);
BOOST_CHECK_NE(ri.GetAnyAddress(true, Transport::SSU), nullptr);
BOOST_CHECK(ri.GetAnyAddress(true, Transport::NTCP) != nullptr);
BOOST_CHECK(ri.GetAnyAddress(true, Transport::SSU) != nullptr);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(true, Transport::NTCP)->host.is_v6(), true);
BOOST_CHECK_EQUAL(ri.GetAnyAddress(true, Transport::SSU)->host.is_v6(), true);