Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-21 21:36:09 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-21 21:46:41 (GMT) |
| commit | e96118247793fdf4b40dc61d7ebd2c19a64939a3 (patch) | |
| tree | 8737469cdb11ddf4ad5dc333ff87055548778cc9 /Swiften/QA/NetworkTest/DomainNameResolverTest.cpp | |
| parent | ddebccbd59dd9cbd0c61efe55a09d74df8ec83c8 (diff) | |
| download | swift-contrib-e96118247793fdf4b40dc61d7ebd2c19a64939a3.zip swift-contrib-e96118247793fdf4b40dc61d7ebd2c19a64939a3.tar.bz2 | |
Fix libunbound support in Swiften which was broken since API change in 8ec22a9.
Test-Information:
Build for Android 4.3 (arm) and successfully ran checker in emulator VM.
Change-Id: Iedaae5df367ee86bfe2375879b0e0981deef9b0a
Diffstat (limited to 'Swiften/QA/NetworkTest/DomainNameResolverTest.cpp')
| -rw-r--r-- | Swiften/QA/NetworkTest/DomainNameResolverTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp index 6d25f49..dcd2be8 100644 --- a/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp +++ b/Swiften/QA/NetworkTest/DomainNameResolverTest.cpp @@ -23,74 +23,74 @@ #include <Swiften/Network/DomainNameAddressQuery.h> #include <Swiften/Network/DomainNameServiceQuery.h> #include <Swiften/EventLoop/DummyEventLoop.h> #include <Swiften/IDN/IDNConverter.h> #include <Swiften/IDN/PlatformIDNConverter.h> using namespace Swift; struct CompareHostAddresses { bool operator()(const HostAddress& h1, const HostAddress& h2) { return h1.toString() < h2.toString(); } }; class DomainNameResolverTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(DomainNameResolverTest); CPPUNIT_TEST(testResolveAddress); CPPUNIT_TEST(testResolveAddress_Error); #ifndef USE_UNBOUND CPPUNIT_TEST(testResolveAddress_IPv6); CPPUNIT_TEST(testResolveAddress_IPv4and6); CPPUNIT_TEST(testResolveAddress_International); #endif CPPUNIT_TEST(testResolveAddress_Localhost); CPPUNIT_TEST(testResolveAddress_Parallel); #ifndef USE_UNBOUND CPPUNIT_TEST(testResolveService); #endif CPPUNIT_TEST(testResolveService_Error); CPPUNIT_TEST_SUITE_END(); public: void setUp() { ioServiceThread = new BoostIOServiceThread(); eventLoop = new DummyEventLoop(); + idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create()); #ifdef USE_UNBOUND - resolver = new UnboundDomainNameResolver(ioServiceThread->getIOService(), eventLoop); + resolver = new UnboundDomainNameResolver(idnConverter.get(), ioServiceThread->getIOService(), eventLoop); #else - idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create()); resolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop); #endif resultsAvailable = false; } void tearDown() { delete ioServiceThread; delete resolver; delete eventLoop; } void testResolveAddress() { boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp.test.swift.im")); query->run(); waitForResults(); CPPUNIT_ASSERT(!addressQueryError); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(addressQueryResult.size())); CPPUNIT_ASSERT_EQUAL(std::string("10.0.0.0"), addressQueryResult[0].toString()); } void testResolveAddress_Error() { boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("invalid.test.swift.im")); query->run(); waitForResults(); CPPUNIT_ASSERT(addressQueryError); } void testResolveAddress_IPv6() { boost::shared_ptr<DomainNameAddressQuery> query(createAddressQuery("xmpp-ipv6.test.swift.im")); query->run(); |