Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-06 08:39:17 +01:00
Code Issues Projects Releases Wiki Activity

Replace assertGreater and assertGreaterEqual

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

2
test/plugins/test_random.py
View file

@ -76,4 +76,4 @@ class RandomTest(TestHelper, unittest.TestCase):
mean2, stdev2, median2 = experiment("track") mean2, stdev2, median2 = experiment("track")
self.assertAlmostEqual(0, median1, delta=1) self.assertAlmostEqual(0, median1, delta=1)
self.assertAlmostEqual(len(self.items) // 2, median2, delta=1) self.assertAlmostEqual(len(self.items) // 2, median2, delta=1)
self.assertGreater(stdev2, stdev1) assert stdev2 > stdev1

8
test/test_autotag.py
View file

@ -281,7 +281,7 @@ class DistanceTest(BeetsTestCase):
assert list(dist) == [("album", 0.2), ("medium", 0.2)] assert list(dist) == [("album", 0.2), ("medium", 0.2)]
assert dist == 0.4 assert dist == 0.4
assert dist < 1.0 assert dist < 1.0
self.assertGreater(dist, 0.0) assert dist > 0.0
assert dist - 0.4 == 0.0 assert dist - 0.4 == 0.0
assert 0.4 - dist == 0.0 assert 0.4 - dist == 0.0
assert float(dist) == 0.4 assert float(dist) == 0.4
@ -1058,6 +1058,6 @@ class EnumTest(BeetsTestCase):
assert OrderedEnumClass.a < OrderedEnumClass.b assert OrderedEnumClass.a < OrderedEnumClass.b
assert OrderedEnumClass.a < OrderedEnumClass.c assert OrderedEnumClass.a < OrderedEnumClass.c
assert OrderedEnumClass.b < OrderedEnumClass.c assert OrderedEnumClass.b < OrderedEnumClass.c
self.assertGreater(OrderedEnumClass.b, OrderedEnumClass.a) assert OrderedEnumClass.b > OrderedEnumClass.a
self.assertGreater(OrderedEnumClass.c, OrderedEnumClass.a) assert OrderedEnumClass.c > OrderedEnumClass.a
self.assertGreater(OrderedEnumClass.c, OrderedEnumClass.b) assert OrderedEnumClass.c > OrderedEnumClass.b

8
test/test_dbcore.py
View file

@ -244,7 +244,7 @@ class TransactionTest(unittest.TestCase):
"VALUES (?);".format(ModelFixture1._table), "VALUES (?);".format(ModelFixture1._table),
(111,), (111,),
) )
self.assertGreater(self.db.revision, old_rev) assert self.db.revision > old_rev
def test_query_no_increase_revision(self): def test_query_no_increase_revision(self):
old_rev = self.db.revision old_rev = self.db.revision
@ -280,14 +280,14 @@ class ModelTest(unittest.TestCase):
model.add(self.db) model.add(self.db)
model.store() model.store()
assert model._revision == self.db.revision assert model._revision == self.db.revision
self.assertGreater(self.db.revision, old_rev) assert self.db.revision > old_rev
mid_rev = self.db.revision mid_rev = self.db.revision
model2 = ModelFixture1() model2 = ModelFixture1()
model2.add(self.db) model2.add(self.db)
model2.store() model2.store()
self.assertGreater(model2._revision, mid_rev) assert model2._revision > mid_rev
self.assertGreater(self.db.revision, model._revision) assert self.db.revision > model._revision
# revision changed, so the model should be re-loaded # revision changed, so the model should be re-loaded
model.load() model.load()

12
test/test_library.py
View file

