From cc792da85895c85db8b76a5c9692bc260f35f649 Mon Sep 17 00:00:00 2001
From: Emanuel Guevel <guevel.emanuel@gmail.com>
Date: Fri, 4 Jan 2013 15:24:07 +0100
Subject: [PATCH] Fix to_utf8 test: add test data directory and remove unused
 include

---
 components/to_utf8/tests/test_data/french-utf8.txt     | 1 +
 components/to_utf8/tests/test_data/french-win1252.txt  | 1 +
 components/to_utf8/tests/test_data/russian-utf8.txt    | 1 +
 components/to_utf8/tests/test_data/russian-win1251.txt | 1 +
 components/to_utf8/tests/to_utf8_test.cpp              | 5 ++---
 5 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 components/to_utf8/tests/test_data/french-utf8.txt
 create mode 100644 components/to_utf8/tests/test_data/french-win1252.txt
 create mode 100644 components/to_utf8/tests/test_data/russian-utf8.txt
 create mode 100644 components/to_utf8/tests/test_data/russian-win1251.txt

diff --git a/components/to_utf8/tests/test_data/french-utf8.txt b/components/to_utf8/tests/test_data/french-utf8.txt
new file mode 100644
index 000000000..aaaccac73
--- /dev/null
+++ b/components/to_utf8/tests/test_data/french-utf8.txt
@@ -0,0 +1 @@
+Vous lui donnez le gâteau sans protester avant d’aller chercher tous vos amis et de revenir vous venger.
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/french-win1252.txt b/components/to_utf8/tests/test_data/french-win1252.txt
new file mode 100644
index 000000000..1de4593e9
--- /dev/null
+++ b/components/to_utf8/tests/test_data/french-win1252.txt
@@ -0,0 +1 @@
+Vous lui donnez le g�teau sans protester avant d�aller chercher tous vos amis et de revenir vous venger.
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/russian-utf8.txt b/components/to_utf8/tests/test_data/russian-utf8.txt
new file mode 100644
index 000000000..eb20b32dd
--- /dev/null
+++ b/components/to_utf8/tests/test_data/russian-utf8.txt
@@ -0,0 +1 @@
+Без вопросов отдаете ему рулет, зная, что позже вы сможете привести с собой своих друзей и тогда он получит по заслугам?
\ No newline at end of file
diff --git a/components/to_utf8/tests/test_data/russian-win1251.txt b/components/to_utf8/tests/test_data/russian-win1251.txt
new file mode 100644
index 000000000..086e57edd
--- /dev/null
+++ b/components/to_utf8/tests/test_data/russian-win1251.txt
@@ -0,0 +1 @@
+��� �������� ������� ��� �����, ����, ��� ����� �� ������� �������� � ����� ����� ������ � ����� �� ������� �� ��������?
\ No newline at end of file
diff --git a/components/to_utf8/tests/to_utf8_test.cpp b/components/to_utf8/tests/to_utf8_test.cpp
index 8c25c483e..4bba0cf90 100644
--- a/components/to_utf8/tests/to_utf8_test.cpp
+++ b/components/to_utf8/tests/to_utf8_test.cpp
@@ -2,7 +2,6 @@
 #include <fstream>
 #include <cassert>
 #include <stdexcept>
-#include <typeinfo>
 
 #include "../to_utf8.hpp"
 
@@ -55,7 +54,7 @@ std::string getFirstLine(const std::string &filename)
 
 int main()
 {
-    testEncoder(ToUTF8::WINDOWS_1251, "data/russian-win1251.txt", "data/russian-utf8.txt");
-    testEncoder(ToUTF8::WINDOWS_1252, "data/french-win1252.txt", "data/french-utf8.txt");
+    testEncoder(ToUTF8::WINDOWS_1251, "test_data/russian-win1251.txt", "test_data/russian-utf8.txt");
+    testEncoder(ToUTF8::WINDOWS_1252, "test_data/french-win1252.txt", "test_data/french-utf8.txt");
     return 0;
 }