Some fixes. Closes #9, #10

3 files changed, 13 insertions, 12 deletions

diff --git a/test/tgbot/net/HttpParser.cpp b/test/tgbot/net/HttpParser.cpp
index 362a13f..236eb90 100644
--- a/test/tgbot/net/HttpParser.cpp
+++ b/test/tgbot/net/HttpParser.cpp
@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_CASE(generateRequest) {
 		"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_CHECK_MESSAGE(t == e, diffS(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(generateMultipartFormData) {
@@ -59,14 +59,14 @@ BOOST_AUTO_TEST_CASE(generateMultipartFormData) {
 		"Content-Type: text/plain\r\n"
 		"\r\n"
 		"Hello, world!\r\n";
-	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(t == e, diffS(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));
+	BOOST_CHECK_MESSAGE(t == e, diffS(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(generateResponse) {
@@ -77,7 +77,7 @@ BOOST_AUTO_TEST_CASE(generateResponse) {
 		"Content-Length: 8\r\n"
 		"\r\n"
 		"testdata";
-	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(t == e, diffS(t, e));
 }
 
 BOOST_AUTO_TEST_CASE(parseRequest) {
@@ -103,7 +103,7 @@ BOOST_AUTO_TEST_CASE(parseRequest) {
 	};
 	string e = "testdata";
 
-	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(t == e, diffS(t, e));
 	BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
 		return item.first + '=' + item.second;
 	}));
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(parseResponse) {
 	};
 	string e = "testdata";
 
-	BOOST_CHECK_MESSAGE(t == e, diff(t, e));
+	BOOST_CHECK_MESSAGE(t == e, diffS(t, e));
 	BOOST_CHECK_MESSAGE(tHeaders == eHeaders, diff(tHeaders, eHeaders, [](const pair<const string, string>& item) -> string {
 		return item.first + '=' + item.second;
 	}));
diff --git a/test/tgbot/tools/StringTools.cpp b/test/tgbot/tools/StringTools.cpp
index 11f85af..86eb147 100644
--- a/test/tgbot/tools/StringTools.cpp
+++ b/test/tgbot/tools/StringTools.cpp
@@ -51,13 +51,13 @@ BOOST_AUTO_TEST_CASE(split) {
 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));
+	BOOST_CHECK_MESSAGE(t == e, diffS(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));
+	BOOST_CHECK_MESSAGE(t == e, diffS(t, e));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/utils.h b/test/utils.h
index 31f9e25..abd2f07 100644
--- a/test/utils.h
+++ b/test/utils.h
@@ -29,7 +29,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-std::string diff(const std::string& test, const std::string& expected) {
+std::string diffS(const std::string& test, const std::string& expected) {
 	std::vector<std::string> v1, v2;
 	std::istringstream ss1(test);
 	std::istringstream ss2(expected);
@@ -45,9 +45,10 @@ std::string diff(const std::string& test, const std::string& expected) {
 			v2.push_back(s2);
 		}
 	} while (r1 || r2);
-	diff(v1, v2, [](const std::string& item) -> std::string {
-		return std::string(item);
-	});
+	return "";
+	//return diff(v1, v2, [](const std::string& item) {
+		//return item;
+	//});
 }
 
 template<typename T>