Merge pull request #56 from SublimeLinter/testable

kaste · web-flow · commit 351e90e6a864 · 2023-01-07T14:48:59.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,3 +19,14 @@ jobs:
     - uses: actions/checkout@v3
     - run: pip install "flake8<6.0.0"
     - uses: TrueBrain/actions-flake8@v2
+
+  run-tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: SublimeText/UnitTesting/actions/setup@v1
+      with:
+        sublime-text-version: 4
+        extra-packages:
+          SublimeLinter/SublimeLinter
+    - uses: SublimeText/UnitTesting/actions/run-tests@v1
diff --git a/mypy.ini b/mypy.ini
@@ -3,7 +3,8 @@ check_untyped_defs = True
 warn_redundant_casts = True
 warn_unused_ignores = True
 mypy_path =
-  ../
+  :$MYPY_CONFIG_FILE_DIR/../
+  :$MYPY_CONFIG_FILE_DIR/../SublimeLinter/stubs
 sqlite_cache = True
 
 [mypy-package_control]
diff --git a/tests/test_regex.py b/tests/test_regex.py
@@ -3,48 +3,48 @@
 import re
 import importlib
 
-# Damn you dash separated module names!!!
+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\''})
