Use fixtures for simple unittest setup

Author: Lotram

tests/config/test_load.py

@@ -4,7 +4,6 @@
 from pathlib import Path
 import sys
 import textwrap
-from unittest import TestCase
 
 if sys.version_info >= (3, 11):
     import tomllib
@@ -108,24 +107,22 @@ def test_BUGWARRIORRC_empty(self):
         assert load.get_config_path() == rc
 
 
-class TestBugwarriorConfigParser(TestCase):
-    def setUp(self):
-        self.config = load.BugwarriorConfigParser()
-        self.config['general'] = {
-            'someint': '4',
-            'somenone': '',
-            'somechar': 'somestring',
-        }
+class TestBugwarriorConfigParser:
+    @pytest.fixture
+    def config(self):
+        config = load.BugwarriorConfigParser()
+        config['general'] = {'someint': '4', 'somenone': '', 'somechar': 'somestring'}
+        return config
 
-    def test_getint(self):
-        assert self.config.getint('general', 'someint') == 4
+    def test_getint(self, config):
+        assert config.getint('general', 'someint') == 4
 
-    def test_getint_none(self):
-        assert self.config.getint('general', 'somenone') is None
+    def test_getint_none(self, config):
+        assert config.getint('general', 'somenone') is None
 
-    def test_getint_valueerror(self):
+    def test_getint_valueerror(self, config):
         with pytest.raises(ValueError):
-            self.config.getint('general', 'somechar')
+            config.getint('general', 'somechar')
 
 
 class TestParseFile(LoadTest):

tests/config/test_schema.py

@@ -35,9 +35,8 @@ def tearDown(self):
         os.chdir(self.dir)
 
 
-class TestConfigList(unittest.TestCase):
-    def setUp(self):
-        self.adapter = TypeAdapter(schema.ConfigList)
+class TestConfigList:
+    adapter = TypeAdapter(schema.ConfigList)
 
     def test_configlist(self):
         assert self.adapter.validate_python('project_bar,project_baz') == [
@@ -102,9 +101,8 @@ def test_no_taskrc_file_found(self):
             self.validate()
 
 
-class TestUnsupportedOption(unittest.TestCase):
-    def setUp(self):
-        self.adapter = TypeAdapter(schema.UnsupportedOption[str])
+class TestUnsupportedOption:
+    adapter = TypeAdapter(schema.UnsupportedOption[str])
 
     def test_unsupportedoption_falsey(self):
         assert self.adapter.validate_python('') == ''

tests/services/test_clickup.py

@@ -1,5 +1,4 @@
 from datetime import datetime, timezone
-from unittest import TestCase
 
 import responses
 
@@ -123,12 +122,7 @@ def get_task(self):
         return self.get_task_contents()[0]
 
 
-class TestClickupClient(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.client = ClickupClient('XXXXXX')
-        self.data = TestData()
-
+class TestClickupClient:
     def test_init(self):
         http_client = ClickupClient('12345')
         assert (
@@ -138,16 +132,18 @@ def test_init(self):
 
     @responses.activate
     def test_get_repo(self):
+        client = ClickupClient('XXXXXX')
+        data = TestData()
         responses.get(
             "https://api.clickup.com/api/v2/team/1234/task?include_closed=false&page=0",
-            json=self.data.get_page(0),
+            json=data.get_page(0),
         )
         responses.get(
             "https://api.clickup.com/api/v2/team/1234/task?include_closed=false&page=1",
-            json=self.data.get_page(1),
+            json=data.get_page(1),
         )
-        result = [item for item in self.client.get_tasks_for_team(team_id=1234)]
-        assert self.data.get_task_contents() == result
+        result = [item for item in client.get_tasks_for_team(team_id=1234)]
+        assert data.get_task_contents() == result
 
 
 class TestClickupService(ConfigTest):

tests/test_command.py

@@ -2,7 +2,7 @@
 import os
 import pathlib
 import typing
-from unittest import TestCase, mock
+from unittest import mock
 
 from click.testing import CliRunner
 
@@ -242,19 +242,15 @@ def test_legacy_cli(self):
         assert 'Closing 0 tasks' in logs
 
 
-class TestIni2Toml(TestCase):
-    def setUp(self):
-        super().setUp()
-        self.runner = CliRunner()
-
+class TestIni2Toml:
     def test_bugwarriorrc(self):
         basedir = pathlib.Path(__file__).parent
-        result = self.runner.invoke(
+        runner = CliRunner()
+        result = runner.invoke(
             command.cli, args=('ini2toml', str(basedir / 'config/example-bugwarriorrc'))
         )
 
         assert result.exit_code == 0
 
-        self.maxDiff = None
         with open(basedir / 'config/example-bugwarrior.toml', 'r') as f:
             assert result.stdout == f.read()