Move fixtures to conftest, apply to more tests

Author: hyperc54

tests/data/conftest.py

@@ -0,0 +1,41 @@
+import pytest
+import json
+import pathlib
+from unittest import mock
+
+RESOURCES_PATH = pathlib.Path(__file__).parent.parent / "resources"
+GUITAR_SET_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "guitarset" / "dummy_index.json"))
+IKALA_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "ikala" / "dummy_index.json"))
+MAESTRO_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "maestro" / "dummy_index.json"))
+METADATA_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "maestro" / "maestro-v2.0.0.json"))
+MEDLEYDB_PITCH_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "medleydb_pitch" / "dummy_index.json"))
+
+
+@pytest.fixture  # type: ignore[misc]
+def mock_medleydb_pitch_index() -> None:  # type: ignore[misc]
+    with mock.patch("mirdata.datasets.medleydb_pitch.Dataset.download"):
+        with mock.patch("mirdata.datasets.medleydb_pitch.Dataset._index", new=MEDLEYDB_PITCH_TEST_INDEX):
+            yield
+
+
+@pytest.fixture  # type: ignore[misc]
+def mock_maestro_index() -> None:  # type: ignore[misc]
+    index_with_metadata = MAESTRO_TEST_INDEX
+    index_with_metadata["metadata"] = METADATA_TEST_INDEX
+    with mock.patch("mirdata.datasets.maestro.Dataset.download"):
+        with mock.patch("mirdata.datasets.maestro.Dataset._index", new=index_with_metadata):
+            yield
+
+
+@pytest.fixture  # type: ignore[misc]
+def mock_guitarset_index() -> None:  # type: ignore[misc]
+    with mock.patch("mirdata.datasets.guitarset.Dataset.download"):
+        with mock.patch("mirdata.datasets.guitarset.Dataset._index", new=GUITAR_SET_TEST_INDEX):
+            yield
+
+
+@pytest.fixture  # type: ignore[misc]
+def mock_ikala_index() -> None:  # type: ignore[misc]
+    with mock.patch("mirdata.datasets.ikala.Dataset.download"):
+        with mock.patch("mirdata.datasets.ikala.Dataset._index", new=IKALA_TEST_INDEX):
+            yield

tests/data/test_guitarset.py

@@ -14,14 +14,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from unittest import mock
 import apache_beam as beam
 import itertools
 import os
 import pathlib
 import shutil
-import pytest
-import json
 from apache_beam.testing.test_pipeline import TestPipeline
 from typing import List
 
@@ -37,15 +34,6 @@
 RESOURCES_PATH = pathlib.Path(__file__).parent.parent / "resources"
 TRACK_ID = "00_BN1-129-Eb_comp"
 
-GUITAR_SET_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "guitarset" / "dummy_index.json"))
-
-
-@pytest.fixture  # type: ignore[misc]
-def mock_guitarset_index() -> None:  # type: ignore[misc]
-    with mock.patch("mirdata.datasets.guitarset.Dataset.download"):
-        with mock.patch("mirdata.datasets.guitarset.Dataset._index", new=GUITAR_SET_TEST_INDEX):
-            yield
-
 
 def test_guitarset_to_tf_example(tmp_path: pathlib.Path, mock_guitarset_index: None) -> None:
     mock_guitarset_home = tmp_path / "guitarset"

tests/data/test_ikala.py

@@ -14,13 +14,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import pytest
 import pathlib
-from unittest import mock
 import apache_beam as beam
 import itertools
 import os
-import json
 from apache_beam.testing.test_pipeline import TestPipeline
 
 from basic_pitch.data.datasets.ikala import (
@@ -31,14 +28,6 @@
 # TODO: Create test_ikala_to_tf_example
 
 RESOURCES_PATH = pathlib.Path(__file__).parent.parent / "resources"
-IKALA_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "ikala" / "dummy_index.json"))
-
-
-@pytest.fixture  # type: ignore[misc]
-def mock_ikala_index() -> None:  # type: ignore[misc]
-    with mock.patch("mirdata.datasets.ikala.Dataset.download"):
-        with mock.patch("mirdata.datasets.ikala.Dataset._index", new=IKALA_TEST_INDEX):
-            yield
 
 
 def test_ikala_invalid_tracks(tmpdir: str) -> None:

tests/data/test_maestro.py

@@ -16,9 +16,6 @@
 # limitations under the License.
 import os
 import pathlib
-import json
-import pytest
-from unittest import mock
 from typing import List
 
 import apache_beam as beam
@@ -41,18 +38,6 @@
 TEST_TRACK_ID = "2004/MIDI-Unprocessed_SMF_02_R1_2004_01-05_ORIG_MID--AUDIO_02_R1_2004_08_Track08_wav"
 GT_15M_TRACK_ID = "2004/MIDI-Unprocessed_SMF_02_R1_2004_01-05_ORIG_MID--AUDIO_02_R1_2004_05_Track05_wav"
 
-MAESTRO_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "maestro" / "dummy_index.json"))
-METADATA_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "maestro" / "maestro-v2.0.0.json"))
-
-
-@pytest.fixture  # type: ignore[misc]
-def mock_maestro_index() -> None:  # type: ignore[misc]
-    index_with_metadata = MAESTRO_TEST_INDEX
-    index_with_metadata["metadata"] = METADATA_TEST_INDEX
-    with mock.patch("mirdata.datasets.maestro.Dataset.download"):
-        with mock.patch("mirdata.datasets.maestro.Dataset._index", new=index_with_metadata):
-            yield
-
 
 def test_maestro_to_tf_example(tmp_path: pathlib.Path, mock_maestro_index: None) -> None:
     mock_maestro_home = tmp_path / "maestro"

