Merge pull request #82 from jkonecny12/master-improve-tests

Improve test structure

Author: jkonecny12

MANIFEST.in

@@ -1,4 +1,4 @@
 include LICENSE.md Makefile ChangeLog README.md
 recursive-include simpleline *.py
 recursive-include po *.po *.pot Makefile
-recursive-include tests *.py
+recursive-include tests *.py *.sh

Makefile

@@ -51,18 +51,18 @@ clean:
 .PHONY: test
 test:
 	@echo "*** Running unittests ***"
-	PYTHONPATH=. $(PYTHON) -m unittest discover -v -s tests/ -p '*_test.py'
+	./tests/units/run_test.sh
 
 .PHONY: coverage
 coverage:
 	@echo "*** Running unittests with coverage ***"
-	PYTHONPATH=. $(COVERAGE) run --branch -m unittest discover -v -s tests/ -p '*_test.py'
+	PYTHON="$(COVERAGE) run --branch" ./tests/units/run_test.sh
 	$(COVERAGE) report -m --include="simpleline/*" | tee tests/coverage-report.log
 
 .PHONY: check
 check:
 	@echo "*** Running pylint ***"
-	$(PYTHON) -m pylint simpleline/ examples/*/*.py tests/
+	$(PYTHON) -m pylint simpleline/ examples/*/*.py tests/units/
 
 .PHONY: install
 install:

tests/simpleline_tests/__init__.py tests/units/__init__.pytests/simpleline_tests/__init__.py renamed to tests/units/__init__.py

@@ -18,8 +18,8 @@
 # along with Simpleline.  If not, see <https://www.gnu.org/licenses/>.
 #
 
-from tests.simpleline_tests.event_loop_test import ProcessEvents_TestCase
-from tests.simpleline_tests.glib_tests import GLibUtilityMixin
+from . import GLibUtilityMixin
+from ..main.event_loop_test import ProcessEvents_TestCase
 
 
 class GLibProcessEvents_TestCase(ProcessEvents_TestCase, GLibUtilityMixin):

…/simpleline_tests/glib_tests/__init__.py tests/units/glib/__init__.pytests/simpleline_tests/glib_tests/__init__.py renamed to tests/units/glib/__init__.py tests/simpleline_tests/glib_tests/__init__.py renamed to tests/units/glib/__init__.py

@@ -19,8 +19,8 @@
 #
 
 
-from tests.simpleline_tests.input_handler_test import InputHandler_TestCase
-from tests.simpleline_tests.glib_tests import GLibUtilityMixin
+from . import GLibUtilityMixin
+from ..main.input_handler_test import InputHandler_TestCase
 
 
 class GLibInputHandler_TestCase(InputHandler_TestCase, GLibUtilityMixin):

…tests/glib_tests/event_loop_glib_test.py tests/units/glib/event_loop_glib_test.pytests/simpleline_tests/glib_tests/event_loop_glib_test.py renamed to tests/units/glib/event_loop_glib_test.py tests/simpleline_tests/glib_tests/event_loop_glib_test.py renamed to tests/units/glib/event_loop_glib_test.py

@@ -19,8 +19,8 @@
 #
 
 
-from tests.simpleline_tests.glib_tests import GLibUtilityMixin
-from tests.simpleline_tests.render_screen_test import SimpleUIScreenProcessing_TestCase, \
+from . import GLibUtilityMixin
+from ..main.render_screen_test import SimpleUIScreenProcessing_TestCase, \
     InputProcessing_TestCase, ScreenException_TestCase
 
 

…ts/glib_tests/input_handler_glib_test.py …ts/units/glib/input_handler_glib_test.pytests/simpleline_tests/glib_tests/input_handler_glib_test.py renamed to tests/units/glib/input_handler_glib_test.py tests/simpleline_tests/glib_tests/input_handler_glib_test.py renamed to tests/units/glib/input_handler_glib_test.py

@@ -19,8 +19,8 @@
 #
 
 
-from tests.simpleline_tests.glib_tests import GLibUtilityMixin
-from tests.simpleline_tests.screen_scheduler_test import ScreenScheduler_TestCase
+from . import GLibUtilityMixin
+from ..main.screen_scheduler_test import ScreenScheduler_TestCase
 
 
 class GLibScreenScheduler_TestCase(ScreenScheduler_TestCase, GLibUtilityMixin):

…ts/glib_tests/render_screen_glib_test.py …ts/units/glib/render_screen_glib_test.pytests/simpleline_tests/glib_tests/render_screen_glib_test.py renamed to tests/units/glib/render_screen_glib_test.py tests/simpleline_tests/glib_tests/render_screen_glib_test.py renamed to tests/units/glib/render_screen_glib_test.py

@@ -19,14 +19,14 @@
 #
 
 import unittest
-from unittest.mock import patch
 
+from unittest.mock import patch
 from io import StringIO
 
-from tests.simpleline_tests import UtilityMixin
-
 from simpleline.render.adv_widgets import GetInputScreen, GetPasswordInputScreen
 
+from .. import UtilityMixin
+
 
 @patch('simpleline.input.input_handler.InputHandlerRequest._get_input')
 @patch('sys.stdout', new_callable=StringIO)