generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-14 02:57:45 +01:00
Code Issues Projects Releases Wiki Activity

fix(IPAddress): windows scoped test, part II #4644

Browse Source
This commit is contained in:
Alex Fabijanic 2024-10-30 22:39:45 -05:00 committed by Aleksandar Fabijanic
parent 13ea31f442
commit c3abc7b1ec
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Net/testsuite/src/IPAddressTest.cpp
View File

@ -427,12 +427,18 @@ void IPAddressTest::testClassification6()
assertTrue (!ip10.isSiteLocalMC()); assertTrue (!ip10.isSiteLocalMC());
assertTrue (!ip10.isOrgLocalMC()); assertTrue (!ip10.isOrgLocalMC());
assertTrue (!ip10.isGlobalMC()); assertTrue (!ip10.isGlobalMC());
//#if defined(_WIN32)
// int scope = it->second.index();
NetworkInterface::Map m = NetworkInterface::map(false, false); NetworkInterface::Map m = NetworkInterface::map(false, false);
for (auto it = m.begin(); it != m.end(); ++it) for (auto it = m.begin(); it != m.end(); ++it)
{ {
#if defined(_WIN32)
IPAddress ip11(Poco::format("fe80::1592:96a0:88bf:d2d7%%%u",
it->second.index())); // link local unicast scoped
#else
IPAddress ip11(Poco::format("fe80::1592:96a0:88bf:d2d7%%%s", IPAddress ip11(Poco::format("fe80::1592:96a0:88bf:d2d7%%%s",
it->second.adapterName())); // link local unicast scoped it->second.adapterName())); // link local unicast scoped
#endif
assertEqual (ip11.scope(), it->second.index()); assertEqual (ip11.scope(), it->second.index());
assertTrue (!ip11.isWildcard()); assertTrue (!ip11.isWildcard());
assertTrue (!ip11.isBroadcast()); assertTrue (!ip11.isBroadcast());
@ -448,8 +454,13 @@ void IPAddressTest::testClassification6()
assertTrue (!ip11.isOrgLocalMC()); assertTrue (!ip11.isOrgLocalMC());
assertTrue (!ip11.isGlobalMC()); assertTrue (!ip11.isGlobalMC());
IPAddress ip12(Poco::format("[fe80::1592:96a0:88bf:d2d7%%%s]", #if defined(_WIN32)
IPAddress ip12(Poco::format("fe80::1592:96a0:88bf:d2d7%%%u",
it->second.index())); // link local unicast scoped
#else
IPAddress ip12(Poco::format("fe80::1592:96a0:88bf:d2d7%%%s",
it->second.adapterName())); // link local unicast scoped it->second.adapterName())); // link local unicast scoped
#endif
assertEqual (ip12.scope(), it->second.index()); assertEqual (ip12.scope(), it->second.index());
assertTrue (!ip12.isWildcard()); assertTrue (!ip12.isWildcard());
assertTrue (!ip12.isBroadcast()); assertTrue (!ip12.isBroadcast());
@ -750,9 +761,9 @@ void IPAddressTest::testScoped()
for (; it != end; ++it) for (; it != end; ++it)
{ {
#if defined(_WIN32) #if defined(_WIN32)
int scope = it->second.index(); unsigned scope = it->second.index();
assertTrue(IPAddress::tryParse(Poco::format("[fe80::1592:96a0:88bf:d2d7%%%d]", scope), ip)); assertTrue(IPAddress::tryParse(Poco::format("[fe80::1592:96a0:88bf:d2d7%%%u]", scope), ip));
assertTrue(IPAddress::tryParse(Poco::format("fe80::1592:96a0:88bf:d2d7%%%d", scope), ip)); assertTrue(IPAddress::tryParse(Poco::format("fe80::1592:96a0:88bf:d2d7%%%u", scope), ip));
#else #else
std::string scope = it->second.adapterName(); std::string scope = it->second.adapterName();
assertTrue (IPAddress::tryParse(Poco::format("[fe80::1592:96a0:88bf:d2d7%%%s]", scope), ip)); assertTrue (IPAddress::tryParse(Poco::format("[fe80::1592:96a0:88bf:d2d7%%%s]", scope), ip));