From 6b3f3340f592d20a4b625ac5e3b156bd7bce2a39 Mon Sep 17 00:00:00 2001 From: PyYoshi Date: Mon, 17 Oct 2016 11:53:53 +0900 Subject: [PATCH] fix test errors --- src/tests/bench.py | 2 +- src/tests/test.py | 94 +++++++++++++++++++++++----------------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/src/tests/bench.py b/src/tests/bench.py index 455fb4c..9843e7b 100644 --- a/src/tests/bench.py +++ b/src/tests/bench.py @@ -9,7 +9,7 @@ class TestCchardetSpeed(): def test_speed(self): import time do_times = 5 - path = r'testdata/wikipediaJa_One_Thousand_and_One_Nights_SJIS.txt' + path = r'tests/testdata/wikipediaJa_One_Thousand_and_One_Nights_SJIS.txt' with open(path, 'rb') as f: msg = f.read() diff --git a/src/tests/test.py b/src/tests/test.py index ee75d80..8279561 100644 --- a/src/tests/test.py +++ b/src/tests/test.py @@ -6,53 +6,53 @@ from nose.tools import eq_ import cchardet encodings_map = { - r'testdata/bg/ISO-8859-5/wikitop_bg_ISO-8859-5.txt': 'ISO-8859-5', - r'testdata/bg/UTF-8/wikitop_bg_UTF-8.txt': 'UTF-8', - r'testdata/bg/WINDOWS-1251/wikitop_bg_WINDOWS-1251.txt': 'WINDOWS-1251', - r'testdata/cz/ISO-8859-2/wikitop_cz_ISO-8859-2.txt': 'ISO-8859-2', - r'testdata/cz/UTF-8/wikitop_cz_UTF-8.txt': 'UTF-8', - r'testdata/de/UTF-8/wikitop_de_UTF-8.txt': 'UTF-8', - r'testdata/de/WINDOWS-1252/wikitop_de_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/dk/UTF-8/wikitop_dk_UTF-8.txt': 'UTF-8', - r'testdata/dk/WINDOWS-1252/wikitop_dk_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/el/ISO-8859-7/wikitop_el_ISO-8859-7.txt': 'ISO-8859-7', - r'testdata/el/UTF-8/wikitop_el_UTF-8.txt': 'UTF-8', - r'testdata/en/UTF-8/wikitop_en_UTF-8.txt': 'UTF-8', - r'testdata/en/WINDOWS-1252/wikitop_en_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/es/UTF-8/wikitop_es_UTF-8.txt': 'UTF-8', - r'testdata/es/WINDOWS-1252/wikitop_es_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/fi/UTF-8/wikitop_fi_UTF-8.txt': 'UTF-8', - r'testdata/fi/WINDOWS-1252/wikitop_fi_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/fr/UTF-8/wikitop_fr_UTF-8.txt': 'UTF-8', - r'testdata/fr/WINDOWS-1252/wikitop_fr_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/he/UTF-8/wikitop_he_UTF-8.txt': 'UTF-8', - r'testdata/he/WINDOWS-1255/wikitop_he_WINDOWS-1255.txt': 'WINDOWS-1255', - r'testdata/hu/UTF-8/wikitop_hu_UTF-8.txt': 'UTF-8', - r'testdata/hu/ISO-8859-2/wikitop_hu_ISO-8859-2.txt': 'ISO-8859-2', - r'testdata/it/UTF-8/wikitop_it_UTF-8.txt': 'UTF-8', - r'testdata/it/WINDOWS-1252/wikitop_it_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/nl/UTF-8/wikitop_nl_UTF-8.txt': 'UTF-8', - r'testdata/nl/WINDOWS-1252/wikitop_nl_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/no/UTF-8/wikitop_no_UTF-8.txt': 'UTF-8', - r'testdata/no/WINDOWS-1252/wikitop_no_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/pl/UTF-8/wikitop_pl_UTF-8.txt': 'UTF-8', - r'testdata/pl/ISO-8859-2/wikitop_pl_ISO-8859-2.txt': 'ISO-8859-2', - r'testdata/pt/UTF-8/wikitop_pt_UTF-8.txt': 'UTF-8', - r'testdata/pt/WINDOWS-1252/wikitop_pt_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/ru/UTF-8/wikitop_ru_UTF-8.txt': 'UTF-8', - r'testdata/ru/WINDOWS-1251/wikitop_ru_WINDOWS-1251.txt': 'WINDOWS-1251', - r'testdata/ru/IBM855/wikitop_ru_IBM855.txt': 'IBM855', - r'testdata/ru/KOI8-R/wikitop_ru_KOI8-R.txt': 'KOI8-R', - r'testdata/ru/X-MAC-CYRILLIC/wikitop_ru_MACCYRILLIC.txt': 'MAC-CYRILLIC', - r'testdata/se/UTF-8/wikitop_se_UTF-8.txt': 'UTF-8', - r'testdata/se/WINDOWS-1252/wikitop_se_WINDOWS-1252.txt': 'WINDOWS-1252', - r'testdata/th/UTF-8/wikitop_th_UTF-8.txt': 'UTF-8', - r'testdata/th/TIS-620/utffool_th_TIS-620.txt': 'TIS-620', - r'testdata/th/TIS-620/wikitop_th_TIS-620.txt': 'TIS-620', - r'testdata/tr/UTF-8/wikitop_tr_UTF-8.txt': 'UTF-8', - r'testdata/tr/ISO-8859-9/wikitop_tr_ISO-8859-9.txt': 'ISO-8859-9', - r'testdata/zh/UTF-8/wikitop_zh_UTF-8.txt': 'UTF-8', - r'testdata/zh/GB18030/wikitop_zh_GB18030.txt': 'GB18030', + r'tests/testdata/bg/ISO-8859-5/wikitop_bg_ISO-8859-5.txt': 'ISO-8859-5', + r'tests/testdata/bg/UTF-8/wikitop_bg_UTF-8.txt': 'UTF-8', + r'tests/testdata/bg/WINDOWS-1251/wikitop_bg_WINDOWS-1251.txt': 'WINDOWS-1251', + r'tests/testdata/cz/ISO-8859-2/wikitop_cz_ISO-8859-2.txt': 'ISO-8859-2', + r'tests/testdata/cz/UTF-8/wikitop_cz_UTF-8.txt': 'UTF-8', + r'tests/testdata/de/UTF-8/wikitop_de_UTF-8.txt': 'UTF-8', + r'tests/testdata/de/WINDOWS-1252/wikitop_de_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/dk/UTF-8/wikitop_dk_UTF-8.txt': 'UTF-8', + r'tests/testdata/dk/WINDOWS-1252/wikitop_dk_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/el/ISO-8859-7/wikitop_el_ISO-8859-7.txt': 'ISO-8859-7', + r'tests/testdata/el/UTF-8/wikitop_el_UTF-8.txt': 'UTF-8', + r'tests/testdata/en/UTF-8/wikitop_en_UTF-8.txt': 'UTF-8', + r'tests/testdata/en/WINDOWS-1252/wikitop_en_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/es/UTF-8/wikitop_es_UTF-8.txt': 'UTF-8', + r'tests/testdata/es/WINDOWS-1252/wikitop_es_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/fi/UTF-8/wikitop_fi_UTF-8.txt': 'UTF-8', + r'tests/testdata/fi/WINDOWS-1252/wikitop_fi_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/fr/UTF-8/wikitop_fr_UTF-8.txt': 'UTF-8', + r'tests/testdata/fr/WINDOWS-1252/wikitop_fr_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/he/UTF-8/wikitop_he_UTF-8.txt': 'UTF-8', + r'tests/testdata/he/WINDOWS-1255/wikitop_he_WINDOWS-1255.txt': 'WINDOWS-1255', + r'tests/testdata/hu/UTF-8/wikitop_hu_UTF-8.txt': 'UTF-8', + r'tests/testdata/hu/ISO-8859-2/wikitop_hu_ISO-8859-2.txt': 'ISO-8859-2', + r'tests/testdata/it/UTF-8/wikitop_it_UTF-8.txt': 'UTF-8', + r'tests/testdata/it/WINDOWS-1252/wikitop_it_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/nl/UTF-8/wikitop_nl_UTF-8.txt': 'UTF-8', + r'tests/testdata/nl/WINDOWS-1252/wikitop_nl_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/no/UTF-8/wikitop_no_UTF-8.txt': 'UTF-8', + r'tests/testdata/no/WINDOWS-1252/wikitop_no_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/pl/UTF-8/wikitop_pl_UTF-8.txt': 'UTF-8', + r'tests/testdata/pl/ISO-8859-2/wikitop_pl_ISO-8859-2.txt': 'ISO-8859-2', + r'tests/testdata/pt/UTF-8/wikitop_pt_UTF-8.txt': 'UTF-8', + r'tests/testdata/pt/WINDOWS-1252/wikitop_pt_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/ru/UTF-8/wikitop_ru_UTF-8.txt': 'UTF-8', + r'tests/testdata/ru/WINDOWS-1251/wikitop_ru_WINDOWS-1251.txt': 'WINDOWS-1251', + r'tests/testdata/ru/IBM855/wikitop_ru_IBM855.txt': 'IBM855', + r'tests/testdata/ru/KOI8-R/wikitop_ru_KOI8-R.txt': 'KOI8-R', + r'tests/testdata/ru/X-MAC-CYRILLIC/wikitop_ru_MACCYRILLIC.txt': 'MAC-CYRILLIC', + r'tests/testdata/se/UTF-8/wikitop_se_UTF-8.txt': 'UTF-8', + r'tests/testdata/se/WINDOWS-1252/wikitop_se_WINDOWS-1252.txt': 'WINDOWS-1252', + r'tests/testdata/th/UTF-8/wikitop_th_UTF-8.txt': 'UTF-8', + r'tests/testdata/th/TIS-620/utffool_th_TIS-620.txt': 'TIS-620', + r'tests/testdata/th/TIS-620/wikitop_th_TIS-620.txt': 'TIS-620', + r'tests/testdata/tr/UTF-8/wikitop_tr_UTF-8.txt': 'UTF-8', + r'tests/testdata/tr/ISO-8859-9/wikitop_tr_ISO-8859-9.txt': 'ISO-8859-9', + r'tests/testdata/zh/UTF-8/wikitop_zh_UTF-8.txt': 'UTF-8', + r'tests/testdata/zh/GB18030/wikitop_zh_GB18030.txt': 'GB18030', }