More test cases

Author: bact

pythainlp/util/__init__.py

@@ -7,11 +7,12 @@
     "arabic_digit_to_thai_digit",
     "bahttext",
     "collate",
+    "countthai",
     "delete_tone",
+    "deletetone",  # Will deprecated after version 2.1
     "digit_to_text",
     "eng_to_thai",
     "find_keyword",
-    "countthai",
     "is_native_thai",
     "isthai",
     "isthaichar",
@@ -22,11 +23,12 @@
     "reign_year_to_ad",
     "text_to_arabic_digit",
     "text_to_thai_digit",
+    "thai_digit_to_arabic_digit",
     "thai_strftime",
+    "thai_time",
     "thai_to_eng",
-    "thai_digit_to_arabic_digit",
+    "thaicheck",  # Will deprecated after version 2.1
     "thaiword_to_num",
-    "thai_time",
 ]
 
 
@@ -41,9 +43,9 @@
 )
 from .keyboard import eng_to_thai, thai_to_eng
 from .keywords import find_keyword, rank
-from .normalize import delete_tone, normalize
+from .normalize import delete_tone, deletetone, normalize
 from .numtoword import bahttext, num_to_thaiword
 from .thai import countthai, isthai, isthaichar
-from .thaiwordcheck import is_native_thai
-from .wordtonum import thaiword_to_num
 from .thai_time import thai_time
+from .thaiwordcheck import is_native_thai, thaicheck
+from .wordtonum import thaiword_to_num

pythainlp/util/thaiwordcheck.py

@@ -111,7 +111,7 @@ def is_native_thai(word: str) -> bool:
     chs = re.findall(_TH_CONSONANTS_PATTERN, word)
     if not chs:
         return False
-    
+
     # If there's only one Thai consonant -> it can be a native Thai
     if len(chs) == 1:
         return True

tests/test_util.py

@@ -4,12 +4,14 @@
 import unittest
 from collections import Counter
 
+from pythainlp.tokenize import word_tokenize
 from pythainlp.util import (
     arabic_digit_to_thai_digit,
     bahttext,
     collate,
     countthai,
     delete_tone,
+    deletetone,
     digit_to_text,
     eng_to_thai,
     find_keyword,
@@ -25,11 +27,11 @@
     text_to_thai_digit,
     thai_digit_to_arabic_digit,
     thai_strftime,
+    thai_time,
     thai_to_eng,
+    thaicheck,
     thaiword_to_num,
-    thai_time,
 )
-from pythainlp.tokenize import word_tokenize
 
 
 class TestUtilPackage(unittest.TestCase):
@@ -144,6 +146,12 @@ def test_date(self):
 
     def test_thai_strftime(self):
         date = datetime.datetime(1976, 10, 6, 1, 40)
+        self.assertEqual(thai_strftime(date, "%d"), "06")
+        self.assertEqual(thai_strftime(date, "%-d"), "6")
+        self.assertEqual(thai_strftime(date, "%-d", True), "๖")
+        self.assertEqual(thai_strftime(date, "%%"), "%")
+        self.assertEqual(thai_strftime(date, "%-"), "-")
+        self.assertEqual(thai_strftime(date, "%P"), "P")
         self.assertEqual(thai_strftime(date, "%c"), "พ   6 ต.ค. 01:40:00 2519")
         self.assertEqual(
             thai_strftime(date, "%c", True), "พ   ๖ ต.ค. ๐๑:๔๐:๐๐ ๒๕๑๙"
@@ -155,7 +163,7 @@ def test_thai_strftime(self):
             "วันพุธที่ 06 ตุลาคม พ.ศ. 2519 เวลา 01:40น. (พ 06-ต.ค.-19) % %",
         )
         self.assertIsNotNone(
-            thai_strftime(date, "%A%a%B%b%C%c%D%F%G%g%v%X%x%Y%y%+")
+            thai_strftime(date, "%A%a%B%b%C%c%D%F%G%g%v%X%x%Y%y%+%%")
         )
 
     # ### pythainlp.util.thai_time
@@ -169,6 +177,10 @@ def test_thai_time(self):
         self.assertEqual(
             thai_time(datetime.time(12, 3, 0)), "สิบสองนาฬิกาสามนาที"
         )
+        self.assertEqual(
+            thai_time(datetime.time(12, 3, 1)),
+            "สิบสองนาฬิกาสามนาทีหนึ่งวินาที",
+        )
         self.assertEqual(
             thai_time(
                 datetime.datetime(2014, 5, 22, 12, 3, 0), precision="second"
@@ -208,6 +220,7 @@ def test_thai_time(self):
     def test_delete_tone(self):
         self.assertEqual(delete_tone("จิ้น"), "จิน")
         self.assertEqual(delete_tone("เก๋า"), "เกา")
+        self.assertEqual(delete_tone("จิ้น"), deletetone("จิ้น"))
 
     def test_normalize(self):
         self.assertEqual(normalize("เเปลก"), "แปลก")
@@ -235,6 +248,7 @@ def test_isthai(self):
         self.assertEqual(isthai("(ต.ค.)", ignore_chars=".()"), True)
 
     def test_is_native_thai(self):
+        self.assertEqual(is_native_thai("เลข"), thaicheck("เลข"))
         self.assertEqual(is_native_thai(None), False)
         self.assertEqual(is_native_thai(""), False)
         self.assertEqual(is_native_thai("116"), False)