Fixed compiler's errors in TgTypeParser + fixed indentation + some other fixes

3 files changed, 113 insertions, 113 deletions

diff --git a/test/tgbot/net/HttpParser.cpp b/test/tgbot/net/HttpParser.cpp
index 57ba187..362a13f 100644
--- a/test/tgbot/net/HttpParser.cpp
+++ b/test/tgbot/net/HttpParser.cpp
@@ -32,105 +32,105 @@ using namespace TgBot;
 BOOST_AUTO_TEST_SUITE(tHttpParser)
 
 BOOST_AUTO_TEST_CASE(generateRequest) {
-    vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!") };
-    string t = HttpParser::getInstance().generateRequest(Url("http://example.com/index.html"), args, true);
-    string e = ""
-        "POST /index.html HTTP/1.1\r\n"
-        "Host: example.com\r\n"
-        "Connection: keep-alive\r\n"
-        "Content-Type: application/x-www-form-urlencoded\r\n"
-        "Content-Length: 49\r\n"
-        "\r\n"
-        "email=test%40example.com&text=Hello%2c%20world%21";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!") };
+	string t = HttpParser::getInstance().generateRequest(Url("http://example.com/index.html"), args, true);
+	string e = ""
+		"POST /index.html HTTP/1.1\r\n"
+		"Host: example.com\r\n"
+		"Connection: keep-alive\r\n"
+		"Content-Type: application/x-www-form-urlencoded\r\n"
+		"Content-Length: 49\r\n"
+		"\r\n"
+		"email=test%40example.com&text=Hello%2c%20world%21";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(generateMultipartFormData) {
-    vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!", true) };
-    string boundary = HttpParser::getInstance().generateMultipartBoundary(args);
-    string t = HttpParser::getInstance().generateMultipartFormData(args, boundary);
-    string e = ""
-        "--" + boundary + "\r\n"
-        "Content-Disposition: form-data; name=\"email\"\r\n"
-        "\r\n"
-        "test@example.com\r\n"
-        "--" + boundary + "\r\n"
-        "Content-Disposition: form-data; name=\"text\"\r\n"
-        "Content-Type: text/plain\r\n"
-        "\r\n"
-        "Hello, world!\r\n";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!", true) };
+	string boundary = HttpParser::getInstance().generateMultipartBoundary(args);
+	string t = HttpParser::getInstance().generateMultipartFormData(args, boundary);
+	string e = ""
+		"--" + boundary + "\r\n"
+		"Content-Disposition: form-data; name=\"email\"\r\n"
+		"\r\n"
+		"test@example.com\r\n"
+		"--" + boundary + "\r\n"
+		"Content-Disposition: form-data; name=\"text\"\r\n"
+		"Content-Type: text/plain\r\n"
+		"\r\n"
+		"Hello, world!\r\n";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(generateWwwFormUrlencoded) {
-    vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!") };
-    string t = HttpParser::getInstance().generateWwwFormUrlencoded(args);
-    string e = "email=test%40example.com&text=Hello%2c%20world%21";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	vector<HttpReqArg> args = { HttpReqArg("email", "test@example.com"), HttpReqArg("text", "Hello, world!") };
+	string t = HttpParser::getInstance().generateWwwFormUrlencoded(args);
+	string e = "email=test%40example.com&text=Hello%2c%20world%21";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(generateResponse) {
-    string t = HttpParser::getInstance().generateResponse("testdata");
-    string e = ""
-        "HTTP/1.1 200 OK\r\n"
-        "Content-Type: text/plain\r\n"
-        "Content-Length: 8\r\n"
-        "\r\n"
-        "testdata";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	string t = HttpParser::getInstance().generateResponse("testdata");
+	string e = ""
+		"HTTP/1.1 200 OK\r\n"
+		"Content-Type: text/plain\r\n"
+		"Content-Length: 8\r\n"
+		"\r\n"
+		"testdata";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(parseRequest) {
-    string data = ""
-        "POST /index.html HTTP/1.1\r\n"
-        "Host: example.com\r\n"
-        "Connection: keep-alive\r\n"
-        "Content-Type: text/plain\r\n"
-        "Content-Length: 8\r\n"
-        "\r\n"
-        "testdata";
-
-    map<string, string> tHeaders;
-    string t = HttpParser::getInstance().parseRequest(data, tHeaders);
-
-    map<string, string> eHeaders = {
-        { "method", "POST" },
-        { "path", "/index.html" },
-        { "host", "example.com" },
-        { "connection", "keep-alive" },
-        { "content-type", "text/plain" },
-        { "content-length", "8" }
-    };
-    string e = "testdata";
-
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
-    BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
-        return item.first + '=' + item.second;
-    }));
+	string data = ""
+		"POST /index.html HTTP/1.1\r\n"
+		"Host: example.com\r\n"
+		"Connection: keep-alive\r\n"
+		"Content-Type: text/plain\r\n"
+		"Content-Length: 8\r\n"
+		"\r\n"
+		"testdata";
+
+	map<string, string> tHeaders;
+	string t = HttpParser::getInstance().parseRequest(data, tHeaders);
+
+	map<string, string> eHeaders = {
+		{ "method", "POST" },
+		{ "path", "/index.html" },
+		{ "host", "example.com" },
+		{ "connection", "keep-alive" },
+		{ "content-type", "text/plain" },
+		{ "content-length", "8" }
+	};
+	string e = "testdata";
+
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
+		return item.first + '=' + item.second;
+	}));
 }
 
 BOOST_AUTO_TEST_CASE(parseResponse) {
-    string data = ""
-        "HTTP/1.1 200 OK\r\n"
-        "Content-Type: text/plain\r\n"
-        "Content-Length: 8\r\n"
-        "\r\n"
-        "testdata";
-
-    map<string, string> tHeaders;
-    string t = HttpParser::getInstance().parseResponse(data, tHeaders);
-
-    map<string, string> eHeaders = {
-        { "status", "200" },
-        { "content-type", "text/plain" },
-        { "content-length", "8" }
-    };
-    string e = "testdata";
-
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
-    BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
-        return item.first + '=' + item.second;
-    }));
+	string data = ""
+		"HTTP/1.1 200 OK\r\n"
+		"Content-Type: text/plain\r\n"
+		"Content-Length: 8\r\n"
+		"\r\n"
+		"testdata";
+
+	map<string, string> tHeaders;
+	string t = HttpParser::getInstance().parseResponse(data, tHeaders);
+
+	map<string, string> eHeaders = {
+		{ "status", "200" },
+		{ "content-type", "text/plain" },
+		{ "content-length", "8" }
+	};
+	string e = "testdata";
+
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
+		return item.first + '=' + item.second;
+	}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/tgbot/net/Url.cpp b/test/tgbot/net/Url.cpp
index 0974ab6..abd90cb 100644
--- a/test/tgbot/net/Url.cpp
+++ b/test/tgbot/net/Url.cpp
@@ -29,30 +29,30 @@ using namespace TgBot;
 BOOST_AUTO_TEST_SUITE(tUrl)
 
 BOOST_AUTO_TEST_CASE(parsingUrlNoPath) {
-    Url t("https://test.example.com?test=123&123=test#title");
-    BOOST_CHECK_EQUAL(t.protocol, "https");
-    BOOST_CHECK_EQUAL(t.host, "test.example.com");
-    BOOST_CHECK_EQUAL(t.path, "/");
-    BOOST_CHECK_EQUAL(t.query, "test=123&123=test");
-    BOOST_CHECK_EQUAL(t.fragment, "title");
+	Url t("https://test.example.com?test=123&123=test#title");
+	BOOST_CHECK_EQUAL(t.protocol, "https");
+	BOOST_CHECK_EQUAL(t.host, "test.example.com");
+	BOOST_CHECK_EQUAL(t.path, "/");
+	BOOST_CHECK_EQUAL(t.query, "test=123&123=test");
+	BOOST_CHECK_EQUAL(t.fragment, "title");
 }
 
 BOOST_AUTO_TEST_CASE(parsingUrlNoPathAndQuery) {
-    Url t("https://test.example.com#title");
-    BOOST_CHECK_EQUAL(t.protocol, "https");
-    BOOST_CHECK_EQUAL(t.host, "test.example.com");
-    BOOST_CHECK_EQUAL(t.path, "/");
-    BOOST_CHECK_EQUAL(t.query, "");
-    BOOST_CHECK_EQUAL(t.fragment, "title");
+	Url t("https://test.example.com#title");
+	BOOST_CHECK_EQUAL(t.protocol, "https");
+	BOOST_CHECK_EQUAL(t.host, "test.example.com");
+	BOOST_CHECK_EQUAL(t.path, "/");
+	BOOST_CHECK_EQUAL(t.query, "");
+	BOOST_CHECK_EQUAL(t.fragment, "title");
 }
 
 BOOST_AUTO_TEST_CASE(parsingUrlFull) {
-    Url t("https://test.example.com/example-page/index.html?test=123&123=test#title");
-    BOOST_CHECK_EQUAL(t.protocol, "https");
-    BOOST_CHECK_EQUAL(t.host, "test.example.com");
-    BOOST_CHECK_EQUAL(t.path, "/example-page/index.html");
-    BOOST_CHECK_EQUAL(t.query, "test=123&123=test");
-    BOOST_CHECK_EQUAL(t.fragment, "title");
+	Url t("https://test.example.com/example-page/index.html?test=123&123=test#title");
+	BOOST_CHECK_EQUAL(t.protocol, "https");
+	BOOST_CHECK_EQUAL(t.host, "test.example.com");
+	BOOST_CHECK_EQUAL(t.path, "/example-page/index.html");
+	BOOST_CHECK_EQUAL(t.query, "test=123&123=test");
+	BOOST_CHECK_EQUAL(t.fragment, "title");
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/tgbot/tools/StringTools.cpp b/test/tgbot/tools/StringTools.cpp
index c3bf709..11f85af 100644
--- a/test/tgbot/tools/StringTools.cpp
+++ b/test/tgbot/tools/StringTools.cpp
@@ -35,29 +35,29 @@ using namespace std;
 BOOST_AUTO_TEST_SUITE(tStringTools)
 
 BOOST_AUTO_TEST_CASE(startsWith) {
-    BOOST_CHECK(StringTools::startsWith("abc123", "abc"));
-    BOOST_CHECK(StringTools::startsWith("abc", "abc123"));
+	BOOST_CHECK(StringTools::startsWith("abc123", "abc"));
+	BOOST_CHECK(StringTools::startsWith("abc", "abc123"));
 }
 
 BOOST_AUTO_TEST_CASE(endsWith) {
-    BOOST_CHECK(StringTools::endsWith("abc123", "123"));
-    BOOST_CHECK(StringTools::endsWith("123", "abc123"));
+	BOOST_CHECK(StringTools::endsWith("abc123", "123"));
+	BOOST_CHECK(StringTools::endsWith("123", "abc123"));
 }
 
 BOOST_AUTO_TEST_CASE(split) {
-    BOOST_CHECK(StringTools::split("123 456 789", ' ') == vector<string>({"123", "456", "789"}));
+	BOOST_CHECK(StringTools::split("123 456 789", ' ') == vector<string>({"123", "456", "789"}));
 }
 
 BOOST_AUTO_TEST_CASE(urlEncode) {
-    string t = StringTools::urlEncode("`1234567890-qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:ZXCVBNM<>? ");
-    string e = "%601234567890-qwertyuiop%5b%5d%5casdfghjkl%3b%27zxcvbnm%2c.%2f~%21%40%23%24%25%5e%26%2a%28%29_%2bQWERTYUIOP%7b%7d%7cASDFGHJKL%3aZXCVBNM%3c%3e%3f%20";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	string t = StringTools::urlEncode("`1234567890-qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:ZXCVBNM<>? ");
+	string e = "%601234567890-qwertyuiop%5b%5d%5casdfghjkl%3b%27zxcvbnm%2c.%2f~%21%40%23%24%25%5e%26%2a%28%29_%2bQWERTYUIOP%7b%7d%7cASDFGHJKL%3aZXCVBNM%3c%3e%3f%20";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(urlDecode) {
-    string t = StringTools::urlDecode("%601234567890-qwertyuiop%5b%5d%5casdfghjkl%3b%27zxcvbnm%2c.%2f~%21%40%23%24%25%5e%26%2a%28%29_%2bQWERTYUIOP%7b%7d%7cASDFGHJKL%3aZXCVBNM%3c%3e%3f%20");
-    string e = "`1234567890-qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:ZXCVBNM<>? ";
-    BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	string t = StringTools::urlDecode("%601234567890-qwertyuiop%5b%5d%5casdfghjkl%3b%27zxcvbnm%2c.%2f~%21%40%23%24%25%5e%26%2a%28%29_%2bQWERTYUIOP%7b%7d%7cASDFGHJKL%3aZXCVBNM%3c%3e%3f%20");
+	string e = "`1234567890-qwertyuiop[]\\asdfghjkl;'zxcvbnm,./~!@#$%^&*()_+QWERTYUIOP{}|ASDFGHJKL:ZXCVBNM<>? ";
+	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
 }
 
 BOOST_AUTO_TEST_SUITE_END()