mirror of
https://github.com/aria2/aria2.git
synced 2025-04-07 06:27:37 +03:00
d5bb035642
* src/AbstractCommand.cc (execute): Changed log level of MSG_RESTARTING_DOWNLOAD and MSG_MAX_TRY from error to info. Added MSG_DOWNLOAD_ABORTED after MSG_MAX_TRY. * src/message.h (MSG_TORRENT_DOWNLOAD_ABORTED): New definition. (MSG_DOWNLOAD_ABORTED): Added %s. (MSG_RESTARTING_DOWNLOAD): Added %s. (MSG_DOWNLOAD_ALREADY_COMPLETED): Updated. * src/PeerAbstractCommand.cc (execute): MSG_DOWNLOAD_ABORTED -> MSG_TORRENT_DOWNLOAD_ABORTED * src/Request.h (cookieBox): Made ShardHandle. * src/RequestGroup.h, src/RequestGroup.cc (createNextCommandWithAdj): New function. * src/FileAllocationCommand.cc (executeInternal): Use createNextCommandWithAdj(). * src/CheckIntegrityCommand.cc (executeInternal): Use createNextCommandWithAdj(). Added --load-cookies command-option. * src/OptionHandlerFactory.cc (createOptionHandlers): Added PREF_LOAD_COOKIES. * src/CookieBox.h, src/CookieBox.cc: Rwritten using CookieParser. Now aria2 can handle cookie's expiration date. * src/Cookie.h (expires): Changed its type to time_t. * src/main.cc: Added --load-cookies command-line option. * src/prefs.h (PREF_LOAD_COOKIES): New definition. * src/Util.h, src/Util.cc (httpGMT): New function. * src/Request.cc (Request): Initialize cookieBox using CookieBoxFactory. * src/CookieBoxFactory.h, src/CookieBoxFactory.cc: New class. * src/CookieParser.h, src/CookieParser.cc: New class. * src/main.cc: Chagned the default value of --metalink-servers to 5. * src/HttpResponseCommand.cc (handleOtherEncoding): Call RequestGroup::shouldCancelDownloadForSafety
64 lines
1.5 KiB
C++
64 lines
1.5 KiB
C++
#include "CookieBoxFactory.h"
|
|
#include <fstream>
|
|
#include <cppunit/extensions/HelperMacros.h>
|
|
|
|
using namespace std;
|
|
|
|
class CookieBoxFactoryTest:public CppUnit::TestFixture {
|
|
|
|
CPPUNIT_TEST_SUITE(CookieBoxFactoryTest);
|
|
CPPUNIT_TEST(testLoadDefaultCookie);
|
|
CPPUNIT_TEST(testCreateNewInstance);
|
|
CPPUNIT_TEST_SUITE_END();
|
|
private:
|
|
|
|
public:
|
|
void setUp() {
|
|
}
|
|
|
|
void testLoadDefaultCookie();
|
|
void testCreateNewInstance();
|
|
};
|
|
|
|
|
|
CPPUNIT_TEST_SUITE_REGISTRATION( CookieBoxFactoryTest );
|
|
|
|
void CookieBoxFactoryTest::testLoadDefaultCookie()
|
|
{
|
|
ifstream f("nscookietest.txt");
|
|
|
|
CookieBoxFactory factory;
|
|
|
|
factory.loadDefaultCookie(f);
|
|
|
|
Cookies cookies = factory.getDefaultCookies();
|
|
|
|
CPPUNIT_ASSERT_EQUAL(4, (int32_t)cookies.size());
|
|
|
|
Cookie c = cookies[0];
|
|
CPPUNIT_ASSERT_EQUAL(string("JSESSIONID"), c.name);
|
|
CPPUNIT_ASSERT_EQUAL(string("123456789"), c.value);
|
|
|
|
c = cookies[1];
|
|
CPPUNIT_ASSERT_EQUAL(string("user"), c.name);
|
|
CPPUNIT_ASSERT_EQUAL(string("me"), c.value);
|
|
|
|
c = cookies[2];
|
|
CPPUNIT_ASSERT_EQUAL(string("passwd"), c.name);
|
|
CPPUNIT_ASSERT_EQUAL(string("secret"), c.value);
|
|
|
|
c = cookies[3];
|
|
CPPUNIT_ASSERT_EQUAL(string("novalue"), c.name);
|
|
CPPUNIT_ASSERT_EQUAL(string(""), c.value);
|
|
}
|
|
|
|
void CookieBoxFactoryTest::testCreateNewInstance()
|
|
{
|
|
ifstream f("nscookietest.txt");
|
|
CookieBoxFactory factory;
|
|
factory.loadDefaultCookie(f);
|
|
CookieBoxHandle box = factory.createNewInstance();
|
|
Cookies cookies = box->criteriaFind("localhost", "/", 0, true);
|
|
|
|
CPPUNIT_ASSERT_EQUAL(4, (int32_t)cookies.size());
|
|
}
|