Move tests to root package directory

Makefile

@@ -1,9 +1,10 @@
+.PHONY: check publish test ruff fix mypy black deadcode
+
 ifndef VERBOSE
   MAKEFLAGS += --no-print-directory
 endif
 
-check: venv
-	cd deadcode && make check
+check: test ruff mypy black deadcode
 
 venv:
 	python3.8 -m venv venv
@@ -15,3 +16,21 @@ publish: venv
 	rm -fr dist/*
 	venv/bin/hatch build
 	venv/bin/hatch publish
+
+test: venv
+	venv/bin/pytest -vv $(PYTEST_ME_PLEASE)
+
+ruff: venv
+	venv/bin/ruff check deadcode tests
+
+fix: venv
+	venv/bin/ruff deadcode tests --fix
+
+mypy: venv
+	venv/bin/mypy deadcode
+
+black: venv
+	venv/bin/black deadcode tests
+
+deadcode: venv
+	venv/bin/deadcode deadcode tests -v

deadcode/tests/base.py → deadcode/utils/base_test_case.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Dict, List, Union
+from typing import Any, Dict, List, Optional, Union
 from unittest import TestCase
 from unittest.mock import MagicMock, patch
 
@@ -17,24 +17,24 @@ def patch(self, path: str) -> MagicMock:
         self.addCleanup(patcher.stop)
         return patcher.start()
 
-    def _get_filenames(self, *args, **kwargs) -> List[str]:
+    def _get_filenames(self, *args: Any, **kwargs: Any) -> List[str]:
         return list(self.files.keys())
 
-    def _read_file_side_effect(self, filename: Union[str, Path], *args, **kwargs) -> MagicMock:
+    def _read_file_side_effect(self, filename: Union[str, Path], *args: Any, **kwargs: Any) -> MagicMock:
         mock = MagicMock()
         mock.filename = str(filename)
 
-        def cache_file_content(file_content: str):
+        def cache_file_content(file_content: str) -> int:
             self.updated_files[mock.filename] = file_content
             return len(file_content)
 
-        file_content = fix_indent(self.files[mock.filename])
-        mock.__enter__().read.return_value = file_content
-        mock.__enter__().readlines.return_value = [f"{line}\n" for line in file_content.split("\n")]
-        mock.__enter__().write.side_effect = cache_file_content
+        if file_content := fix_indent(self.files[mock.filename]):
+            mock.__enter__().read.return_value = file_content
+            mock.__enter__().readlines.return_value = [f"{line}\n" for line in file_content.split("\n")]
+            mock.__enter__().write.side_effect = cache_file_content
         return mock
 
-    def setUp(self):
+    def setUp(self) -> None:
         self.updated_files: Dict[str, str] = {}
 
         self.find_python_filenames_mock = self.patch("deadcode.cli.find_python_filenames")
@@ -50,7 +50,7 @@ def setUp(self):
 
         self.args = Args()
 
-    def assertFiles(self, files: Dict[str, str], removed: List[str] = None):
+    def assertFiles(self, files: Dict[str, str], removed: Optional[List[str]] = None) -> None:
         expected_removed_files = removed
         expected_files = files
 
@@ -73,10 +73,10 @@ def assertFiles(self, files: Dict[str, str], removed: List[str] = None):
         for filename, content in expected_files.items():
             self.assertEqual(
                 fix_indent(content),
-                fix_indent(self.updated_files.get(filename, unchanged_files.get(filename)) or ""),
+                fix_indent(self.updated_files.get(filename) or unchanged_files.get(filename) or ""),
             )
 
-    def assertUpdatedFiles(self, expected_updated_files: Dict[str, str]):
+    def assertUpdatedFiles(self, expected_updated_files: Dict[str, str]) -> None:
         """Checks if updated files match expected updated files."""
 
         self.assertListEqual(list(expected_updated_files.keys()), list(self.updated_files.keys()))

pyproject.toml

@@ -81,6 +81,9 @@ ignore_names = [
     "show",
     "visit_*",
 ]
+ignore_names_in_files = [
+    "deadcode/utils/base_test_case.py"
+]
 
 exclude = ["tests"]
 

deadcode/tests/actions/test_find_python_filenames.py → tests/actions/test_find_python_filenames.py

@@ -1,32 +1,32 @@
 from deadcode.actions.find_python_filenames import find_python_filenames
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestFindPythonFilenames(BaseTestCase):
     def test_file_detection(self):
-        self.args.paths = ["./cli.py"]
+        self.args.paths = ["deadcode/cli.py"]
         filenames = find_python_filenames(args=self.args)
-        self.assertListEqual(filenames, ["cli.py"])
+        self.assertListEqual(filenames, ["deadcode/cli.py"])
 
     def test_exclude_directories(self):
-        self.args.paths = ["."]
+        self.args.paths = ["deadcode/."]
         filenames = find_python_filenames(args=self.args)
-        self.assertTrue(any(f.startswith("tests") for f in filenames))
-        self.assertTrue(any(f.startswith("utils") for f in filenames))
+        self.assertTrue(any(f.startswith("deadcode/cli.py") for f in filenames))
+        self.assertTrue(any(f.startswith("deadcode/utils") for f in filenames))
 
-        self.args.exclude = ["tests", "utils"]
+        self.args.exclude = ["deadcode/utils", "deadcode/cli.py"]
         filenames = find_python_filenames(args=self.args)
-        self.assertFalse(any(f.startswith("tests") for f in filenames))
-        self.assertFalse(any(f.startswith("utils") for f in filenames))
+        self.assertFalse(any(f.startswith("deadcode/cli.py") for f in filenames))
+        self.assertFalse(any(f.startswith("deadcode/utils") for f in filenames))
 
     def test_exclude_files(self):
-        self.args.paths = ["."]
+        self.args.paths = ["deadcode"]
         filenames = find_python_filenames(args=self.args)
-        self.assertTrue("cli.py" in filenames)
+        self.assertTrue("deadcode/cli.py" in filenames)
 
-        self.args.exclude = ["cli.py"]
+        self.args.exclude = ["deadcode/cli.py"]
         filenames = find_python_filenames(args=self.args)
-        self.assertFalse("cli.py" in filenames)
+        self.assertFalse("deadcode/cli.py" in filenames)
 
     def test_provided_path_does_not_exist(self):
         self.args.paths = ["path_does_not_exist"]

deadcode/tests/actions/test_merge_overlaping_file_parts.py → tests/actions/test_merge_overlaping_file_parts.py

@@ -1,5 +1,5 @@
 from deadcode.actions.merge_overlaping_file_parts import merge_overlaping_file_parts, does_overlap, merge_parts
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestMergeOverlapingFileParts(BaseTestCase):

deadcode/tests/cli_args/test_dry.py → tests/cli_args/test_dry.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 from deadcode.utils.fix_indent import fix_indent
 
 

tests/cli_args/test_exclude.py

@@ -0,0 +1,24 @@
+from deadcode.utils.base_test_case import BaseTestCase
+from deadcode.actions.find_python_filenames import find_python_filenames
+
+
+class TestExcludeCliArgUnit(BaseTestCase):
+    def test_exclude_directories(self):
+        self.args.paths = ["deadcode/."]
+        filenames = find_python_filenames(args=self.args)
+        self.assertTrue(any(f.startswith("deadcode/cli.py") for f in filenames))
+        self.assertTrue(any(f.startswith("deadcode/utils") for f in filenames))
+
+        self.args.exclude = ["deadcode/utils", "deadcode/cli.py"]
+        filenames = find_python_filenames(args=self.args)
+        self.assertFalse(any(f.startswith("deadcode/cli.py") for f in filenames))
+        self.assertFalse(any(f.startswith("deadcode/utils") for f in filenames))
+
+    def test_exclude_files(self):
+        self.args.paths = ["deadcode/."]
+        filenames = find_python_filenames(args=self.args)
+        self.assertTrue("deadcode/cli.py" in filenames)
+
+        self.args.exclude = ["deadcode/cli.py"]
+        filenames = find_python_filenames(args=self.args)
+        self.assertFalse("deadcode/cli.py" in filenames)

deadcode/tests/cli_args/test_fix.py → tests/cli_args/test_fix.py

@@ -1,7 +1,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestFixCliOption(BaseTestCase):

deadcode/tests/cli_args/test_ignore_bodies_if_inherits_from.py → tests/cli_args/test_ignore_bodies_if_inherits_from.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestIgnoreDefinitionIfInheritsFrom(BaseTestCase):

deadcode/tests/cli_args/test_ignore_definitions.py → tests/cli_args/test_ignore_definitions.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestIgnoreDefinitionsByPattern(BaseTestCase):

deadcode/tests/cli_args/test_ignore_definitions_if_inherits_from.py → tests/cli_args/test_ignore_definitions_if_inherits_from.py

@@ -1,7 +1,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestIgnoreDefinitionIfInheritsFrom(BaseTestCase):

deadcode/tests/cli_args/test_ignore_names.py → tests/cli_args/test_ignore_names.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class IgnoreNamesByPatternTests(BaseTestCase):

deadcode/tests/cli_args/test_parsing.py → tests/cli_args/test_parsing.py

@@ -3,7 +3,7 @@
 """
 
 from deadcode.actions.parse_arguments import parse_arguments
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class CommandLineArgParsingTests(BaseTestCase):

deadcode/tests/fix/test_assign.py → tests/fix/test_assign.py

@@ -5,7 +5,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestAssignmentExpressionRemoval(BaseTestCase):

deadcode/tests/fix/test_class_def.py → tests/fix/test_class_def.py

@@ -4,7 +4,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestClassDefRemoval(BaseTestCase):

deadcode/tests/fix/test_empty_files.py → tests/fix/test_empty_files.py

@@ -3,7 +3,7 @@
 """
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestAssignmentExpressionRemoval(BaseTestCase):

deadcode/tests/fix/test_method_def.py → tests/fix/test_method_def.py

@@ -3,7 +3,7 @@
 """
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestUnusedMethodRemoval(BaseTestCase):

deadcode/tests/fix/test_scope.py → tests/fix/test_scope.py

@@ -4,7 +4,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 @skip

deadcode/tests/fix/test_unreachable_code.py → tests/fix/test_unreachable_code.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestUnreachableCodeIsNotRemoved(BaseTestCase):

deadcode/tests/nested_scope/test_nested_scope.py → tests/nested_scope/test_nested_scope.py

@@ -1,7 +1,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestScopeTracking(BaseTestCase):

deadcode/tests/noqa/test_noqa_comments.py → tests/noqa/test_noqa_comments.py

@@ -1,7 +1,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestNoqaComments(BaseTestCase):

deadcode/tests/test_accurate_usage_detection.py → tests/test_accurate_usage_detection.py

@@ -1,7 +1,7 @@
 from unittest import skip
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 @skip

deadcode/tests/test_deadcode.py → tests/test_deadcode.py

@@ -1,7 +1,7 @@
 from unittest import TestCase
 
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class DeadCodeIntegrationTests(TestCase):

deadcode/tests/test_imports.py → tests/test_imports.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class RelativeImportTests(BaseTestCase):

deadcode/tests/test_line_number_detection.py → tests/test_line_number_detection.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class DetectLineNumbersOfExpressionsTests(BaseTestCase):

deadcode/tests/test_output.py → tests/test_output.py

@@ -1,5 +1,5 @@
 from deadcode.cli import main
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class TestCountOptionOutput(BaseTestCase):

deadcode/tests/test_variable_parsing_from_ast_dump.py → tests/test_variable_parsing_from_ast_dump.py

@@ -5,7 +5,7 @@
     - tests for parsing variable usage from abstract syntax tree.
 """
 
-from deadcode.tests.base import BaseTestCase
+from deadcode.utils.base_test_case import BaseTestCase
 
 
 class VariableParsingTests(BaseTestCase):