Rename track -> recording in tests for clarity

This commit is contained in:
Šarūnas Nejus 2026-01-17 18:17:45 +00:00
parent 78d7a94041
commit aa640e57b7
No known key found for this signature in database

View file

@ -39,7 +39,7 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
def _make_release(
self,
date_str="2009",
tracks=None,
recordings=None,
track_length=None,
track_artist=False,
multi_artist_credit=False,
@ -102,8 +102,8 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
i = 0
track_list = []
if tracks:
for recording in tracks:
if recordings:
for recording in recordings:
i += 1
track = {
"id": f"RELEASE TRACK ID {i}",
@ -164,7 +164,7 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
)
return release
def _make_track(
def _make_recording(
self,
title,
tr_id,
@ -175,14 +175,14 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
remixer=False,
multi_artist_credit=False,
):
track = {
recording = {
"title": title,
"id": tr_id,
}
if duration is not None:
track["length"] = duration
recording["length"] = duration
if artist:
track["artist_credit"] = [
recording["artist_credit"] = [
{
"artist": {
"name": "RECORDING ARTIST NAME",
@ -193,8 +193,8 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
}
]
if multi_artist_credit:
track["artist_credit"][0]["joinphrase"] = " & "
track["artist_credit"].append(
recording["artist_credit"][0]["joinphrase"] = " & "
recording["artist_credit"].append(
{
"artist": {
"name": "RECORDING ARTIST 2 NAME",
@ -205,7 +205,7 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
}
)
if remixer:
track["artist_relations"] = [
recording["artist_relations"] = [
{
"type": "remixer",
"type_id": "RELATION TYPE ID",
@ -219,10 +219,10 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
}
]
if video:
track["video"] = True
recording["video"] = True
if disambiguation:
track["disambiguation"] = disambiguation
return track
recording["disambiguation"] = disambiguation
return recording
def test_parse_release_with_year(self):
release = self._make_release("1984")
@ -248,11 +248,11 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.original_day == 31
def test_parse_tracks(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
t = d.tracks
@ -265,11 +265,11 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert t[1].length == 200.0
def test_parse_track_indices(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
t = d.tracks
@ -279,11 +279,11 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert t[1].index == 2
def test_parse_medium_numbers_single_medium(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
assert d.mediums == 1
@ -292,15 +292,15 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert t[1].medium == 1
def test_parse_medium_numbers_two_mediums(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=[tracks[0]])
release = self._make_release(recordings=[recordings[0]])
second_track_list = [
{
"id": "RELEASE TRACK ID 2",
"recording": tracks[1],
"recording": recordings[1],
"position": "1",
"number": "A1",
}
@ -329,14 +329,16 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.original_month == 3
def test_no_durations(self):
tracks = [self._make_track("TITLE", "ID", None)]
release = self._make_release(tracks=tracks)
recordings = [self._make_recording("TITLE", "ID", None)]
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
assert d.tracks[0].length is None
def test_track_length_overrides_recording_length(self):
tracks = [self._make_track("TITLE", "ID", 1.0 * 1000.0)]
release = self._make_release(tracks=tracks, track_length=2.0 * 1000.0)
recordings = [self._make_recording("TITLE", "ID", 1.0 * 1000.0)]
release = self._make_release(
recordings=recordings, track_length=2.0 * 1000.0
)
d = self.mb.album_info(release)
assert d.tracks[0].length == 2.0
@ -402,11 +404,11 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.barcode == "BARCODE"
def test_parse_media(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(None, tracks=tracks)
release = self._make_release(None, recordings=recordings)
d = self.mb.album_info(release)
assert d.media == "FORMAT"
@ -417,11 +419,11 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.releasegroupdisambig == "RG_DISAMBIGUATION"
def test_parse_disctitle(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(None, tracks=tracks)
release = self._make_release(None, recordings=recordings)
d = self.mb.album_info(release)
t = d.tracks
assert t[0].disctitle == "MEDIUM TITLE"
@ -434,8 +436,8 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.language is None
def test_parse_recording_artist(self):
tracks = [self._make_track("a", "b", 1, True)]
release = self._make_release(None, tracks=tracks)
recordings = [self._make_recording("a", "b", 1, True)]
release = self._make_release(None, recordings=recordings)
track = self.mb.album_info(release).tracks[0]
assert track.artist == "RECORDING ARTIST NAME"
assert track.artist_id == "RECORDING ARTIST ID"
@ -443,8 +445,10 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert track.artist_credit == "RECORDING ARTIST CREDIT"
def test_parse_recording_artist_multi(self):
tracks = [self._make_track("a", "b", 1, True, multi_artist_credit=True)]
release = self._make_release(None, tracks=tracks)
recordings = [
self._make_recording("a", "b", 1, True, multi_artist_credit=True)
]
release = self._make_release(None, recordings=recordings)
track = self.mb.album_info(release).tracks[0]
assert track.artist == "RECORDING ARTIST NAME & RECORDING ARTIST 2 NAME"
assert track.artist_id == "RECORDING ARTIST ID"
@ -475,8 +479,10 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
]
def test_track_artist_overrides_recording_artist(self):
tracks = [self._make_track("a", "b", 1, True)]
release = self._make_release(None, tracks=tracks, track_artist=True)
recordings = [self._make_recording("a", "b", 1, True)]
release = self._make_release(
None, recordings=recordings, track_artist=True
)
track = self.mb.album_info(release).tracks[0]
assert track.artist == "TRACK ARTIST NAME"
assert track.artist_id == "TRACK ARTIST ID"
@ -484,9 +490,14 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert track.artist_credit == "TRACK ARTIST CREDIT"
def test_track_artist_overrides_recording_artist_multi(self):
tracks = [self._make_track("a", "b", 1, True, multi_artist_credit=True)]
recordings = [
self._make_recording("a", "b", 1, True, multi_artist_credit=True)
]
release = self._make_release(
None, tracks=tracks, track_artist=True, multi_artist_credit=True
None,
recordings=recordings,
track_artist=True,
multi_artist_credit=True,
)
track = self.mb.album_info(release).tracks[0]
assert track.artist == "TRACK ARTIST NAME & TRACK ARTIST 2 NAME"
@ -511,8 +522,8 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
]
def test_parse_recording_remixer(self):
tracks = [self._make_track("a", "b", 1, remixer=True)]
release = self._make_release(None, tracks=tracks)
recordings = [self._make_recording("a", "b", 1, remixer=True)]
release = self._make_release(None, recordings=recordings)
track = self.mb.album_info(release).tracks[0]
assert track.remixer == "RECORDING REMIXER ARTIST NAME"
@ -543,47 +554,55 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
def test_ignored_media(self):
config["match"]["ignored_media"] = ["IGNORED1", "IGNORED2"]
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks, medium_format="IGNORED1")
release = self._make_release(
recordings=recordings, medium_format="IGNORED1"
)
d = self.mb.album_info(release)
assert len(d.tracks) == 0
def test_no_ignored_media(self):
config["match"]["ignored_media"] = ["IGNORED1", "IGNORED2"]
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks, medium_format="NON-IGNORED")
release = self._make_release(
recordings=recordings, medium_format="NON-IGNORED"
)
d = self.mb.album_info(release)
assert len(d.tracks) == 2
def test_skip_data_track(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("[data track]", "ID DATA TRACK", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording(
"[data track]", "ID DATA TRACK", 100.0 * 1000.0
),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
assert len(d.tracks) == 2
assert d.tracks[0].title == "TITLE ONE"
assert d.tracks[1].title == "TITLE TWO"
def test_skip_audio_data_tracks_by_default(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
data_tracks = [
self._make_track(
self._make_recording(
"TITLE AUDIO DATA", "ID DATA TRACK", 100.0 * 1000.0
)
]
release = self._make_release(tracks=tracks, data_tracks=data_tracks)
release = self._make_release(
recordings=recordings, data_tracks=data_tracks
)
d = self.mb.album_info(release)
assert len(d.tracks) == 2
assert d.tracks[0].title == "TITLE ONE"
@ -591,16 +610,18 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
def test_no_skip_audio_data_tracks_if_configured(self):
config["match"]["ignore_data_tracks"] = False
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
data_tracks = [
self._make_track(
self._make_recording(
"TITLE AUDIO DATA", "ID DATA TRACK", 100.0 * 1000.0
)
]
release = self._make_release(tracks=tracks, data_tracks=data_tracks)
release = self._make_release(
recordings=recordings, data_tracks=data_tracks
)
d = self.mb.album_info(release)
assert len(d.tracks) == 3
assert d.tracks[0].title == "TITLE ONE"
@ -608,30 +629,32 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.tracks[2].title == "TITLE AUDIO DATA"
def test_skip_video_tracks_by_default(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track(
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording(
"TITLE VIDEO", "ID VIDEO", 100.0 * 1000.0, False, True
),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
assert len(d.tracks) == 2
assert d.tracks[0].title == "TITLE ONE"
assert d.tracks[1].title == "TITLE TWO"
def test_skip_video_data_tracks_by_default(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
data_tracks = [
self._make_track(
self._make_recording(
"TITLE VIDEO", "ID VIDEO", 100.0 * 1000.0, False, True
)
]
release = self._make_release(tracks=tracks, data_tracks=data_tracks)
release = self._make_release(
recordings=recordings, data_tracks=data_tracks
)
d = self.mb.album_info(release)
assert len(d.tracks) == 2
assert d.tracks[0].title == "TITLE ONE"
@ -640,14 +663,14 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
def test_no_skip_video_tracks_if_configured(self):
config["match"]["ignore_data_tracks"] = False
config["match"]["ignore_video_tracks"] = False
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track(
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording(
"TITLE VIDEO", "ID VIDEO", 100.0 * 1000.0, False, True
),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
assert len(d.tracks) == 3
assert d.tracks[0].title == "TITLE ONE"
@ -657,16 +680,18 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
def test_no_skip_video_data_tracks_if_configured(self):
config["match"]["ignore_data_tracks"] = False
config["match"]["ignore_video_tracks"] = False
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track("TITLE TWO", "ID TWO", 200.0 * 1000.0),
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording("TITLE TWO", "ID TWO", 200.0 * 1000.0),
]
data_tracks = [
self._make_track(
self._make_recording(
"TITLE VIDEO", "ID VIDEO", 100.0 * 1000.0, False, True
)
]
release = self._make_release(tracks=tracks, data_tracks=data_tracks)
release = self._make_release(
recordings=recordings, data_tracks=data_tracks
)
d = self.mb.album_info(release)
assert len(d.tracks) == 3
assert d.tracks[0].title == "TITLE ONE"
@ -674,16 +699,16 @@ class MBAlbumInfoTest(MusicBrainzTestCase):
assert d.tracks[2].title == "TITLE VIDEO"
def test_track_disambiguation(self):
tracks = [
self._make_track("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_track(
recordings = [
self._make_recording("TITLE ONE", "ID ONE", 100.0 * 1000.0),
self._make_recording(
"TITLE TWO",
"ID TWO",
200.0 * 1000.0,
disambiguation="SECOND TRACK",
),
]
release = self._make_release(tracks=tracks)
release = self._make_release(recordings=recordings)
d = self.mb.album_info(release)
t = d.tracks