整理: tts_engine モジュール内のプライベートな関数をリネーム、テストを整理

test/unit/tts_pipeline/test_tts_engine.py

@@ -20,9 +20,9 @@
 from voicevox_engine.tts_pipeline.text_analyzer import text_to_accent_phrases
 from voicevox_engine.tts_pipeline.tts_engine import (
     TTSEngine,
-    apply_interrogative_upspeak,
+    _apply_interrogative_upspeak,
+    _to_flatten_phonemes,
     to_flatten_moras,
-    to_flatten_phonemes,
 )
 
 from .test_text_analyzer import stub_unknown_features_koxx
@@ -105,21 +105,21 @@ def is_model_loaded(self, style_id: str) -> bool:
 
 
 def test_to_flatten_phonemes() -> None:
-    """Test `to_flatten_phonemes`."""
+    """Test `_to_flatten_phonemes()`."""
     # Inputs
     moras = [
         gen_mora("　", None, None, "sil", 2 * 0.01067, 0.0),
         gen_mora("ヒ", "h", 2 * 0.01067, "i", 4 * 0.01067, 5.0),
         gen_mora("　", None, None, "sil", 6 * 0.01067, 0.0),
     ]
-
     # Expects
-    true_phonemes = ["pau", "h", "i", "pau"]
-
+    true_phoneme_strs = ["pau", "h", "i", "pau"]
     # Outputs
-    phonemes = list(map(lambda p: p._phoneme, to_flatten_phonemes(moras)))
+    phonemes = _to_flatten_phonemes(moras)
+    phoneme_strs = list(map(lambda p: p._phoneme, phonemes))
 
-    assert true_phonemes == phonemes
+    # Test
+    assert true_phoneme_strs == phoneme_strs
 
 
 def _gen_hello_hiho_accent_phrases() -> list[AccentPhrase]:
@@ -531,7 +531,7 @@ def test_upspeak_voiced_last_mora() -> None:
         )
     ]
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -542,7 +542,7 @@ def test_upspeak_voiced_last_mora() -> None:
     expected = koreha_arimasuka_base_expected()
     expected[-1].is_interrogative = True
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, False)
+    outputs = _apply_interrogative_upspeak(inputs, False)
     # Test
     assert expected == outputs
 
@@ -552,7 +552,7 @@ def test_upspeak_voiced_last_mora() -> None:
     # Expects
     expected = koreha_arimasuka_base_expected()
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -583,7 +583,7 @@ def nn_base_expected() -> list[AccentPhrase]:
     # Expects
     expected = nn_base_expected()
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -604,7 +604,7 @@ def nn_base_expected() -> list[AccentPhrase]:
         )
     ]
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -615,7 +615,7 @@ def nn_base_expected() -> list[AccentPhrase]:
     expected = nn_base_expected()
     expected[-1].is_interrogative = True
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, False)
+    outputs = _apply_interrogative_upspeak(inputs, False)
     # Test
     assert expected == outputs
 
@@ -646,7 +646,7 @@ def ltu_base_expected() -> list[AccentPhrase]:
     # Expects
     expected = ltu_base_expected()
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -657,7 +657,7 @@ def ltu_base_expected() -> list[AccentPhrase]:
     expected = ltu_base_expected()
     expected[-1].is_interrogative = True
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -668,7 +668,7 @@ def ltu_base_expected() -> list[AccentPhrase]:
     expected = ltu_base_expected()
     expected[-1].is_interrogative = True
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, False)
+    outputs = _apply_interrogative_upspeak(inputs, False)
     # Test
     assert expected == outputs
 
@@ -699,7 +699,7 @@ def su_base_expected() -> list[AccentPhrase]:
     # Expects
     expected = su_base_expected()
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -720,7 +720,7 @@ def su_base_expected() -> list[AccentPhrase]:
         )
     ]
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, True)
+    outputs = _apply_interrogative_upspeak(inputs, True)
     # Test
     assert expected == outputs
 
@@ -731,6 +731,6 @@ def su_base_expected() -> list[AccentPhrase]:
     expected = su_base_expected()
     expected[-1].is_interrogative = True
     # Outputs
-    outputs = apply_interrogative_upspeak(inputs, False)
+    outputs = _apply_interrogative_upspeak(inputs, False)
     # Test
     assert expected == outputs