diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-01-06 13:13:42 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2009-01-06 13:13:42 +0000 |
| commit | 0a4f43d0edeefb5bc49329b791984c7b2072d1df (patch) | |
| tree | 55d0b23ea83e0a9dbd1d78458b2affb493965700 /test/ServerStatTest.cc | |
| parent | 5325ec4155ad85339a6a5717b6f4854c0bf67eb0 (diff) | |
2009-01-06 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Applied AdaptiveURISelector patch from Aurelien Lefebvre. This
patch adds AdaptiveURISelector, which selects one of the bests
mirrors for first and reserved connections. For supplementary
ones, it returns mirrors which has not been tested yet, and if
each of them already tested, returns mirrors which has to be
tested again. Otherwise, it doesn't return anymore mirrors.
* src/AdaptiveURISelector.cc
* src/AdaptiveURISelector.h
* src/FtpNegotiationCommand.cc
* src/HttpResponseCommand.cc
* src/Makefile.am
* src/Makefile.in
* src/OptionHandlerFactory.cc
* src/RequestGroup.cc
* src/RequestGroup.h
* src/RequestGroupMan.cc
* src/ServerStat.cc
* src/ServerStat.h
* src/ServerStatMan.cc
* src/SpeedCalc.cc
* src/URISelector.h
* src/prefs.cc
* src/prefs.h
* test/RequestGroupManTest.cc
* test/ServerStatManTest.cc
* test/ServerStatTest.cc
Diffstat (limited to 'test/ServerStatTest.cc')
| -rw-r--r-- | test/ServerStatTest.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/test/ServerStatTest.cc b/test/ServerStatTest.cc index bbd493b9..92903c7b 100644 --- a/test/ServerStatTest.cc +++ b/test/ServerStatTest.cc @@ -1,10 +1,13 @@ #include "ServerStat.h" -#include "Exception.h" -#include "Util.h" + #include <iostream> #include <sstream> + #include <cppunit/extensions/HelperMacros.h> +#include "Exception.h" +#include "Util.h" + namespace aria2 { class ServerStatTest:public CppUnit::TestFixture { @@ -46,6 +49,9 @@ void ServerStatTest::testOperatorOstream() ServerStat localhost_http("localhost", "http"); localhost_http.setDownloadSpeed(90000); localhost_http.setLastUpdated(Time(1000)); + localhost_http.setSingleConnectionAvgSpeed(101); + localhost_http.setMultiConnectionAvgSpeed(102); + localhost_http.setCounter(5); std::stringstream ss; @@ -53,7 +59,9 @@ void ServerStatTest::testOperatorOstream() CPPUNIT_ASSERT_EQUAL (std::string - ("host=localhost, protocol=http, dl_speed=90000, last_updated=1000, status=OK"), + ("host=localhost, protocol=http, dl_speed=90000," + " sc_avg_speed=101, mc_avg_speed=102," + " last_updated=1000, counter=5, status=OK"), ss.str()); ss.str(""); @@ -67,7 +75,9 @@ void ServerStatTest::testOperatorOstream() CPPUNIT_ASSERT_EQUAL (std::string - ("host=localhost, protocol=ftp, dl_speed=10000, last_updated=1210000000, status=ERROR"), + ("host=localhost, protocol=ftp, dl_speed=10000," + " sc_avg_speed=0, mc_avg_speed=0," + " last_updated=1210000000, counter=0, status=ERROR"), ss.str()); } |