This commit is contained in:
Andrey Potapov 2019-02-13 16:29:27 +01:00
commit 5db5031558
5 changed files with 203 additions and 196 deletions

View file

@ -1,6 +1,6 @@
#include "client_http.hpp"
#include "server_http.hpp"
#include <cassert>
#include "check.hpp"
#include <iostream>
using namespace std;
@ -23,29 +23,29 @@ public:
stream << "TestHeader3:test3b\r\n";
stream << "\r\n";
assert(RequestMessage::parse(session->request->content, session->request->method, session->request->path,
ASSERT(RequestMessage::parse(session->request->content, session->request->method, session->request->path,
session->request->query_string, session->request->http_version, session->request->header));
assert(session->request->method == "GET");
assert(session->request->path == "/test/");
assert(session->request->http_version == "1.1");
ASSERT(session->request->method == "GET");
ASSERT(session->request->path == "/test/");
ASSERT(session->request->http_version == "1.1");
assert(session->request->header.size() == 4);
ASSERT(session->request->header.size() == 4);
auto header_it = session->request->header.find("TestHeader");
assert(header_it != session->request->header.end() && header_it->second == "test");
ASSERT(header_it != session->request->header.end() && header_it->second == "test");
header_it = session->request->header.find("TestHeader2");
assert(header_it != session->request->header.end() && header_it->second == "test2");
ASSERT(header_it != session->request->header.end() && header_it->second == "test2");
header_it = session->request->header.find("testheader");
assert(header_it != session->request->header.end() && header_it->second == "test");
ASSERT(header_it != session->request->header.end() && header_it->second == "test");
header_it = session->request->header.find("testheader2");
assert(header_it != session->request->header.end() && header_it->second == "test2");
ASSERT(header_it != session->request->header.end() && header_it->second == "test2");
auto range = session->request->header.equal_range("testheader3");
auto first = range.first;
auto second = first;
++second;
assert(range.first != session->request->header.end() && range.second != session->request->header.end() &&
ASSERT(range.first != session->request->header.end() && range.second != session->request->header.end() &&
((first->second == "test3a" && second->second == "test3b") ||
(first->second == "test3b" && second->second == "test3a")));
}
@ -62,13 +62,13 @@ public:
void connect(const std::shared_ptr<Session> &) noexcept override {}
void constructor_parse_test1() {
assert(host == "test.org");
assert(port == 8080);
ASSERT(host == "test.org");
ASSERT(port == 8080);
}
void constructor_parse_test2() {
assert(host == "test.org");
assert(port == 80);
ASSERT(host == "test.org");
ASSERT(port == 80);
}
void parse_response_header_test() {
@ -85,66 +85,66 @@ public:
stream << "TestHeader6: \r\n";
stream << "\r\n";
assert(ResponseMessage::parse(response->content, response->http_version, response->status_code, response->header));
ASSERT(ResponseMessage::parse(response->content, response->http_version, response->status_code, response->header));
assert(response->http_version == "1.1");
assert(response->status_code == "200 OK");
ASSERT(response->http_version == "1.1");
ASSERT(response->status_code == "200 OK");
assert(response->header.size() == 7);
ASSERT(response->header.size() == 7);
auto header_it = response->header.find("TestHeader");
assert(header_it != response->header.end() && header_it->second == "test");
ASSERT(header_it != response->header.end() && header_it->second == "test");
header_it = response->header.find("TestHeader2");
assert(header_it != response->header.end() && header_it->second == "test2");
ASSERT(header_it != response->header.end() && header_it->second == "test2");
header_it = response->header.find("testheader");
assert(header_it != response->header.end() && header_it->second == "test");
ASSERT(header_it != response->header.end() && header_it->second == "test");
header_it = response->header.find("testheader2");
assert(header_it != response->header.end() && header_it->second == "test2");
ASSERT(header_it != response->header.end() && header_it->second == "test2");
auto range = response->header.equal_range("testheader3");
auto first = range.first;
auto second = first;
++second;
assert(range.first != response->header.end() && range.second != response->header.end() &&
ASSERT(range.first != response->header.end() && range.second != response->header.end() &&
((first->second == "test3a" && second->second == "test3b") ||
(first->second == "test3b" && second->second == "test3a")));
header_it = response->header.find("TestHeader4");
assert(header_it != response->header.end() && header_it->second == "");
ASSERT(header_it != response->header.end() && header_it->second == "");
header_it = response->header.find("TestHeader5");
assert(header_it != response->header.end() && header_it->second == "");
ASSERT(header_it != response->header.end() && header_it->second == "");
header_it = response->header.find("TestHeader6");
assert(header_it != response->header.end() && header_it->second == "");
ASSERT(header_it != response->header.end() && header_it->second == "");
}
};
int main() {
assert(case_insensitive_equal("Test", "tesT"));
assert(case_insensitive_equal("tesT", "test"));
assert(!case_insensitive_equal("test", "tseT"));
ASSERT(case_insensitive_equal("Test", "tesT"));
ASSERT(case_insensitive_equal("tesT", "test"));
ASSERT(!case_insensitive_equal("test", "tseT"));
CaseInsensitiveEqual equal;
assert(equal("Test", "tesT"));
assert(equal("tesT", "test"));
assert(!equal("test", "tset"));
ASSERT(equal("Test", "tesT"));
ASSERT(equal("tesT", "test"));
ASSERT(!equal("test", "tset"));
CaseInsensitiveHash hash;
assert(hash("Test") == hash("tesT"));
assert(hash("tesT") == hash("test"));
assert(hash("test") != hash("tset"));
ASSERT(hash("Test") == hash("tesT"));
ASSERT(hash("tesT") == hash("test"));
ASSERT(hash("test") != hash("tset"));
auto percent_decoded = "testing æøå !#$&'()*+,/:;=?@[]123-._~\r\n";
auto percent_encoded = "testing%20%C3%A6%C3%B8%C3%A5%20%21%23%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D123-._~%0D%0A";
assert(Percent::encode(percent_decoded) == percent_encoded);
assert(Percent::decode(percent_encoded) == percent_decoded);
assert(Percent::decode(Percent::encode(percent_decoded)) == percent_decoded);
ASSERT(Percent::encode(percent_decoded) == percent_encoded);
ASSERT(Percent::decode(percent_encoded) == percent_decoded);
ASSERT(Percent::decode(Percent::encode(percent_decoded)) == percent_decoded);
SimpleWeb::CaseInsensitiveMultimap fields = {{"test1", "æøå"}, {"test2", "!#$&'()*+,/:;=?@[]"}};
auto query_string1 = "test1=%C3%A6%C3%B8%C3%A5&test2=%21%23%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D";
auto query_string2 = "test2=%21%23%24%26%27%28%29%2A%2B%2C%2F%3A%3B%3D%3F%40%5B%5D&test1=%C3%A6%C3%B8%C3%A5";
auto query_string_result = QueryString::create(fields);
assert(query_string_result == query_string1 || query_string_result == query_string2);
ASSERT(query_string_result == query_string1 || query_string_result == query_string2);
auto fields_result1 = QueryString::parse(query_string1);
auto fields_result2 = QueryString::parse(query_string2);
assert(fields_result1 == fields_result2 && fields_result1 == fields);
ASSERT(fields_result1 == fields_result2 && fields_result1 == fields);
auto serverTest = make_shared<ServerTest>();
serverTest->io_service = std::make_shared<asio::io_service>();
@ -166,40 +166,40 @@ int main() {
{
request.query_string = "";
auto queries = request.parse_query_string();
assert(queries.empty());
ASSERT(queries.empty());
}
{
request.query_string = "=";
auto queries = request.parse_query_string();
assert(queries.empty());
ASSERT(queries.empty());
}
{
request.query_string = "=test";
auto queries = request.parse_query_string();
assert(queries.empty());
ASSERT(queries.empty());
}
{
request.query_string = "a=1%202%20%203&b=3+4&c&d=æ%25ø%26å%3F";
auto queries = request.parse_query_string();
{
auto range = queries.equal_range("a");
assert(range.first != range.second);
assert(range.first->second == "1 2 3");
ASSERT(range.first != range.second);
ASSERT(range.first->second == "1 2 3");
}
{
auto range = queries.equal_range("b");
assert(range.first != range.second);
assert(range.first->second == "3 4");
ASSERT(range.first != range.second);
ASSERT(range.first->second == "3 4");
}
{
auto range = queries.equal_range("c");
assert(range.first != range.second);
assert(range.first->second == "");
ASSERT(range.first != range.second);
ASSERT(range.first->second == "");
}
{
auto range = queries.equal_range("d");
assert(range.first != range.second);
assert(range.first->second == "æ%ø&å?");
ASSERT(range.first != range.second);
ASSERT(range.first->second == "æ%ø&å?");
}
}
@ -207,119 +207,119 @@ int main() {
SimpleWeb::CaseInsensitiveMultimap solution;
std::stringstream header;
auto parsed = SimpleWeb::HttpHeader::parse(header);
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"Content-Type", "application/json"}};
std::stringstream header("Content-Type: application/json");
auto parsed = SimpleWeb::HttpHeader::parse(header);
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"Content-Type", "application/json"}};
std::stringstream header("Content-Type: application/json\r");
auto parsed = SimpleWeb::HttpHeader::parse(header);
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"Content-Type", "application/json"}};
std::stringstream header("Content-Type: application/json\r\n");
auto parsed = SimpleWeb::HttpHeader::parse(header);
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
{
SimpleWeb::CaseInsensitiveMultimap solution;
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}};
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", ""}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a; b");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a;b");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"a", ""}, {"b", "c"}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a; b=c");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("a;b=c");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}};
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"test", ""}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; test");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"file\"");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=file");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "file"}, {"filename", "filename.png"}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"file\"; filename=\"filename.png\"");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data;name=\"file\";filename=\"filename.png\"");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=file; filename=filename.png");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data;name=file;filename=filename.png");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
{
SimpleWeb::CaseInsensitiveMultimap solution = {{"form-data", ""}, {"name", "fi le"}, {"filename", "file name.png"}};
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"fi le\"; filename=\"file name.png\"");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=\"fi%20le\"; filename=\"file%20name.png\"");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=fi le; filename=file name.png");
assert(parsed == solution);
ASSERT(parsed == solution);
}
{
auto parsed = SimpleWeb::HttpHeader::FieldValue::SemicolonSeparatedAttributes::parse("form-data; name=fi%20le; filename=file%20name.png");
assert(parsed == solution);
ASSERT(parsed == solution);
}
}
}