Refactor: tests

gerardroche · Aug 4, 2023 · d42051a · d42051a
1 parent 6f6d981
commit d42051a
Show file tree

Hide file tree

Showing 22 changed files with 23 additions and 9 deletions.
diff --git a/tests/commands.py b/tests/commands.py
@@ -19,6 +19,7 @@
 
 
 class PhpunitTestSetupFixtureCommand(TextCommand):
+
     def run(self, edit, text):
 
         # This fixes an issue where an exception is thrown when  reloading the

diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
diff --git a/tests/lib/strategy/__init__.py b/tests/lib/strategy/__init__.py
diff --git a/tests/test_create_exec_output_panel.py → ...strategy/test_create_exec_output_panel.py b/tests/test_create_exec_output_panel.py → ...strategy/test_create_exec_output_panel.py
@@ -17,9 +17,10 @@
 
 import sublime
 
-from PHPUnitKit.lib.strategy import _create_exec_output_panel
 from PHPUnitKit.tests import unittest
 
+from PHPUnitKit.lib.strategy import _create_exec_output_panel
+
 
 class TestCreateExecOutputPanel(unittest.ViewTestCase):
 

diff --git a/tests/test_exec_file_regex.py → tests/lib/strategy/test_exec_file_regex.py b/tests/test_exec_file_regex.py → tests/lib/strategy/test_exec_file_regex.py
@@ -16,10 +16,11 @@
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
 import re
-from PHPUnitKit.tests import unittest
 
 from sublime import platform
 
+from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.strategy import _exec_file_regex
 
 

diff --git a/tests/lib/utils/__init__.py b/tests/lib/utils/__init__.py
diff --git a/tests/test_build_cmd_options.py → tests/lib/utils/test_build_cmd_options.py b/tests/test_build_cmd_options.py → tests/lib/utils/test_build_cmd_options.py
diff --git a/tests/test_build_filter_option.py → tests/lib/utils/test_build_filter_option.py b/tests/test_build_filter_option.py → tests/lib/utils/test_build_filter_option.py
diff --git a/tests/test_find_nearest_tests.py → tests/lib/utils/test_find_nearest_tests.py b/tests/test_find_nearest_tests.py → tests/lib/utils/test_find_nearest_tests.py
@@ -18,6 +18,7 @@
 from sublime import find_resources
 
 from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.utils import find_nearest_tests
 
 

diff --git a/tests/test_find_nearest_tests_for_pest.py → ...utils/test_find_nearest_tests_for_pest.py b/tests/test_find_nearest_tests_for_pest.py → ...utils/test_find_nearest_tests_for_pest.py
@@ -16,6 +16,7 @@
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
 from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.utils import find_nearest_tests
 
 

diff --git a/tests/test_find_php_classes.py → tests/lib/utils/test_find_php_classes.py b/tests/test_find_php_classes.py → tests/lib/utils/test_find_php_classes.py
@@ -16,6 +16,7 @@
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
 from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.utils import find_php_classes
 
 

diff --git a/tests/test_find_switchable.py → tests/lib/utils/test_find_switchable.py b/tests/test_find_switchable.py → tests/lib/utils/test_find_switchable.py
diff --git a/tests/test_finder.py → tests/lib/utils/test_finder.py b/tests/test_finder.py → tests/lib/utils/test_finder.py
@@ -16,6 +16,7 @@
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
 import os
+
 from PHPUnitKit.tests import unittest
 
 from PHPUnitKit.lib.utils import find_phpunit_configuration_file

diff --git a/tests/test_get_php_executable.py → tests/lib/utils/test_get_php_executable.py b/tests/test_get_php_executable.py → tests/lib/utils/test_get_php_executable.py
@@ -19,9 +19,10 @@
 
 import sublime
 
-from PHPUnitKit.lib.utils import get_php_executable
 from PHPUnitKit.tests import unittest
 
+from PHPUnitKit.lib.utils import get_php_executable
+
 
 class TestGetPHPExecutable(unittest.ViewTestCase):
 

diff --git a/tests/test_get_phpunit_executable.py → .../lib/utils/test_get_phpunit_executable.py b/tests/test_get_phpunit_executable.py → .../lib/utils/test_get_phpunit_executable.py
@@ -19,9 +19,10 @@
 
 import sublime
 
-from PHPUnitKit.lib.utils import get_phpunit_executable
 from PHPUnitKit.tests import unittest
 
+from PHPUnitKit.lib.utils import get_phpunit_executable
+
 
 class TestGetPHPUnitExecutable(unittest.ViewTestCase):
 

diff --git a/tests/test_get_phpunit_options.py → tests/lib/utils/test_get_phpunit_options.py b/tests/test_get_phpunit_options.py → tests/lib/utils/test_get_phpunit_options.py
@@ -15,9 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
-from PHPUnitKit.lib.utils import get_phpunit_options
 from PHPUnitKit.tests import unittest
 
+from PHPUnitKit.lib.utils import get_phpunit_options
+
 
 @unittest.mock.patch.dict('PHPUnitKit.lib.utils._session', {}, clear=True)
 class TestGetPHPUnitOptions(unittest.ViewTestCase):

diff --git a/tests/test_has_test.py → tests/lib/utils/test_has_test.py b/tests/test_has_test.py → tests/lib/utils/test_has_test.py
@@ -16,6 +16,7 @@
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
 from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.utils import has_test
 
 

diff --git a/tests/test_is_debug.py → tests/lib/utils/test_is_debug.py b/tests/test_is_debug.py → tests/lib/utils/test_is_debug.py
diff --git a/...test_is_valid_php_version_file_version.py → ...test_is_valid_php_version_file_version.py b/...test_is_valid_php_version_file_version.py → ...test_is_valid_php_version_file_version.py
diff --git a/tests/test_phpunit.py → tests/lib/utils/test_phpunit.py b/tests/test_phpunit.py → tests/lib/utils/test_phpunit.py
@@ -15,9 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
+from PHPUnitKit.tests import unittest
+
 from PHPUnitKit.lib.utils import set_last_run
 from PHPUnitKit.lib.utils import get_phpunit_options
-from PHPUnitKit.tests import unittest
 
 
 @unittest.mock.patch.dict('PHPUnitKit.lib.utils._session', {'options': {}}, clear=True)

diff --git a/tests/test_resolve_working_dir.py → tests/lib/utils/test_resolve_working_dir.py b/tests/test_resolve_working_dir.py → tests/lib/utils/test_resolve_working_dir.py
@@ -15,9 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
-from PHPUnitKit.lib.utils import resolve_working_dir
 from PHPUnitKit.tests import unittest
 
+from PHPUnitKit.lib.utils import resolve_working_dir
+
 
 class ViewStub():
     def __init__(self, file_name: str, folders: list):

diff --git a/tests/unittest.py b/tests/unittest.py
@@ -15,11 +15,12 @@
 # You should have received a copy of the GNU General Public License
 # along with PHPUnitKit.  If not, see <https://www.gnu.org/licenses/>.
 
+import os
+import sys
+
 from unittest import TestCase
 from unittest import mock  # noqa: F401
 from unittest import skipIf  # noqa: F401
-import os
-import sys
 
 from sublime import find_resources
 from sublime import active_window