Move tone and khuap_klam test to compact suite

Author: bact

tests/compact/testc_util.py

@@ -22,10 +22,17 @@ def test_spell_word(self):
         self.assertEqual(
             spell_word("คนดี"), ["คอ", "นอ", "คน", "ดอ", "อี", "ดี", "คนดี"]
         )
+        result = spell_word("คน")
+        self.assertIsInstance(result, list)
+        self.assertIn("คน", result)
+
         # Edge cases: None and empty string
         self.assertEqual(spell_word(None), [])
         self.assertEqual(spell_word(""), [])
 
+        # multi-syllable: last element is the full word
+        result_multi = spell_word("คนดี")
+        self.assertEqual(result_multi[-1], "คนดี")
 
 class UtilTestCaseC(unittest.TestCase):
     def test_rhyme(self):
@@ -37,6 +44,14 @@ def test_thai_word_tone_detector(self):
         self.assertEqual(
             thai_word_tone_detector("ราคา"), [("รา", "m"), ("คา", "m")]
         )
+        result = thai_word_tone_detector("คนดี")
+        self.assertIsInstance(result, list)
+        valid_tones = {"l", "m", "h", "r", "f", ""}
+        for syllable, tone in result:
+            self.assertIsInstance(syllable, str)
+            self.assertIn(tone, valid_tones)
+        self.assertIsInstance(thai_word_tone_detector("มือถือ"), list)
+
         # Edge cases: None and empty string
         self.assertEqual(thai_word_tone_detector(None), [])
         self.assertEqual(thai_word_tone_detector(""), [])
@@ -63,3 +78,5 @@ def test_check_khuap_klam(self):
 
         # Edge cases: empty string returns None
         self.assertIsNone(check_khuap_klam(""))
+        for word in ["กลม", "จริง", "ตา"]:
+            self.assertIn(check_khuap_klam(word), (True, False, None))

tests/core/test_util.py

@@ -17,7 +17,6 @@
     analyze_thai_text,
     arabic_digit_to_thai_digit,
     bahttext,
-    check_khuap_klam,
     collate,
     convert_years,
     count_thai_chars,
@@ -50,7 +49,6 @@
     reorder_vowels,
     sound_syllable,
     spell_syllable,
-    spell_word,
     spelling,
     syllable_length,
     syllable_open_close_detector,
@@ -64,7 +62,6 @@
     thai_strftime,
     thai_strptime,
     thai_to_eng,
-    thai_word_tone_detector,
     thaiword_to_date,
     thaiword_to_num,
     thaiword_to_time,
@@ -1058,24 +1055,6 @@ def test_analyze_thai_text(self):
             {'สระ เอ': 1, 'ล': 1, 'ไม้เอก': 1, 'น': 1}
         )
 
-    # ### pythainlp.util.khuap_klam
-
-    def test_check_khuap_klam(self):
-        # true consonant clusters (คำควบกล้ำแท้)
-        self.assertTrue(check_khuap_klam("กราบ"))
-        self.assertTrue(check_khuap_klam("ปลา"))
-        self.assertTrue(check_khuap_klam("เพราะ"))
-        # false consonant clusters (คำควบกล้ำไม่แท้)
-        self.assertFalse(check_khuap_klam("จริง"))
-        self.assertFalse(check_khuap_klam("ทราย"))
-        # not a cluster
-        self.assertIsNone(check_khuap_klam("แม่"))
-        self.assertIsNone(check_khuap_klam("ตา"))
-        # edge cases
-        self.assertIsNone(check_khuap_klam(""))
-        for word in ["กลม", "จริง", "ตา"]:
-            self.assertIn(check_khuap_klam(word), (True, False, None))
-
     # ### pythainlp.util.pronounce
 
     def test_thai_consonant_to_spelling(self):
@@ -1107,29 +1086,6 @@ def test_spell_syllable(self):
         self.assertGreater(len(result_kon), 0)
         self.assertIn("คน", result_kon)
 
-    def test_spell_word(self):
-        self.assertEqual(spell_word(None), [])
-        self.assertEqual(spell_word(""), [])
-        result = spell_word("คน")
-        self.assertIsInstance(result, list)
-        self.assertIn("คน", result)
-        # multi-syllable: last element is the full word
-        result_multi = spell_word("คนดี")
-        self.assertEqual(result_multi[-1], "คนดี")
-
-    # ### pythainlp.util.thai – thai_word_tone_detector
-
-    def test_thai_word_tone_detector(self):
-        self.assertEqual(thai_word_tone_detector(None), [])
-        self.assertEqual(thai_word_tone_detector(""), [])
-        result = thai_word_tone_detector("คนดี")
-        self.assertIsInstance(result, list)
-        valid_tones = {"l", "m", "h", "r", "f", ""}
-        for syllable, tone in result:
-            self.assertIsInstance(syllable, str)
-            self.assertIn(tone, valid_tones)
-        self.assertIsInstance(thai_word_tone_detector("มือถือ"), list)
-
     # ### pythainlp.util.normalize – remove_repeat_vowels,
     #     remove_spaces_before_marks, reorder_vowels