generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-17 12:02:36 +01:00
Code Issues Projects Releases Wiki Activity

Remove try/catch. Exception is avoided by CPPUNI_IGNORE

Browse Source 
Signed-off-by: FrancisANDRE <zosrothko@orange.fr>
This commit is contained in:
FrancisANDRE 2015-12-21 23:39:35 +01:00
parent 609072a5ad
commit 6d96fb30ec
4 changed files with 65 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
NetSSL_OpenSSL/testsuite/src/HTTPSClientSessionTest.cpp
View File

@ -307,27 +307,22 @@ void HTTPSClientSessionTest::testInterop()
void HTTPSClientSessionTest::testProxy()
{
try {
HTTPSTestServer srv;
HTTPSClientSession s("secure.appinf.com");
s.setProxy(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
HTTPRequest request(HTTPRequest::HTTP_GET, "/public/poco/NetSSL.txt");
s.sendRequest(request);
X509Certificate cert = s.serverCertificate();
HTTPResponse response;
std::istream& rs = s.receiveResponse(response);
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
std::string str(ostr.str());
assert(str == "This is a test file for NetSSL.\n");
assert(cert.commonName() == "secure.appinf.com" || cert.commonName() == "*.appinf.com");
}
catch (Poco::Net::HTTPException e) {
std::cout << e.displayText() << std::endl;
}
HTTPSTestServer srv;
HTTPSClientSession s("secure.appinf.com");
s.setProxy(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
HTTPRequest request(HTTPRequest::HTTP_GET, "/public/poco/NetSSL.txt");
s.sendRequest(request);
X509Certificate cert = s.serverCertificate();
HTTPResponse response;
std::istream& rs = s.receiveResponse(response);
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
std::string str(ostr.str());
assert(str == "This is a test file for NetSSL.\n");
assert(cert.commonName() == "secure.appinf.com" || cert.commonName() == "*.appinf.com");
}
@ -480,7 +475,7 @@ CppUnit::Test* HTTPSClientSessionTest::suite()
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testKeepAlive);
CppUnit_addTest(pSuite, HTTPSClientSessionTest, testInterop);
#ifdef FIXME
should use a public proxy server
testProxy should use a public proxy server
http://www.publicproxyservers.com/proxy/list1.html
Really working public proxy servers - page 1 of 6.
#endif

28
NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp
View File

@ -85,21 +85,17 @@ void HTTPSStreamFactoryTest::testRedirect()
void HTTPSStreamFactoryTest::testProxy()
{
try {
HTTPSTestServer server;
HTTPSStreamFactory factory(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
URI uri("https://secure.appinf.com/public/poco/NetSSL.txt");
std::auto_ptr<std::istream> pStr(factory.open(uri));
std::ostringstream ostr;
StreamCopier::copyStream(*pStr.get(), ostr);
assert(ostr.str().length() > 0);
}
catch (Poco::Net::HTTPException e) {
std::cout << e.displayText() << std::endl;
}
HTTPSTestServer server;
HTTPSStreamFactory factory(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
URI uri("https://secure.appinf.com/public/poco/NetSSL.txt");
std::auto_ptr<std::istream> pStr(factory.open(uri));
std::ostringstream ostr;
StreamCopier::copyStream(*pStr.get(), ostr);
assert(ostr.str().length() > 0);
}
@ -139,7 +135,7 @@ CppUnit::Test* HTTPSStreamFactoryTest::suite()
CppUnit_addTest(pSuite, HTTPSStreamFactoryTest, testEmptyPath);
CppUnit_addTest(pSuite, HTTPSStreamFactoryTest, testRedirect);
#ifdef FIXME
should use a public proxy server
testProxy should use a public proxy server
http://www.publicproxyservers.com/proxy/list1.html
Really working public proxy servers - page 1 of 6.
#endif

42
NetSSL_Win/testsuite/src/HTTPSClientSessionTest.cpp
View File

@ -314,27 +314,27 @@ void HTTPSClientSessionTest::testInterop()
void HTTPSClientSessionTest::testProxy()
{
try {
HTTPSTestServer srv;
HTTPSClientSession s("secure.appinf.com");
s.setProxy(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
HTTPRequest request(HTTPRequest::HTTP_GET, "/public/poco/NetSSL.txt");
s.sendRequest(request);
Poco::Net::X509Certificate cert = s.serverCertificate();
HTTPResponse response;
std::istream& rs = s.receiveResponse(response);
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
std::string str(ostr.str());
assert(str == "This is a test file for NetSSL.\n");
assert(cert.commonName() == "secure.appinf.com" || cert.commonName() == "*.appinf.com");
}
catch (Poco::Exception e) {
std::cout << e.displayText() << std::endl;
}
#ifdef FIXME
testProxy should use a public proxy server
http://www.publicproxyservers.com/proxy/list1.html
Really working public proxy servers - page 1 of 6.
#endif
HTTPSTestServer srv;
HTTPSClientSession s("secure.appinf.com");
s.setProxy(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
HTTPRequest request(HTTPRequest::HTTP_GET, "/public/poco/NetSSL.txt");
s.sendRequest(request);
Poco::Net::X509Certificate cert = s.serverCertificate();
HTTPResponse response;
std::istream& rs = s.receiveResponse(response);
std::ostringstream ostr;
StreamCopier::copyStream(rs, ostr);
std::string str(ostr.str());
assert(str == "This is a test file for NetSSL.\n");
assert(cert.commonName() == "secure.appinf.com" || cert.commonName() == "*.appinf.com");
}

30
NetSSL_Win/testsuite/src/HTTPSStreamFactoryTest.cpp
View File

@ -85,21 +85,21 @@ void HTTPSStreamFactoryTest::testRedirect()
void HTTPSStreamFactoryTest::testProxy()
{
try {
HTTPSTestServer server;
HTTPSStreamFactory factory(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
URI uri("https://secure.appinf.com/public/poco/NetSSL.txt");
std::auto_ptr<std::istream> pStr(factory.open(uri));
std::ostringstream ostr;
StreamCopier::copyStream(*pStr.get(), ostr);
assert(ostr.str().length() > 0);
}
catch (Poco::Exception e) {
std::cout << e.displayText() << std::endl;
}
#ifdef FIXME
testProxy should use a public proxy server
http://www.publicproxyservers.com/proxy/list1.html
Really working public proxy servers - page 1 of 6.
#endif
HTTPSTestServer server;
HTTPSStreamFactory factory(
Application::instance().config().getString("testsuite.proxy.host"),
Application::instance().config().getInt("testsuite.proxy.port")
);
URI uri("https://secure.appinf.com/public/poco/NetSSL.txt");
std::auto_ptr<std::istream> pStr(factory.open(uri));
std::ostringstream ostr;
StreamCopier::copyStream(*pStr.get(), ostr);
assert(ostr.str().length() > 0);
}