Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2026-01-04 15:03:22 +01:00
Code Issues Projects Releases Wiki Activity

Replace assertLess and assertLessEqual

Browse source
This commit is contained in:
Šarūnas Nejus 2024-08-05 17:54:50 +01:00
parent eda0ef11d6
commit 6a3380bcb5
No known key found for this signature in database
GPG key ID: DD28F6704DBE3435
4 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/test_art_resize.py
View file

@ -77,8 +77,9 @@ class ArtResizerFileSizeTest(CleanupModulesMixin, BeetsTestCase):
)
self.assertExists(im_a)
# target size was achieved
self.assertLess(
os.stat(syspath(im_a)).st_size, os.stat(syspath(im_95_qual)).st_size
assert (
os.stat(syspath(im_a)).st_size
< os.stat(syspath(im_95_qual)).st_size
)
# Attempt with lower initial quality
@ -98,8 +99,9 @@ class ArtResizerFileSizeTest(CleanupModulesMixin, BeetsTestCase):
)
self.assertExists(im_b)
# Check high (initial) quality still gives a smaller filesize
self.assertLess(
os.stat(syspath(im_b)).st_size, os.stat(syspath(im_75_qual)).st_size
assert (
os.stat(syspath(im_b)).st_size
< os.stat(syspath(im_75_qual)).st_size
)
@unittest.skipUnless(PILBackend.available(), "PIL not available")

18
test/test_autotag.py
View file

@ -280,7 +280,7 @@ class DistanceTest(BeetsTestCase):
assert len(dist) == 2
assert list(dist) == [("album", 0.2), ("medium", 0.2)]
assert dist == 0.4
self.assertLess(dist, 1.0)
assert dist < 1.0
self.assertGreater(dist, 0.0)
assert dist - 0.4 == 0.0
assert 0.4 - dist == 0.0
@ -395,7 +395,7 @@ class AlbumDistanceTest(BeetsTestCase):
dist = self._dist(items, info)
assert dist != 0
# Make sure the distance is not too great
self.assertLess(dist, 0.2)
assert dist < 0.2
def test_global_artists_differ(self):
items = []
@ -990,17 +990,17 @@ class StringDistanceTest(unittest.TestCase):
def test_leading_the_has_lower_weight(self):
dist1 = string_dist("XXX Band Name", "Band Name")
dist2 = string_dist("The Band Name", "Band Name")
self.assertLess(dist2, dist1)
assert dist2 < dist1
def test_parens_have_lower_weight(self):
dist1 = string_dist("One .Two.", "One")
dist2 = string_dist("One (Two)", "One")
self.assertLess(dist2, dist1)
assert dist2 < dist1
def test_brackets_have_lower_weight(self):
dist1 = string_dist("One .Two.", "One")
dist2 = string_dist("One [Two]", "One")
self.assertLess(dist2, dist1)
assert dist2 < dist1
def test_ep_label_has_zero_weight(self):
dist = string_dist("My Song (EP)", "My Song")
@ -1009,7 +1009,7 @@ class StringDistanceTest(unittest.TestCase):
def test_featured_has_lower_weight(self):
dist1 = string_dist("My Song blah Someone", "My Song")
dist2 = string_dist("My Song feat Someone", "My Song")
self.assertLess(dist2, dist1)
assert dist2 < dist1
def test_postfix_the(self):
dist = string_dist("The Song Title", "Song Title, The")
@ -1055,9 +1055,9 @@ class EnumTest(BeetsTestCase):
OrderedEnumClass = match.OrderedEnum( # noqa
"OrderedEnumTest", ["a", "b", "c"]
)
self.assertLess(OrderedEnumClass.a, OrderedEnumClass.b)
self.assertLess(OrderedEnumClass.a, OrderedEnumClass.c)
self.assertLess(OrderedEnumClass.b, OrderedEnumClass.c)
assert OrderedEnumClass.a < OrderedEnumClass.b
assert OrderedEnumClass.a < OrderedEnumClass.c
assert OrderedEnumClass.b < OrderedEnumClass.c
self.assertGreater(OrderedEnumClass.b, OrderedEnumClass.a)
self.assertGreater(OrderedEnumClass.c, OrderedEnumClass.a)
self.assertGreater(OrderedEnumClass.c, OrderedEnumClass.b)

4
test/test_library.py
View file

@ -252,7 +252,7 @@ class DestinationTest(BeetsTestCase):
self.i.title = "X" * 300
self.i.artist = "Y" * 300
for c in self.i.destination().split(util.PATH_SEP):
self.assertLessEqual(len(c), 255)
assert len(c) <= 255
def test_destination_long_names_keep_extension(self):
self.i.title = "X" * 300
@ -1172,7 +1172,7 @@ class MtimeTest(BeetsTestCase):
def test_mtime_reset_on_db_modify(self):
self.i.title = "something else"
self.assertLess(self.i.mtime, self._mtime())
assert self.i.mtime < self._mtime()
def test_mtime_up_to_date_after_write(self):
self.i.title = "something else"

52
test/test_sort.py
View file

@ -107,7 +107,7 @@ class SortFixedFieldTest(DummyDataTestCase):
q = ""
sort = dbcore.query.FixedFieldSort("year", True)
results = self.lib.items(q, sort)
self.assertLessEqual(results[0]["year"], results[1]["year"])
assert results[0]["year"] <= results[1]["year"]
assert results[0]["year"] == 2001
# same thing with query string
q = "year+"
@ -135,11 +135,11 @@ class SortFixedFieldTest(DummyDataTestCase):
sort.add_sort(s1)
sort.add_sort(s2)
results = self.lib.items(q, sort)
self.assertLessEqual(results[0]["album"], results[1]["album"])
self.assertLessEqual(results[1]["album"], results[2]["album"])
assert results[0]["album"] <= results[1]["album"]
assert results[1]["album"] <= results[2]["album"]
assert results[0]["album"] == "Baz"
assert results[1]["album"] == "Baz"
self.assertLessEqual(results[0]["year"], results[1]["year"])
assert results[0]["year"] <= results[1]["year"]
# same thing with query string
q = "album+ year+"
results2 = self.lib.items(q)
@ -161,7 +161,7 @@ class SortFlexFieldTest(DummyDataTestCase):
q = ""
sort = dbcore.query.SlowFieldSort("flex1", True)
results = self.lib.items(q, sort)
self.assertLessEqual(results[0]["flex1"], results[1]["flex1"])
assert results[0]["flex1"] <= results[1]["flex1"]
assert results[0]["flex1"] == "Flex1-0"
# same thing with query string
q = "flex1+"
@ -195,7 +195,7 @@ class SortFlexFieldTest(DummyDataTestCase):
self.assertGreaterEqual(results[1]["flex2"], results[2]["flex2"])
assert results[0]["flex2"] == "Flex2-A"
assert results[1]["flex2"] == "Flex2-A"
self.assertLessEqual(results[0]["flex1"], results[1]["flex1"])
assert results[0]["flex1"] <= results[1]["flex1"]
# same thing with query string
q = "flex2- flex1+"
results2 = self.lib.items(q)
@ -208,7 +208,7 @@ class SortAlbumFixedFieldTest(DummyDataTestCase):
q = ""
sort = dbcore.query.FixedFieldSort("year", True)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["year"], results[1]["year"])
assert results[0]["year"] <= results[1]["year"]
assert results[0]["year"] == 2001
# same thing with query string
q = "year+"
@ -236,11 +236,11 @@ class SortAlbumFixedFieldTest(DummyDataTestCase):
sort.add_sort(s1)
sort.add_sort(s2)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["genre"], results[1]["genre"])
self.assertLessEqual(results[1]["genre"], results[2]["genre"])
assert results[0]["genre"] <= results[1]["genre"]
assert results[1]["genre"] <= results[2]["genre"]
assert results[1]["genre"] == "Rock"
assert results[2]["genre"] == "Rock"
self.assertLessEqual(results[1]["album"], results[2]["album"])
assert results[1]["album"] <= results[2]["album"]
# same thing with query string
q = "genre+ album+"
results2 = self.lib.albums(q)
@ -253,8 +253,8 @@ class SortAlbumFlexFieldTest(DummyDataTestCase):
q = ""
sort = dbcore.query.SlowFieldSort("flex1", True)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["flex1"], results[1]["flex1"])
self.assertLessEqual(results[1]["flex1"], results[2]["flex1"])
assert results[0]["flex1"] <= results[1]["flex1"]
assert results[1]["flex1"] <= results[2]["flex1"]
# same thing with query string
q = "flex1+"
results2 = self.lib.albums(q)
@ -281,11 +281,11 @@ class SortAlbumFlexFieldTest(DummyDataTestCase):
sort.add_sort(s1)
sort.add_sort(s2)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["flex2"], results[1]["flex2"])
self.assertLessEqual(results[1]["flex2"], results[2]["flex2"])
assert results[0]["flex2"] <= results[1]["flex2"]
assert results[1]["flex2"] <= results[2]["flex2"]
assert results[0]["flex2"] == "Flex2-A"
assert results[1]["flex2"] == "Flex2-A"
self.assertLessEqual(results[0]["flex1"], results[1]["flex1"])
assert results[0]["flex1"] <= results[1]["flex1"]
# same thing with query string
q = "flex2+ flex1+"
results2 = self.lib.albums(q)
@ -298,8 +298,8 @@ class SortAlbumComputedFieldTest(DummyDataTestCase):
q = ""
sort = dbcore.query.SlowFieldSort("path", True)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["path"], results[1]["path"])
self.assertLessEqual(results[1]["path"], results[2]["path"])
assert results[0]["path"] <= results[1]["path"]
assert results[1]["path"] <= results[2]["path"]
# same thing with query string
q = "path+"
results2 = self.lib.albums(q)
@ -328,8 +328,8 @@ class SortCombinedFieldTest(DummyDataTestCase):
sort.add_sort(s1)
sort.add_sort(s2)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["path"], results[1]["path"])
self.assertLessEqual(results[1]["path"], results[2]["path"])
assert results[0]["path"] <= results[1]["path"]
assert results[1]["path"] <= results[2]["path"]
q = "path+ year+"
results2 = self.lib.albums(q)
for r1, r2 in zip(results, results2):
@ -343,9 +343,9 @@ class SortCombinedFieldTest(DummyDataTestCase):
sort.add_sort(s1)
sort.add_sort(s2)
results = self.lib.albums(q, sort)
self.assertLessEqual(results[0]["year"], results[1]["year"])
self.assertLessEqual(results[1]["year"], results[2]["year"])
self.assertLessEqual(results[0]["path"], results[1]["path"])
assert results[0]["year"] <= results[1]["year"]
assert results[1]["year"] <= results[2]["year"]
assert results[0]["path"] <= results[1]["path"]
q = "year+ path+"
results2 = self.lib.albums(q)
for r1, r2 in zip(results, results2):
@ -355,7 +355,7 @@ class SortCombinedFieldTest(DummyDataTestCase):
class ConfigSortTest(DummyDataTestCase):
def test_default_sort_item(self):
results = list(self.lib.items())
self.assertLess(results[0].artist, results[1].artist)
assert results[0].artist < results[1].artist
def test_config_opposite_sort_item(self):
config["sort_item"] = "artist-"
@ -364,7 +364,7 @@ class ConfigSortTest(DummyDataTestCase):
def test_default_sort_album(self):
results = list(self.lib.albums())
self.assertLess(results[0].albumartist, results[1].albumartist)
assert results[0].albumartist < results[1].albumartist
def test_config_opposite_sort_album(self):
config["sort_album"] = "albumartist-"
@ -517,7 +517,9 @@ class NonExistingFieldTest(DummyDataTestCase):
If a string ends with a sorting suffix, it takes precedence over the
NotQuery parsing.
"""
query, sort = beets.library.parse_query_string("-bar+", beets.library.Item)
query, sort = beets.library.parse_query_string(
"-bar+", beets.library.Item
)
assert len(query.subqueries) == 1
assert isinstance(query.subqueries[0], dbcore.query.TrueQuery)
assert isinstance(sort, dbcore.query.SlowFieldSort)