mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-05 05:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rewritten HttpProxyOptionHandler using uri::parse().

Browse source 
Removed test case where username is empty and resulted URI has empty
username in URI.
This commit is contained in:
Tatsuhiro Tsujikawa 2011-10-18 00:40:43 +09:00
parent 065fb3a6b8
commit fc4d38d236
2 changed files with 21 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

23
test/OptionHandlerTest.cc
View file

@ -313,11 +313,11 @@ void OptionHandlerTest::testHttpProxyOptionHandler()
CPPUNIT_ASSERT(!handler.canHandle("foobar"));
Option option;
handler.parse(option, "proxy:65535");
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy:65535"),
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy:65535/"),
option.get(PREF_HTTP_PROXY));
handler.parse(option, "http://proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy:8080"),
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy:8080/"),
option.get(PREF_HTTP_PROXY));
handler.parse(option, "");
@ -332,32 +332,31 @@ void OptionHandlerTest::testHttpProxyOptionHandler()
handler.createPossibleValuesString());
handler.parse(option, "http://user%40:passwd%40@proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://user%40:passwd%40@proxy:8080"),
CPPUNIT_ASSERT_EQUAL(std::string("http://user%40:passwd%40@proxy:8080/"),
option.get(PREF_HTTP_PROXY));
option.put(PREF_HTTP_PROXY_USER, "proxy@user");
handler.parse(option, "http://proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy%40user@proxy:8080"),
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy%40user@proxy:8080/"),
option.get(PREF_HTTP_PROXY));
option.put(PREF_HTTP_PROXY_PASSWD, "proxy@passwd");
handler.parse(option, "http://proxy:8080");
CPPUNIT_ASSERT_EQUAL
(std::string("http://proxy%40user:proxy%40passwd@proxy:8080"),
(std::string("http://proxy%40user:proxy%40passwd@proxy:8080/"),
option.get(PREF_HTTP_PROXY));
handler.parse(option, "http://user:passwd@proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://user:passwd@proxy:8080"),
option.get(PREF_HTTP_PROXY));
option.put(PREF_HTTP_PROXY_USER, "");
handler.parse(option, "http://proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://:proxy%40passwd@proxy:8080"),
CPPUNIT_ASSERT_EQUAL(std::string("http://user:passwd@proxy:8080/"),
option.get(PREF_HTTP_PROXY));
option.put(PREF_HTTP_PROXY_PASSWD, "");
handler.parse(option, "http://proxy:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://:@proxy:8080"),
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy%40user:@proxy:8080/"),
option.get(PREF_HTTP_PROXY));
handler.parse(option, "http://[::1]:8080");
CPPUNIT_ASSERT_EQUAL(std::string("http://proxy%40user:@[::1]:8080/"),
option.get(PREF_HTTP_PROXY));
}