@ -1168,7 +1168,7 @@ class MtimeTest(BeetsTestCase):
return int(os.path.getmtime(self.ipath)) return int(os.path.getmtime(self.ipath))
def test_mtime_initially_up_to_date(self): def test_mtime_initially_up_to_date(self):
self.assertGreaterEqual(self.i.mtime, self._mtime()) assert self.i.mtime >= self._mtime()
def test_mtime_reset_on_db_modify(self): def test_mtime_reset_on_db_modify(self):
self.i.title = "something else" self.i.title = "something else"
@ -1177,24 +1177,24 @@ class MtimeTest(BeetsTestCase):
def test_mtime_up_to_date_after_write(self): def test_mtime_up_to_date_after_write(self):
self.i.title = "something else" self.i.title = "something else"
self.i.write() self.i.write()
self.assertGreaterEqual(self.i.mtime, self._mtime()) assert self.i.mtime >= self._mtime()
def test_mtime_up_to_date_after_read(self): def test_mtime_up_to_date_after_read(self):
self.i.title = "something else" self.i.title = "something else"
self.i.read() self.i.read()
self.assertGreaterEqual(self.i.mtime, self._mtime()) assert self.i.mtime >= self._mtime()
class ImportTimeTest(BeetsTestCase): class ImportTimeTest(BeetsTestCase):
def added(self): def added(self):
self.track = item() self.track = item()
self.album = self.lib.add_album((self.track,)) self.album = self.lib.add_album((self.track,))
self.assertGreater(self.album.added, 0) assert self.album.added > 0
self.assertGreater(self.track.added, 0) assert self.track.added > 0
def test_atime_for_singleton(self): def test_atime_for_singleton(self):
self.singleton = item(self.lib) self.singleton = item(self.lib)
self.assertGreater(self.singleton.added, 0) assert self.singleton.added > 0
class TemplateTest(ItemInDBTestCase): class TemplateTest(ItemInDBTestCase):

26
test/test_sort.py
View file

