fixed tests and updated test.py

[nvdajp/nvdajpmiscdep.git] / jptools / mecabRunner.py

diff --git a/jptools/mecabRunner.py b/jptools/mecabRunner.py
index 9592ce4..d5e0233 100644 (file)
--- a/jptools/mecabRunner.py
+++ b/jptools/mecabRunner.py
@@ -55,9 +55,13 @@ def get_reading(msg):
        mf = None\r
        return reading\r
 \r
-if __name__ == '__main__':\r
+def runTasks(enableUserDic=False):\r
        print jt_dir, dic, user_dics_org, user_dics\r
-       Mecab_initialize(__print, jt_dir, dic, user_dics)\r
+       if enableUserDic:\r
+               Mecab_initialize(__print, jt_dir, dic, user_dics)\r
+       else:\r
+               Mecab_initialize(__print, jt_dir, dic)\r
+       count = 0\r
        for i in tasks:\r
                if isinstance(i, dict):\r
                        if 'braille' in i:\r
@@ -85,6 +89,7 @@ if __name__ == '__main__':
                        __print('input:    ' + item[0])\r
                        __print('reading expected: ' + item[1])\r
                        __print('reading result:   ' + result[0])\r
+                       count += 1\r
                if len(item) > 2 and result[1] != item[2]:\r
                        __print('')\r
                        __print('')\r
@@ -92,5 +97,9 @@ if __name__ == '__main__':
                        __print('input:            ' + item[0])\r
                        __print('braille expected: ' + item[2])\r
                        __print('braille result:   ' + result[1])\r
+                       count += 1\r
+\r
+       return count\r
 \r
-       \r
+if __name__ == '__main__':\r
+       runTasks(enableUserDic=True)\r