diff options
Diffstat (limited to 'Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp')
-rw-r--r-- | Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp b/Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp index aefd815..53b9413 100644 --- a/Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp +++ b/Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp @@ -10,26 +10,26 @@ #include <cppunit/extensions/TestFactoryRegistry.h> #include <Swiften/Network/DomainNameServiceQuery.h> #include <Swiften/Base/RandomGenerator.h> using namespace Swift; namespace { struct RandomGenerator1 : public RandomGenerator { - virtual int generateWeighedRandomNumber(std::vector<double>::const_iterator, std::vector<double>::const_iterator) { + virtual int generateRandomInteger(int) { return 0; } }; struct RandomGenerator2 : public RandomGenerator { - virtual int generateWeighedRandomNumber(std::vector<double>::const_iterator probabilities_begin, std::vector<double>::const_iterator probabilities_end) { - return std::max_element(probabilities_begin, probabilities_end) - probabilities_begin; + virtual int generateRandomInteger(int i) { + return i; } }; } class DomainNameServiceQueryTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(DomainNameServiceQueryTest); CPPUNIT_TEST(testSortResults_Random1); CPPUNIT_TEST(testSortResults_Random2); CPPUNIT_TEST_SUITE_END(); @@ -64,19 +64,19 @@ class DomainNameServiceQueryTest : public CppUnit::TestFixture { results.push_back(DomainNameServiceQuery::Result("server5.com", 5222, 2, 1)); results.push_back(DomainNameServiceQuery::Result("server6.com", 5222, 3, 10)); results.push_back(DomainNameServiceQuery::Result("server7.com", 5222, 3, 40)); RandomGenerator2 generator; DomainNameServiceQuery::sortResults(results, generator); CPPUNIT_ASSERT_EQUAL(std::string("server5.com"), results[0].hostname); CPPUNIT_ASSERT_EQUAL(std::string("server7.com"), results[1].hostname); - CPPUNIT_ASSERT_EQUAL(std::string("server4.com"), results[2].hostname); - CPPUNIT_ASSERT_EQUAL(std::string("server6.com"), results[3].hostname); - CPPUNIT_ASSERT_EQUAL(std::string("server2.com"), results[4].hostname); + CPPUNIT_ASSERT_EQUAL(std::string("server2.com"), results[2].hostname); + CPPUNIT_ASSERT_EQUAL(std::string("server4.com"), results[3].hostname); + CPPUNIT_ASSERT_EQUAL(std::string("server6.com"), results[4].hostname); CPPUNIT_ASSERT_EQUAL(std::string("server1.com"), results[5].hostname); CPPUNIT_ASSERT_EQUAL(std::string("server3.com"), results[6].hostname); } }; CPPUNIT_TEST_SUITE_REGISTRATION(DomainNameServiceQueryTest); |