@ -119,7 +119,7 @@ class SortFixedFieldTest(DummyDataTestCase):
q = "" q = ""
sort = dbcore.query.FixedFieldSort("year", False) sort = dbcore.query.FixedFieldSort("year", False)
results = self.lib.items(q, sort) results = self.lib.items(q, sort)
self.assertGreaterEqual(results[0]["year"], results[1]["year"]) assert results[0]["year"] >= results[1]["year"]
assert results[0]["year"] == 2004 assert results[0]["year"] == 2004
# same thing with query string # same thing with query string
q = "year-" q = "year-"
@ -173,9 +173,9 @@ class SortFlexFieldTest(DummyDataTestCase):
q = "" q = ""
sort = dbcore.query.SlowFieldSort("flex1", False) sort = dbcore.query.SlowFieldSort("flex1", False)
results = self.lib.items(q, sort) results = self.lib.items(q, sort)
self.assertGreaterEqual(results[0]["flex1"], results[1]["flex1"]) assert results[0]["flex1"] >= results[1]["flex1"]
self.assertGreaterEqual(results[1]["flex1"], results[2]["flex1"]) assert results[1]["flex1"] >= results[2]["flex1"]
self.assertGreaterEqual(results[2]["flex1"], results[3]["flex1"]) assert results[2]["flex1"] >= results[3]["flex1"]
assert results[0]["flex1"] == "Flex1-2" assert results[0]["flex1"] == "Flex1-2"
# same thing with query string # same thing with query string
q = "flex1-" q = "flex1-"
@ -191,8 +191,8 @@ class SortFlexFieldTest(DummyDataTestCase):
sort.add_sort(s1) sort.add_sort(s1)
sort.add_sort(s2) sort.add_sort(s2)
results = self.lib.items(q, sort) results = self.lib.items(q, sort)
self.assertGreaterEqual(results[0]["flex2"], results[1]["flex2"]) assert results[0]["flex2"] >= results[1]["flex2"]
self.assertGreaterEqual(results[1]["flex2"], results[2]["flex2"]) assert results[1]["flex2"] >= results[2]["flex2"]
assert results[0]["flex2"] == "Flex2-A" assert results[0]["flex2"] == "Flex2-A"
assert results[1]["flex2"] == "Flex2-A" assert results[1]["flex2"] == "Flex2-A"
assert results[0]["flex1"] <= results[1]["flex1"] assert results[0]["flex1"] <= results[1]["flex1"]
@ -220,7 +220,7 @@ class SortAlbumFixedFieldTest(DummyDataTestCase):
q = "" q = ""
sort = dbcore.query.FixedFieldSort("year", False) sort = dbcore.query.FixedFieldSort("year", False)
results = self.lib.albums(q, sort) results = self.lib.albums(q, sort)
self.assertGreaterEqual(results[0]["year"], results[1]["year"]) assert results[0]["year"] >= results[1]["year"]
assert results[0]["year"] == 2005 assert results[0]["year"] == 2005
# same thing with query string # same thing with query string
q = "year-" q = "year-"
@ -265,8 +265,8 @@ class SortAlbumFlexFieldTest(DummyDataTestCase):
q = "" q = ""
sort = dbcore.query.SlowFieldSort("flex1", False) sort = dbcore.query.SlowFieldSort("flex1", False)
results = self.lib.albums(q, sort) results = self.lib.albums(q, sort)
self.assertGreaterEqual(results[0]["flex1"], results[1]["flex1"]) assert results[0]["flex1"] >= results[1]["flex1"]
self.assertGreaterEqual(results[1]["flex1"], results[2]["flex1"]) assert results[1]["flex1"] >= results[2]["flex1"]
# same thing with query string # same thing with query string
q = "flex1-" q = "flex1-"
results2 = self.lib.albums(q) results2 = self.lib.albums(q)
@ -310,8 +310,8 @@ class SortAlbumComputedFieldTest(DummyDataTestCase):
q = "" q = ""
sort = dbcore.query.SlowFieldSort("path", False) sort = dbcore.query.SlowFieldSort("path", False)
results = self.lib.albums(q, sort) results = self.lib.albums(q, sort)
self.assertGreaterEqual(results[0]["path"], results[1]["path"]) assert results[0]["path"] >= results[1]["path"]
self.assertGreaterEqual(results[1]["path"], results[2]["path"]) assert results[1]["path"] >= results[2]["path"]
# same thing with query string # same thing with query string
q = "path-" q = "path-"
results2 = self.lib.albums(q) results2 = self.lib.albums(q)
@ -360,7 +360,7 @@ class ConfigSortTest(DummyDataTestCase):
def test_config_opposite_sort_item(self): def test_config_opposite_sort_item(self):
config["sort_item"] = "artist-" config["sort_item"] = "artist-"
results = list(self.lib.items()) results = list(self.lib.items())
self.assertGreater(results[0].artist, results[1].artist) assert results[0].artist > results[1].artist
def test_default_sort_album(self): def test_default_sort_album(self):
results = list(self.lib.albums()) results = list(self.lib.albums())
@ -369,7 +369,7 @@ class ConfigSortTest(DummyDataTestCase):
def test_config_opposite_sort_album(self): def test_config_opposite_sort_album(self):
config["sort_album"] = "albumartist-" config["sort_album"] = "albumartist-"
results = list(self.lib.albums()) results = list(self.lib.albums())
self.assertGreater(results[0].albumartist, results[1].albumartist) assert results[0].albumartist > results[1].albumartist
class CaseSensitivityTest(DummyDataTestCase, BeetsTestCase): class CaseSensitivityTest(DummyDataTestCase, BeetsTestCase):

2
test/test_ui.py
View file

@ -74,7 +74,7 @@ class ListTest(BeetsTestCase):
def test_list_album_outputs_something(self): def test_list_album_outputs_something(self):
stdout = self._run_list(album=True) stdout = self._run_list(album=True)
self.assertGreater(len(stdout.getvalue()), 0) assert len(stdout.getvalue()) > 0
def test_list_album_path(self): def test_list_album_path(self):
stdout = self._run_list(album=True, fmt="$path") stdout = self._run_list(album=True, fmt="$path")