tests/data/test_medleydb_pitch.py

@@ -17,10 +17,6 @@
 import apache_beam as beam
 import itertools
 import os
-import json
-import pytest
-import pathlib
-from unittest import mock
 
 from apache_beam.testing.test_pipeline import TestPipeline
 
@@ -32,16 +28,6 @@
 
 # TODO: Create test_medleydb_pitch_to_tf_example
 
-RESOURCES_PATH = pathlib.Path(__file__).parent.parent / "resources"
-MEDLEYDB_PITCH_TEST_INDEX = json.load(open(RESOURCES_PATH / "data" / "medleydb_pitch" / "dummy_index.json"))
-
-
-@pytest.fixture  # type: ignore[misc]
-def mock_medleydb_pitch_index() -> None:  # type: ignore[misc]
-    with mock.patch("mirdata.datasets.medleydb_pitch.Dataset.download"):
-        with mock.patch("mirdata.datasets.medleydb_pitch.Dataset._index", new=MEDLEYDB_PITCH_TEST_INDEX):
-            yield
-
 
 def test_medleydb_pitch_invalid_tracks(tmpdir: str) -> None:
     split_labels = ["train", "validation"]

tests/data/test_slakh.py

@@ -79,7 +79,7 @@ def create_mock_input_data(data_home: pathlib.Path, input_data: List[Tuple[str,
         shutil.copy(SLAKH_PATH / split / track_num / "metadata.yaml", track_dir / "metadata.yaml")
 
 
-def test_slakh_to_tf_example(tmp_path: pathlib.Path) -> None:
+def test_slakh_to_tf_example(tmp_path: pathlib.Path, mock_slakh_index: None) -> None:
     mock_slakh_home = tmp_path / "slakh"
     mock_slakh_ext = mock_slakh_home / "slakh2100_flac_redux"
 
@@ -105,7 +105,7 @@ def test_slakh_to_tf_example(tmp_path: pathlib.Path) -> None:
         assert len(data) != 0
 
 
-def test_slakh_invalid_tracks(tmp_path: pathlib.Path) -> None:
+def test_slakh_invalid_tracks(tmp_path: pathlib.Path, mock_slakh_index: None) -> None:
     mock_slakh_home = tmp_path / "slakh"
     mock_slakh_ext = mock_slakh_home / "slakh2100_flac_redux"
 
@@ -132,7 +132,7 @@ def test_slakh_invalid_tracks(tmp_path: pathlib.Path) -> None:
             assert fp.read().strip() == track_id
 
 
-def test_slakh_invalid_tracks_omitted(tmp_path: pathlib.Path) -> None:
+def test_slakh_invalid_tracks_omitted(tmp_path: pathlib.Path, mock_slakh_index: None) -> None:
     mock_slakh_home = tmp_path / "slakh"
     mock_slakh_ext = mock_slakh_home / "slakh2100_flac_redux"
 
@@ -161,7 +161,7 @@ def test_slakh_invalid_tracks_omitted(tmp_path: pathlib.Path) -> None:
         assert fp.read().strip() == ""
 
 
-def test_slakh_invalid_tracks_drums(tmp_path: pathlib.Path) -> None:
+def test_slakh_invalid_tracks_drums(tmp_path: pathlib.Path, mock_slakh_index: None) -> None:
     mock_slakh_home = tmp_path / "slakh"
     mock_slakh_ext = mock_slakh_home / "slakh2100_flac_redux"
 

tests/data/test_tf_example_deserialization.py

@@ -86,7 +86,7 @@ def mock_and_process(split: str, track_id: str) -> None:
     return output_home
 
 
-def test_prepare_datasets(tmp_path: pathlib.Path) -> None:
+def test_prepare_datasets(tmp_path: pathlib.Path, mock_guitarset_index: None) -> None:
     datasets_home = setup_test_resources(tmp_path)
 
     ds_train, ds_valid = prepare_datasets(
@@ -102,7 +102,7 @@ def test_prepare_datasets(tmp_path: pathlib.Path) -> None:
     assert ds_valid is not None and isinstance(ds_valid, tf.data.Dataset)
 
 
-def test_prepare_visualization_dataset(tmp_path: pathlib.Path) -> None:
+def test_prepare_visualization_dataset(tmp_path: pathlib.Path, mock_guitarset_index: None) -> None:
     datasets_home = setup_test_resources(tmp_path)
 
     ds_train, ds_valid = prepare_visualization_datasets(
@@ -117,7 +117,7 @@ def test_prepare_visualization_dataset(tmp_path: pathlib.Path) -> None:
     assert ds_valid is not None and isinstance(ds_train, tf.data.Dataset)
 
 
-def test_sample_datasets(tmp_path: pathlib.Path) -> None:
+def test_sample_datasets(tmp_path: pathlib.Path, mock_guitarset_index: None) -> None:
     """touches the following methods:
     - transcription_dataset
         - parse_transcription_tfexample
@@ -126,6 +126,7 @@ def test_sample_datasets(tmp_path: pathlib.Path) -> None:
         - reduce_transcription_inputs
         - get_sample_weights
             - _infer_time_size
+            - _infer_time_size
         - get_transcription_chunks
             - extract_random_window
                 - extract_window