Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
exclude: \.svg$
- repo: local
hooks:
- id: no-unittest-testcase
name: no unittest.TestCase in tests (use pytest style)
language: pygrep
entry: \bTestCase\b
files: (^|/)test[^/]*\.py$
- repo: https://github.com/PyCQA/isort
rev: 9.0.1
hooks:
Expand Down
30 changes: 15 additions & 15 deletions styletts2/tests/test_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import os
import signal
import sys
import threading
import time
import unittest
from contextlib import contextmanager
from pathlib import Path
from unittest.mock import MagicMock, patch
Expand Down Expand Up @@ -63,7 +63,7 @@ def _dummy_tensors():
return wave, text, mel


class TestOODSamplingEVMode(unittest.TestCase):
class TestOODSamplingEVMode:
"""OOD sampling path inside __getitem__ when preprocessed_dir is set."""

def _make_dataset(self, pool, min_length):
Expand Down Expand Up @@ -104,8 +104,8 @@ def test_ood_text_is_accumulated_not_replaced(self):
result = self._call_getitem(ds)
ref_text_ood = result[4]
inner = ref_text_ood[1:-1].tolist() # strip leading/trailing boundary 0
self.assertGreater(len(inner), 5)
self.assertIn(_SPACE_IDX, inner)
assert len(inner) > 5
assert _SPACE_IDX in inner

def test_timer_passes(self):
with _time_limit(1):
Expand All @@ -117,10 +117,10 @@ def test_timer_exceeded(self):
time.sleep(2)


class TestOODIndicesFromPSV(unittest.TestCase):
class TestOODIndicesFromPSV:
"""OOD indices loaded from a real PSV file must map to valid symbol-table positions."""

def setUp(self):
def setup_method(self):
from everyvoice.config.text_config import TextConfig

from styletts2.ev_config import StyleTTS2PretrainedConfig
Expand Down Expand Up @@ -158,13 +158,13 @@ def test_ood_indices_are_valid_symbol_table_positions(self):
result = self._call_getitem()
ref_text_ood = result[4]
inner = ref_text_ood[1:-1].tolist() # strip boundary tokens
self.assertGreater(len(inner), 0, "OOD tensor has no inner indices")
assert len(inner) > 0, "OOD tensor has no inner indices"
for idx in inner:
self.assertGreaterEqual(idx, 0)
self.assertLess(idx, len(self.pretrained_symbols))
assert idx >= 0
assert idx < len(self.pretrained_symbols)


class TestMultilingualLanguageId(unittest.TestCase):
class TestMultilingualLanguageId:
"""language_id resolution in FilePathDataset._load_tensor_ev (EV mode)."""

def _make_dataset(self, lang2id):
Expand Down Expand Up @@ -196,7 +196,7 @@ def test_resolves_language_id_from_lang2id(self):
"characters": "hi",
}
_, _, _, language_id = self._load(ds, item)
self.assertEqual(language_id, 1)
assert language_id == 1

def test_defaults_language_id_to_zero_when_monolingual(self):
ds = self._make_dataset(None)
Expand All @@ -207,10 +207,10 @@ def test_defaults_language_id_to_zero_when_monolingual(self):
"characters": "hi",
}
_, _, _, language_id = self._load(ds, item)
self.assertEqual(language_id, 0)
assert language_id == 0


class TestCollaterLangs(unittest.TestCase):
class TestCollaterLangs:
"""The Collater must batch per-item language_ids into a `langs` tensor."""

def test_langs_tensor_matches_per_item_language_ids(self):
Expand All @@ -228,8 +228,8 @@ def _item(language_id):
collate = Collater(max_mel_length=10)
result = collate(batch)
langs = result[-1]
self.assertEqual(sorted(langs.tolist()), [0, 1, 2])
assert sorted(langs.tolist()) == [0, 1, 2]


if __name__ == "__main__":
unittest.main()
pytest.main(sys.argv)
Loading