refactor case dicovery logic

Author: elazarg

mypy/test/data.py

@@ -9,17 +9,18 @@
 
 import pytest  # type: ignore  # no pytest in typeshed
 from typing import List, Tuple, Set, Optional, Iterator, Any, Dict
+import typing
 
 from mypy.myunit import ProtoTestCase
-
+from mypy.test.config import test_data_prefix
 
 root_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
 
 
 def parse_test_cases(
         path: str,
         base_path: str = '.',
-        optional_out: bool = False, *,
+        optional_out: bool = False,
         native_sep: bool = False) -> List['DataDrivenTestCase']:
     """Parse a file with test case descriptions.
 
@@ -495,13 +496,20 @@ def pytest_addoption(parser: Any) -> None:
 def pytest_pycollect_makeitem(collector: Any, name: str, obj: Any) -> Any:
     if not isinstance(obj, type) or not issubclass(obj, DataSuite):
         return None
+    if obj is DataSuite:
+        return None
     return MypyDataSuite(name, parent=collector)
 
 
 class MypyDataSuite(pytest.Class):  # type: ignore  # inheriting from Any
     def collect(self) -> Iterator['MypyDataCase']:
-        for case in self.obj.cases():
-            yield MypyDataCase(case.name, self, case)
+        cls = self.obj
+        for f in cls.files:
+            for case in parse_test_cases(os.path.join(test_data_prefix, f),
+                                         base_path=cls.base_path,
+                                         optional_out=cls.optional_out,
+                                         native_sep=cls.native_sep):
+                yield MypyDataCase(case.name, self, case)
 
 
 class MypyDataCase(pytest.Item):  # type: ignore  # inheriting from Any
@@ -544,12 +552,13 @@ def repr_failure(self, excinfo: Any) -> str:
 
 
 class DataSuite:
+    files = None  # type: typing.ClassVar[List[str]]
+    base_path = '.'  # type: typing.ClassVar[str]
+    optional_out = False  # type: typing.ClassVar[bool]
+    native_sep = False  # type: typing.ClassVar[bool]
+
     def __init__(self, *, update_data: bool) -> None:
         self.update_data = update_data
 
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        return []
-
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         raise NotImplementedError

mypy/test/testcheck.py

@@ -3,18 +3,16 @@
 import os
 import re
 import shutil
-import sys
-import time
-import typed_ast
 
 from typing import Dict, List, Optional, Set, Tuple
+import typing
 
 from mypy import build, defaults
 from mypy.main import process_options
 from mypy.build import BuildSource, find_module_clear_caches
 from mypy.myunit import AssertionFailure
-from mypy.test.config import test_temp_dir, test_data_prefix
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
+from mypy.test.config import test_temp_dir
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import (
     assert_string_arrays_equal, normalize_error_messages,
     retry_on_error, testcase_pyversion, update_testcase_output,
@@ -25,7 +23,7 @@
 from mypy import experiments
 
 # List of files that contain test case descriptions.
-files = [
+typecheck_files = [
     'check-basic.test',
     'check-callable.test',
     'check-classes.test',
@@ -83,14 +81,9 @@
 
 
 class TypeCheckSuite(DataSuite):
-
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  test_temp_dir, True)
-        return c
+    files = typecheck_files  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         incremental = ('incremental' in testcase.name.lower()

mypy/test/testcmdline.py

@@ -9,12 +9,13 @@
 import subprocess
 import sys
 
-from typing import Tuple, List, Dict, Set
+from typing import List
+import typing
 
-from mypy.myunit import Suite, SkipTestCaseException, AssertionFailure
-from mypy.test.config import test_data_prefix, test_temp_dir
+from mypy.myunit import AssertionFailure
+from mypy.test.config import test_temp_dir
 from mypy.test.data import fix_cobertura_filename
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal, normalize_error_messages
 from mypy.version import __version__, base_version
 
@@ -28,23 +29,17 @@
 ]
 
 
-class PythonEvaluationSuite(DataSuite):
-
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in cmdline_files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  base_path=test_temp_dir,
-                                  optional_out=True,
-                                  native_sep=True)
-        return c
+class PythonCmdlineSuite(DataSuite):
+    files = cmdline_files  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
+    native_sep = True  # type: typing.ClassVar[bool]
 
     def run_case(self, testcase: DataDrivenTestCase):
-        test_python_evaluation(testcase)
+        test_python_cmdline(testcase)
 
 
-def test_python_evaluation(testcase: DataDrivenTestCase) -> None:
+def test_python_cmdline(testcase: DataDrivenTestCase) -> None:
     assert testcase.old_cwd is not None, "test was not properly set up"
     # Write the program to a file.
     program = '_program.py'

mypy/test/testdeps.py

@@ -2,32 +2,24 @@
 
 import os
 from typing import List, Tuple, Dict, Optional
+import typing
 
 from mypy import build
 from mypy.build import BuildSource
 from mypy.errors import CompileError
 from mypy.nodes import MypyFile, Expression
 from mypy.options import Options
 from mypy.server.deps import get_dependencies
-from mypy.test.config import test_temp_dir, test_data_prefix
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
+from mypy.test.config import test_temp_dir
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal
 from mypy.types import Type
 
-files = [
-    'deps.test'
-]
-
 
 class GetDependenciesSuite(DataSuite):
-
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  test_temp_dir, True)
-        return c
+    files = ['deps.test']  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         src = '\n'.join(testcase.input)

mypy/test/testdiff.py

@@ -2,32 +2,23 @@
 
 import os
 from typing import List, Tuple, Dict, Optional
+import typing
 
 from mypy import build
 from mypy.build import BuildSource
 from mypy.errors import CompileError
 from mypy.nodes import MypyFile
 from mypy.options import Options
 from mypy.server.astdiff import compare_symbol_tables
-from mypy.test.config import test_temp_dir, test_data_prefix
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
+from mypy.test.config import test_temp_dir
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal
 
 
-files = [
-    'diff.test'
-]
-
-
 class ASTDiffSuite(DataSuite):
-
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  test_temp_dir, True)
-        return c
+    files = ['diff.test']  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         first_src = '\n'.join(testcase.input)

mypy/test/testfinegrained.py

@@ -11,6 +11,7 @@
 import re
 import shutil
 from typing import List, Tuple, Dict
+import typing
 
 from mypy import build
 from mypy.build import BuildManager, BuildSource, Graph
@@ -29,19 +30,10 @@
 from mypy.util import short_type
 
 
-files = [
-    'fine-grained.test'
-]
-
-
 class FineGrainedSuite(DataSuite):
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  test_temp_dir, True)
-        return c
+    files = ['fine-grained.test']  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         main_src = '\n'.join(testcase.input)

mypy/test/testmerge.py

@@ -3,6 +3,7 @@
 import os
 import shutil
 from typing import List, Tuple, Dict, Optional
+import typing
 
 from mypy import build
 from mypy.build import BuildManager, BuildSource, State
@@ -15,19 +16,14 @@
 from mypy.server.subexpr import get_subexpressions
 from mypy.server.update import build_incremental_step, replace_modules_with_new_variants
 from mypy.strconv import StrConv, indent
-from mypy.test.config import test_temp_dir, test_data_prefix
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
+from mypy.test.config import test_temp_dir
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.helpers import assert_string_arrays_equal
 from mypy.test.testtypegen import ignore_node
 from mypy.types import TypeStrVisitor, Type
 from mypy.util import short_type, IdMapper
 
 
-files = [
-    'merge.test'
-]
-
-
 # Which data structures to dump in a test case?
 SYMTABLE = 'SYMTABLE'
 TYPEINFO = ' TYPEINFO'
@@ -36,21 +32,17 @@
 
 
 class ASTMergeSuite(DataSuite):
+    files = ['merge.test']  # type: typing.ClassVar[List[str]]
+    base_path = test_temp_dir  # type: typing.ClassVar[str]
+    optional_out = True  # type: typing.ClassVar[bool]
+
     def __init__(self, *, update_data: bool) -> None:
         super().__init__(update_data=update_data)
         self.str_conv = StrConv(show_ids=True)
         assert self.str_conv.id_mapper is not None
         self.id_mapper = self.str_conv.id_mapper  # type: IdMapper
         self.type_str_conv = TypeStrVisitor(self.id_mapper)
 
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        c = []  # type: List[DataDrivenTestCase]
-        for f in files:
-            c += parse_test_cases(os.path.join(test_data_prefix, f),
-                                  test_temp_dir, True)
-        return c
-
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         name = testcase.name
         # We use the test case name to decide which data structures to dump.

mypy/test/testparse.py

@@ -1,30 +1,19 @@
 """Tests for the mypy parser."""
-
-import os.path
-
 from typing import List
+import typing
 
 from mypy import defaults
-from mypy.myunit import Suite, AssertionFailure
+from mypy.myunit import AssertionFailure
 from mypy.test.helpers import assert_string_arrays_equal
-from mypy.test.data import parse_test_cases, DataDrivenTestCase, DataSuite
-from mypy.test import config
+from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.parse import parse
 from mypy.errors import CompileError
 from mypy.options import Options
 
 
 class ParserSuite(DataSuite):
-    parse_files = ['parse.test',
-                   'parse-python2.test']
-
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        # The test case descriptions are stored in data files.
-        c = []  # type: List[DataDrivenTestCase]
-        for f in cls.parse_files:
-            c += parse_test_cases(os.path.join(config.test_data_prefix, f))
-        return c
+    files = ['parse.test',
+             'parse-python2.test']  # type: typing.ClassVar[List[str]]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         test_parser(testcase)
@@ -61,11 +50,7 @@ def test_parser(testcase: DataDrivenTestCase) -> None:
 
 
 class ParseErrorSuite(DataSuite):
-    @classmethod
-    def cases(cls) -> List[DataDrivenTestCase]:
-        # Test case descriptions are in an external file.
-        return parse_test_cases(os.path.join(config.test_data_prefix,
-                                             'parse-errors.test'))
+    files = ['parse-errors.test']  # type: typing.ClassVar[List[str]]
 
     def run_case(self, testcase: DataDrivenTestCase) -> None:
         test_parse_error(testcase)