separate ProtoTestCase

Author: elazarg

mypy/myunit/__init__.py

@@ -105,30 +105,19 @@ def fail() -> None:
     raise AssertionFailure()
 
 
-class TestCase:
-    def __init__(self, name: str, suite: 'Optional[Suite]' = None,
-                 func: Optional[Callable[[], None]] = None) -> None:
-        self.func = func
+class ProtoTestCase:
+    def __init__(self, name: str) -> None:
         self.name = name
-        self.suite = suite
         self.old_cwd = None  # type: Optional[str]
         self.tmpdir = None  # type: Optional[tempfile.TemporaryDirectory[str]]
 
-    def run(self) -> None:
-        if self.func:
-            self.func()
-
     def set_up(self) -> None:
         self.old_cwd = os.getcwd()
         self.tmpdir = tempfile.TemporaryDirectory(prefix='mypy-test-')
         os.chdir(self.tmpdir.name)
         os.mkdir('tmp')
-        if self.suite:
-            self.suite.set_up()
 
     def tear_down(self) -> None:
-        if self.suite:
-            self.suite.tear_down()
         assert self.old_cwd is not None and self.tmpdir is not None, \
             "test was not properly set up"
         os.chdir(self.old_cwd)
@@ -140,6 +129,28 @@ def tear_down(self) -> None:
         self.tmpdir = None
 
 
+class TestCase(ProtoTestCase):
+    def __init__(self, name: str, suite: 'Optional[Suite]' = None,
+                 func: Optional[Callable[[], None]] = None) -> None:
+        super().__init__(name)
+        self.func = func
+        self.suite = suite
+
+    def run(self) -> None:
+        if self.func:
+            self.func()
+
+    def set_up(self) -> None:
+        super().set_up()
+        if self.suite:
+            self.suite.set_up()
+
+    def tear_down(self) -> None:
+        if self.suite:
+            self.suite.tear_down()
+        super().tear_down()
+
+
 class Suite:
     def __init__(self) -> None:
         self.prefix = typename(type(self)) + '.'

mypy/test/data.py

@@ -8,9 +8,9 @@
 import shutil
 
 import pytest  # type: ignore  # no pytest in typeshed
-from typing import Callable, List, Tuple, Set, Optional, Iterator, Any, Dict
+from typing import List, Tuple, Set, Optional, Iterator, Any, Dict
 
-from mypy.myunit import TestCase, SkipTestCaseException
+from mypy.myunit import ProtoTestCase
 
 
 root_dir = os.path.normpath(os.path.join(os.path.dirname(__file__), '..', '..'))
@@ -176,7 +176,7 @@ def parse_test_cases(
     return out
 
 
-class DataDrivenTestCase(TestCase):
+class DataDrivenTestCase(ProtoTestCase):
     input = None  # type: List[str]
     output = None  # type: List[str]  # Output for the first pass
     output2 = None  # type: Dict[int, List[str]]  # Output for runs 2+, indexed by run number
@@ -263,9 +263,6 @@ def add_dirs(self, dir: str) -> List[str]:
             os.mkdir(dir)
             return dirs
 
-    def run(self) -> None:
-        assert False
-
     def tear_down(self) -> None:
         # First remove files.
         for is_dir, path in reversed(self.clean_up):