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

6 files changed, 185 insertions, 232 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4139418..65781e6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,12 +1,11 @@
 set(TEST_SRC_LIST
-    main.cpp
-    utils.cpp
-    tgbot/net/Url.cpp
-    tgbot/net/HttpParser.cpp
-    tgbot/tools/StringTools.cpp
+	main.cpp
+	tgbot/net/Url.cpp
+	tgbot/net/HttpParser.cpp
+	tgbot/tools/StringTools.cpp
 )
 
 include_directories("${PROJECT_SOURCE_DIR}/test")
 add_executable(${PROJECT_NAME}_test ${TEST_SRC_LIST})
 target_link_libraries(${PROJECT_NAME}_test TgBot)
-add_test(${PROJECT_NAME}_test ${PROJECT_NAME}_test)
\ No newline at end of file
+add_test(${PROJECT_NAME}_test ${PROJECT_NAME}_test)
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()
diff --git a/test/utils.cpp b/test/utils.cpp
deleted file mode 100644
index 9a9f48c7..0000000
--- a/test/utils.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2015 Oleg Morozenkov
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include "utils.h"
-
-#include <sstream>
-
-using namespace std;
-using namespace boost;
-
-string diff(const string& test, const string& expected) {
-    string result;
-    result += "\n*** BEGIN ***\n";
-
-    istringstream ss1(test);
-    istringstream ss2(expected);
-
-    string s1, s2;
-    bool r1, r2;
-    size_t i = 0;
-    do {
-        r1 = getline(ss1, s1) ? true : false;
-        r2 = getline(ss2, s2) ? true : false;
-        if (r1 && r2 && s1 == s2) {
-            result += lexical_cast<string>(i);
-            result += " [=] ";
-            result += s1;
-            result += "\n";
-        } else {
-            if (r1) {
-                result += lexical_cast<string>(i);
-                result += " [t] ";
-                result += s1;
-                result += "\n";
-            }
-            if (r2) {
-                result += lexical_cast<string>(i);
-                result += " [e] ";
-                result += s2;
-                result += "\n";
-            }
-        }
-        ++i;
-    } while (r1 || r2);
-
-    result += "*** END ***\n";
-    return result;
-}
diff --git a/test/utils.h b/test/utils.h
index d8e64e3..485a40e 100644
--- a/test/utils.h
+++ b/test/utils.h
@@ -24,60 +24,81 @@
 #define TGBOT_UTILS_H
 
 #include <string>
+#include <vector>
+#include <sstream>
 
 #include <boost/lexical_cast.hpp>
 
-std::string diff(const std::string& test, const std::string& expected);
+std::string diff(const std::string& test, const std::string& expected) {
+	std::vector<std::string> v1, v2;
+	std::istringstream ss1(test);
+	std::istringstream ss2(expected);
+	std::string s1, s2;
+	bool r1, r2;
+	do {
+		r1 = std::getline(ss1, s1) ? true : false;
+		r2 = std::getline(ss2, s2) ? true : false;
+		if (r1) {
+			v1.push_back(s1);
+		}
+		if (r2) {
+			v2.push_back(s2);
+		}
+	} while (r1 || r2);
+	diff(v1, v2, [](const std::string& item) -> std::string {
+		return std::string(item);
+	});
+}
 
 template<typename T>
 std::string diff(const T& test, const T& expected, std::string (*toStringFunc)(const typename T::value_type&)) {
-    std::string result;
-    result += "\n*** BEGIN ***   Count: t=";
-    result += boost::lexical_cast<std::string>(test.size());
-    result += " e=";
-    result += boost::lexical_cast<std::string>(expected.size());
-    result += '\n';
+	std::string result;
+	result += "\n*** BEGIN ***   Count: t=";
+	result += boost::lexical_cast<std::string>(test.size());
+	result += " e=";
+	result += boost::lexical_cast<std::string>(expected.size());
+	result += '\n';
 
-    typename T::const_iterator iter1 = test.begin();
-    typename T::const_iterator end1 = test.end();
-    typename T::const_iterator iter2 = expected.begin();
-    typename T::const_iterator end2 = expected.end();
-    bool r1, r2;
-    std::string s1, s2;
-    size_t i = 0;
-    do {
-        r1 = iter1 != end1;
-        r2 = iter2 != end2;
-        if (r1) {
-            s1 = toStringFunc(*iter1++);
-        }
-        if (r2) {
-            s2 = toStringFunc(*iter2++);
-        }
-        if (r1 && r2 && s1 == s2) {
-            result += boost::lexical_cast<std::string>(i);
-            result += " [=] ";
-            result += s1;
-            result += "\n";
-        } else {
-            if (r1) {
-                result += boost::lexical_cast<std::string>(i);
-                result += " [t] ";
-                result += s1;
-                result += "\n";
-            }
-            if (r2) {
-                result += boost::lexical_cast<std::string>(i);
-                result += " [e] ";
-                result += s2;
-                result += "\n";
-            }
-        }
-        ++i;
-    } while (r1 || r2);
+	typename T::const_iterator iter1 = test.begin();
+	typename T::const_iterator end1 = test.end();
+	typename T::const_iterator iter2 = expected.begin();
+	typename T::const_iterator end2 = expected.end();
+	bool r1, r2;
+	std::string s1, s2;
+	size_t i = 0;
+	do {
+		r1 = iter1 != end1;
+		r2 = iter2 != end2;
+		if (r1) {
+			s1 = toStringFunc(*iter1++);
+		}
+		if (r2) {
+			s2 = toStringFunc(*iter2++);
+		}
+		if (r1 && r2 && s1 == s2) {
+			result += boost::lexical_cast<std::string>(i);
+			result += " [=] ";
+			result += s1;
+			result += "\n";
+		} else {
+			if (r1) {
+				result += boost::lexical_cast<std::string>(i);
+				result += " [t] ";
+				result += s1;
+				result += "\n";
+			}
+			if (r2) {
+				result += boost::lexical_cast<std::string>(i);
+				result += " [e] ";
+				result += s2;
+				result += "\n";
+			}
+		}
+		++i;
+	} while (r1 || r2);
 
-    result += "*** END ***\n";
-    return result;
+	result += "*** END ***\n";
+	return result;
 }
 
 #endif //TGBOT_UTILS_H