diff --git a/scanner/test_metadata.py b/scanner/test_metadata.py index 8a167a3..32decb5 100644 --- a/scanner/test_metadata.py +++ b/scanner/test_metadata.py @@ -10,12 +10,12 @@ track_02 = test_tracks / "02 - Test {Disc 2}.ogg" text_txt = test_tracks / "text.txt" class TestMetadata(unittest.TestCase): - def test_metadata_init(self): + def test_init(self): mdf = scanner.metadata.Metadata(track_01) self.assertEqual(mdf.path, track_01) self.assertIsNone(mdf.file) - def test_metadata_track_01(self): + def test_track_01(self): with scanner.metadata.Metadata(track_01) as mdf: self.assertEqual(mdf.album(), "Test Album") self.assertEqual(mdf.artist(), "Test Artist") @@ -30,7 +30,7 @@ class TestMetadata(unittest.TestCase): self.assertEqual(mdf.tracknumber(), 1) self.assertEqual(mdf.year(), 2019) - def test_metadata_track_02(self): + def test_track_02(self): with scanner.metadata.Metadata(track_02) as mdf: self.assertEqual(mdf.artist(), "Test Album Artist") self.assertEqual(mdf.artistsort(), "Album Artist, Test") @@ -39,6 +39,6 @@ class TestMetadata(unittest.TestCase): self.assertEqual(mdf.release(), datetime.date(2019, 1, 1)) self.assertEqual(mdf.year(), 2019) - def test_metadata_text_txt(self): + def test_text_txt(self): with scanner.metadata.Metadata(text_txt) as mdf: mdf.artist() diff --git a/scanner/test_queue.py b/scanner/test_queue.py index dd9e217..798b919 100644 --- a/scanner/test_queue.py +++ b/scanner/test_queue.py @@ -10,7 +10,7 @@ class FakeTask(task.Task): self.res = res def run_task(self): return self.res -class TestScannerTaskQueue(unittest.TestCase): +class TestTaskQueue(unittest.TestCase): def setUp(self): self.idle_start = None @@ -23,7 +23,7 @@ class TestScannerTaskQueue(unittest.TestCase): def on_tasks_finished(self, queue): self.tasks_finished = True - def test_scanner_queue_init(self): + def test_init(self): q = queue.TaskQueue() self.assertIsInstance(q, GObject.GObject) @@ -32,7 +32,7 @@ class TestScannerTaskQueue(unittest.TestCase): self.assertEqual(q.idleid, None) self.assertEqual(q.progress, 0) - def test_scanner_queue_push(self): + def test_push(self): q = queue.TaskQueue() fake = FakeTask() q.connect("task-pushed", self.on_task_pushed) @@ -42,7 +42,7 @@ class TestScannerTaskQueue(unittest.TestCase): self.assertIsNotNone(q.idleid) self.assertEqual(self.pushed_task, fake) - def test_scanner_queue_run(self): + def test_run(self): q = queue.TaskQueue() fake3 = FakeTask() fake2 = FakeTask() diff --git a/scanner/test_scanner.py b/scanner/test_scanner.py index c2b7920..fd91b30 100644 --- a/scanner/test_scanner.py +++ b/scanner/test_scanner.py @@ -12,26 +12,26 @@ class TestScanner(unittest.TestCase): def tearDown(self): scanner.Queue.tasks_finished() - def test_scanner_init(self): + def test_init(self): self.assertIsInstance(scanner.Queue, scanner.queue.TaskQueue) - def test_scanner_update_library(self): + def test_update_library(self): lib = db.library.Table.find(test_album) scanner.update_library(lib) self.assertIsInstance(scanner.Queue.tasks[0], scanner.task.CheckSchedulerTask) - def test_scanner_remove_library(self): + def test_remove_library(self): lib = db.library.Table.find(test_album) scanner.remove_library(lib) self.assertIsInstance(scanner.Queue.tasks[0], scanner.task.RemoveLibrarySchedulerTask) - def test_scanner_commit(self): + def test_commit(self): scanner.commit() self.assertIsInstance(scanner.Queue.tasks[0], scanner.task.CommitTask) - def test_scanner_widgets(self): + def test_widgets(self): lib = db.library.Table.find(test_album) self.assertIsInstance(scanner.ProgressBar(), diff --git a/scanner/test_task.py b/scanner/test_task.py index 16ee9e0..6a19e23 100644 --- a/scanner/test_task.py +++ b/scanner/test_task.py @@ -10,7 +10,7 @@ test_tracks = pathlib.Path("./data/Test Album") test_track01 = test_tracks / "01 - Test Track.ogg" class TestScannerTask(unittest.TestCase): - def test_scanner_task_init(self): + def test_task(self): t = task.Task() self.assertIsInstance(t, GObject.GObject) with self.assertRaises(NotImplementedError): @@ -18,7 +18,7 @@ class TestScannerTask(unittest.TestCase): class TestScannerCommitTask(unittest.TestCase): - def test_scanner_commit_task(self): + def test_task(self): ct = task.CommitTask() self.assertIsInstance(ct, task.Task) self.assertEqual(ct.run_task(), None) @@ -28,7 +28,7 @@ class TestScannerFileTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_file_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) ft = task.FileTask(lib, test_track01) @@ -69,7 +69,7 @@ class TestScannerDirectoryTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_directory_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) dt = task.DirectoryTask(lib, test_tracks) @@ -94,7 +94,7 @@ class TestScannerCheckTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_check_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) for i in [ 1, 2, 3 ]: db.make_fake_track(i, i, f"Test Track {i}", f"{lib.path}/{i}.ogg", lib.path) @@ -117,7 +117,7 @@ class TestScannerCheckSchedulerTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_check_scheduler_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) track = db.make_fake_track(1, 1, "Test Album Track", str(test_track01), str(test_tracks)) @@ -147,7 +147,7 @@ class TestScannerRemoveTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_remove_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) for i in [ 1, 2, 3, 4, 5 ]: db.make_fake_track(i, i, f"Test Track {i}", f"{lib.path}/{i}.ogg", lib.path) @@ -166,7 +166,7 @@ class TestScannerRemoveLibraryTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_remove_library_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) rlt = task.RemoveLibraryTask(lib) @@ -181,7 +181,7 @@ class TestScannerRemoveLibrarySchedulerTask(unittest.TestCase): def setUp(self): db.reset() - def test_scanner_check_scheduler_task(self): + def test_task(self): lib = db.library.Table.find(test_tracks) for i in range(75): db.make_fake_track(i, i, f"Test Track {i}",f"/a/b/c/{i}.ogg", lib.path) diff --git a/scanner/test_widgets.py b/scanner/test_widgets.py index d87cf5f..dc2a731 100644 --- a/scanner/test_widgets.py +++ b/scanner/test_widgets.py @@ -18,7 +18,7 @@ class FakeTask(task.Task): def run_task(self): return None class TestScannerProgressBar(unittest.TestCase): - def test_progress_bar(self): + def test_init(self): q = queue.TaskQueue() pb = widgets.ProgressBar(q) @@ -39,7 +39,7 @@ class TestScannerProgressBar(unittest.TestCase): class DirectoryChooserWidget(unittest.TestCase): - def test_directory_chooser_widget(self): + def test_init(self): dcw = widgets.DirectoryChooserWidget() self.assertIsInstance(dcw, Gtk.FileChooserWidget) @@ -61,7 +61,7 @@ class DirectoryChooserWidget(unittest.TestCase): class DirectoryChooserPopover(unittest.TestCase): - def test_directory_chooser_popover(self): + def test_init(self): db.reset() q = queue.TaskQueue() dcp = widgets.DirectoryChooserPopover(q) @@ -97,7 +97,7 @@ class DirectoryChooserPopover(unittest.TestCase): class TestScannerAddFolderButton(unittest.TestCase): - def test_add_folder_button(self): + def test_init(self): q = queue.TaskQueue() afb = widgets.AddFolderButton(q) @@ -110,7 +110,7 @@ class TestScannerAddFolderButton(unittest.TestCase): class TestScannerUpdateButton(unittest.TestCase): - def test_update_button(self): + def test_init(self): lib = db.library.Table.find("/a/b/c") q = queue.TaskQueue() ub = widgets.UpdateButton(lib, q) @@ -130,7 +130,7 @@ class TestScannerUpdateButton(unittest.TestCase): class TestScannerUpdateAllButton(unittest.TestCase): - def test_update_all_button(self): + def test_init(self): db.reset() lib1 = db.library.Table.find("/a/b/c") lib2 = db.library.Table.find("/d/e/f") @@ -153,7 +153,7 @@ class TestScannerUpdateAllButton(unittest.TestCase): class TestScannerRemoveButton(unittest.TestCase): - def test_remove_button(self): + def test_init(self): lib = db.library.Table.find("/a/b/c") q = queue.TaskQueue() rb = widgets.RemoveButton(lib, q)