jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Preparation for std::enable_shared_from_this: Server- and Client-constructors are no longer public, use ::create instead

Browse source
This commit is contained in:
eidheim 2017-07-03 15:02:35 +02:00
commit 1992bbb4b4
8 changed files with 147 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

108
tests/io_test.cpp
View file

@ -9,31 +9,31 @@ typedef SimpleWeb::Server<SimpleWeb::HTTP> HttpServer;
typedef SimpleWeb::Client<SimpleWeb::HTTP> HttpClient;
int main() {
HttpServer server;
server.config.port = 8080;
auto server = HttpServer::create();
server->config.port = 8080;
server.resource["^/string$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/string$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
auto content = request->content.string();
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n"
<< content;
};
server.resource["^/string2$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/string2$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
response->write(request->content.string());
};
server.resource["^/string3$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/string3$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
std::stringstream stream;
stream << request->content.rdbuf();
response->write(stream);
};
server.resource["^/string4$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> & /*request*/) {
server->resource["^/string4$"]["POST"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> & /*request*/) {
response->write(SimpleWeb::StatusCode::client_error_forbidden, {{"Test1", "test2"}, {"tesT3", "test4"}});
};
server.resource["^/info$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/info$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
stringstream content_stream;
content_stream << request->method << " " << request->path << " " << request->http_version << " ";
content_stream << request->header.find("test parameter")->second;
@ -44,20 +44,20 @@ int main() {
<< content_stream.rdbuf();
};
server.resource["^/match/([0-9]+)$"]["GET"] = [&server](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/match/([0-9]+)$"]["GET"] = [&server](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
string number = request->path_match[1];
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << number.length() << "\r\n\r\n"
<< number;
};
server.resource["^/header$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/header$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
auto content = request->header.find("test1")->second + request->header.find("test2")->second;
*response << "HTTP/1.1 200 OK\r\nContent-Length: " << content.length() << "\r\n\r\n"
<< content;
};
server.resource["^/query_string$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
server->resource["^/query_string$"]["GET"] = [](shared_ptr<HttpServer::Response> &response, shared_ptr<HttpServer::Request> &request) {
assert(request->path == "/query_string");
assert(request->query_string == "testing");
auto queries = request->parse_query_string();
@ -68,16 +68,16 @@ int main() {
thread server_thread([&server]() {
//Start server
server.start();
server->start();
});
this_thread::sleep_for(chrono::seconds(1));
{
HttpClient client("localhost:8080");
auto client = HttpClient::create("localhost:8080");
{
stringstream output;
auto r = client.request("POST", "/string", "A string");
auto r = client->request("POST", "/string", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
output << r->content.rdbuf();
assert(output.str() == "A string");
@ -85,14 +85,14 @@ int main() {
{
stringstream output;
auto r = client.request("POST", "/string", "A string");
auto r = client->request("POST", "/string", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
assert(r->content.string() == "A string");
}
{
stringstream output;
auto r = client.request("POST", "/string2", "A string");
auto r = client->request("POST", "/string2", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
output << r->content.rdbuf();
assert(output.str() == "A string");
@ -100,7 +100,7 @@ int main() {
{
stringstream output;
auto r = client.request("POST", "/string3", "A string");
auto r = client->request("POST", "/string3", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
output << r->content.rdbuf();
assert(output.str() == "A string");
@ -108,7 +108,7 @@ int main() {
{
stringstream output;
auto r = client.request("POST", "/string4", "A string");
auto r = client->request("POST", "/string4", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::client_error_forbidden);
assert(r->header.size() == 3);
assert(r->header.find("test1")->second == "test2");
@ -121,78 +121,78 @@ int main() {
{
stringstream output;
stringstream content("A string");
auto r = client.request("POST", "/string", content);
auto r = client->request("POST", "/string", content);
output << r->content.rdbuf();
assert(output.str() == "A string");
}
{
stringstream output;
auto r = client.request("GET", "/info", "", {{"Test Parameter", "test value"}});
auto r = client->request("GET", "/info", "", {{"Test Parameter", "test value"}});
output << r->content.rdbuf();
assert(output.str() == "GET /info 1.1 test value");
}
{
stringstream output;
auto r = client.request("GET", "/match/123");
auto r = client->request("GET", "/match/123");
output << r->content.rdbuf();
assert(output.str() == "123");
}
}
{
HttpClient client("localhost:8080");
auto client = HttpClient::create("localhost:8080");
HttpClient::Connection *connection;
{
// test performing the stream version of the request methods first
stringstream output;
stringstream content("A string");
auto r = client.request("POST", "/string", content);
auto r = client->request("POST", "/string", content);
output << r->content.rdbuf();
assert(output.str() == "A string");
assert(client.connections->size() == 1);
connection = client.connections->front().get();
assert(client->connections->size() == 1);
connection = client->connections->front().get();
}
{
stringstream output;
auto r = client.request("POST", "/string", "A string");
auto r = client->request("POST", "/string", "A string");
output << r->content.rdbuf();
assert(output.str() == "A string");
assert(client.connections->size() == 1);
assert(connection == client.connections->front().get());
assert(client->connections->size() == 1);
assert(connection == client->connections->front().get());
}
{
stringstream output;
auto r = client.request("GET", "/header", "", {{"test1", "test"}, {"test2", "ing"}});
auto r = client->request("GET", "/header", "", {{"test1", "test"}, {"test2", "ing"}});
output << r->content.rdbuf();
assert(output.str() == "testing");
assert(client.connections->size() == 1);
assert(connection == client.connections->front().get());
assert(client->connections->size() == 1);
assert(connection == client->connections->front().get());
}
{
stringstream output;
auto r = client.request("GET", "/query_string?testing");
auto r = client->request("GET", "/query_string?testing");
assert(r->content.string() == "testing");
assert(client.connections->size() == 1);
assert(connection == client.connections->front().get());
assert(client->connections->size() == 1);
assert(connection == client->connections->front().get());
}
}
{
HttpClient client("localhost:8080");
auto client = HttpClient::create("localhost:8080");
bool call = false;
client.request("GET", "/match/123", [&call](shared_ptr<HttpClient::Response> &response, const SimpleWeb::error_code &ec) {
client->request("GET", "/match/123", [&call](shared_ptr<HttpClient::Response> &response, const SimpleWeb::error_code &ec) {
assert(!ec);
stringstream output;
output << response->content.rdbuf();
assert(output.str() == "123");
call = true;
});
client.io_service->run();
client->io_service->run();
assert(call);
{
@ -201,7 +201,7 @@ int main() {
for(size_t c = 0; c < 100; ++c) {
calls[c] = 0;
threads.emplace_back([c, &client, &calls] {
client.request("GET", "/match/123", [c, &calls](shared_ptr<HttpClient::Response> &response, const SimpleWeb::error_code &ec) {
client->request("GET", "/match/123", [c, &calls](shared_ptr<HttpClient::Response> &response, const SimpleWeb::error_code &ec) {
assert(!ec);
stringstream output;
output << response->content.rdbuf();
@ -212,52 +212,52 @@ int main() {
}
for(auto &thread : threads)
thread.join();
assert(client.connections->size() == 100);
client.io_service->reset();
client.io_service->run();
assert(client.connections->size() == 1);
assert(client->connections->size() == 100);
client->io_service->reset();
client->io_service->run();
assert(client->connections->size() == 1);
for(auto call : calls)
assert(call);
}
}
{
HttpClient client("localhost:8080");
assert(client.connections->size() == 0);
auto client = HttpClient::create("localhost:8080");
assert(client->connections->size() == 0);
for(size_t c = 0; c < 5000; ++c) {
auto r1 = client.request("POST", "/string", "A string");
auto r1 = client->request("POST", "/string", "A string");
assert(SimpleWeb::status_code(r1->status_code) == SimpleWeb::StatusCode::success_ok);
assert(r1->content.string() == "A string");
assert(client.connections->size() == 1);
assert(client->connections->size() == 1);
stringstream content("A string");
auto r2 = client.request("POST", "/string", content);
auto r2 = client->request("POST", "/string", content);
assert(SimpleWeb::status_code(r2->status_code) == SimpleWeb::StatusCode::success_ok);
assert(r2->content.string() == "A string");
assert(client.connections->size() == 1);
assert(client->connections->size() == 1);
}
}
for(size_t c = 0; c < 500; ++c) {
{
HttpClient client("localhost:8080");
auto r = client.request("POST", "/string", "A string");
auto client = HttpClient::create("localhost:8080");
auto r = client->request("POST", "/string", "A string");
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
assert(r->content.string() == "A string");
assert(client.connections->size() == 1);
assert(client->connections->size() == 1);
}
{
HttpClient client("localhost:8080");
auto client = HttpClient::create("localhost:8080");
stringstream content("A string");
auto r = client.request("POST", "/string", content);
auto r = client->request("POST", "/string", content);
assert(SimpleWeb::status_code(r->status_code) == SimpleWeb::StatusCode::success_ok);
assert(r->content.string() == "A string");
assert(client.connections->size() == 1);
assert(client->connections->size() == 1);
}
}
server.stop();
server->stop();
server_thread.join();
return 0;

16
tests/parse_test.cpp
View file

@ -134,18 +134,18 @@ int main() {
auto fields_result2 = QueryString::parse(query_string2);
assert(fields_result1 == fields_result2 && fields_result1 == fields);
ServerTest serverTest;
serverTest.io_service = std::make_shared<asio::io_service>();
auto serverTest = make_shared<ServerTest>();
serverTest->io_service = std::make_shared<asio::io_service>();
serverTest.parse_request_test();
serverTest->parse_request_test();
ClientTest clientTest("test.org:8080");
clientTest.constructor_parse_test1();
auto clientTest = make_shared<ClientTest>("test.org:8080");
clientTest->constructor_parse_test1();
ClientTest clientTest2("test.org");
clientTest2.constructor_parse_test2();
auto clientTest2 = make_shared<ClientTest>("test.org");
clientTest2->constructor_parse_test2();
clientTest2.parse_response_header_test();
clientTest2->parse_response_header_test();
asio::io_service io_service;