Update tests

kaste · kaste · commit baad7440b21a · 2023-01-07T14:47:15.000+01:00
Update tests to not use the regex directly but test what `find_errors`
returns.

- `find_errors` adjustes line/col to be 0-based
- switch to `error_type` as we support "notes" now
diff --git a/tests/test_regex.py b/tests/test_regex.py
@@ -3,47 +3,48 @@
 import re
 import importlib
 
+import sublime
+
 LinterModule = importlib.import_module('SublimeLinter-mypy.linter')
 Linter = LinterModule.Mypy
-regex = Linter.regex
 
 
 class TestRegex(unittest.TestCase):
-
     def assertMatch(self, string, expected):
-        match = re.match(regex, string)
-        self.assertIsNotNone(match)
-        self.assertEqual(match.groupdict(), expected)
+        linter = Linter(sublime.View(0), {})
+        actual = list(linter.find_errors(string))[0]
+        # `find_errors` fills out more information we don't want to write down
+        # in the examples
+        self.assertEqual({k: actual[k] for k in expected.keys()}, expected)
 
-    def assertMatchIsNone(self, string):
-        self.assertIsNone(re.match(regex, string))
+    def assertNoMatch(self, string):
+        linter = Linter(sublime.View(0), {})
+        actual = list(linter.find_errors(string))
+        self.assertFalse(actual)
 
     def test_no_matches(self):
-        self.assertMatchIsNone('')
-        self.assertMatchIsNone('foo')
+        self.assertNoMatch('')
+        self.assertNoMatch('foo')
 
     def test_matches(self):
         self.assertMatch(
             '/path/to/package/module.py:18:4: error: No return value expected', {
-                'error': 'error',
-                'line': '18',
-                'col': '4',
-                'warning': None,
+                'error_type': 'error',
+                'line': 17,
+                'col': 3,
                 'message': 'No return value expected'})
 
         self.assertMatch(
             '/path/to/package/module.py:40: error: "dict" is not subscriptable, use "typing.Dict" instead', {
-                'error': 'error',
-                'line': '40',
+                'error_type': 'error',
+                'line': 39,
                 'col': None,
-                'warning': None,
                 'message': '"dict" is not subscriptable, use "typing.Dict" instead'})
 
     def test_tmp_files_that_have_no_file_extension(self):
         self.assertMatch(
-            '/tmp/yoeai32h2:6:0: error: Cannot find module named \'PackageName.lib\'', {
-                'error': 'error',
-                'line': '6',
-                'col': '0',
-                'warning': None,
+            '/tmp/yoeai32h2:6:1: error: Cannot find module named \'PackageName.lib\'', {
+                'error_type': 'error',
+                'line': 5,
+                'col': 0,
                 'message': 'Cannot find module named \'PackageName.lib\''})
