Improved testing with pytest

.github/workflows/testing.yml

@@ -46,4 +46,4 @@ jobs:
 
     - name: Test with pytest
       run: |
-        pytest demo/demo.py
+        pytest tests/pytest/test_001_demo.py

Makefile

@@ -73,4 +73,4 @@ test: .venv
 	tools/check.import.sh
 	. .venv/bin/activate ; \
 	flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude .venv,build,tmp ; \
-	pytest demo/demo.py
+	pytest tests/pytest/test_001_demo.py

TermTk/TTkCore/TTkTerm/__init__.py

@@ -1,5 +1,5 @@
 from .inputkey   import TTkKeyEvent
 from .inputmouse import TTkMouseEvent
 from .colors     import TTkTermColor
-from .term       import *
-from .input      import *
+from .term       import TTkTerm
+from .input      import TTkInput

demo/demo.py

@@ -261,8 +261,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-def test_demo():
-    root = ttk.TTk(layout=ttk.TTkGridLayout())
-    assert demoShowcase(root) != None
-    root.quit()

tests/pytest/conftest.py

@@ -0,0 +1,59 @@
+# MIT License
+#
+# Copyright (c) 2022 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.import sys
+
+# Thanks to: https://stackoverflow.com/questions/43162722/mocking-a-module-import-in-pytest
+
+import sys
+
+class Mock_TTkTerm():
+    CLEAR         = None
+    ALT_SCREEN    = None
+    NORMAL_SCREEN = None
+
+    class Mouse():
+        ON         = None
+        OFF        = None
+        DIRECT_ON  = None
+        DIRECT_OFF = None
+
+    class Cursor():
+        BLINKING_BLOCK      = None
+        BLINKING_BLOCK_ALSO = None
+        STEADY_BLOCK        = None
+        BLINKING_UNDERLINE  = None
+        STEADY_UNDERLINE    = None
+        BLINKING_BAR        = None
+        STEADY_BAR          = None
+
+        HIDE = None
+        SHOW = None
+
+    class Sigmask():
+        CTRL_C = 0x0001
+        CTRL_S = 0x0002
+        CTRL_Z = 0x0004
+        CTRL_Q = 0x0008
+
+module = type(sys)('TermTk.TTkCore.TTkTerm.term')
+module.TTkTerm = Mock_TTkTerm
+
+sys.modules['TermTk.TTkCore.TTkTerm.term'] = module

tests/pytest/test_001_demo.py

@@ -0,0 +1,37 @@
+#!/usr/bin/env python3
+# MIT License
+#
+# Copyright (c) 2022 Eugenio Parodi <ceccopierangiolieugenio AT googlemail DOT com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+import sys, os
+
+sys.path.append(os.path.join(sys.path[0],'../../demo'))
+sys.path.append(os.path.join(sys.path[0],'../..'))
+
+import demo
+
+if __name__ == "__main__":
+    demo.main()
+
+def test_demo():
+    root = demo.ttk.TTk(layout=demo.ttk.TTkGridLayout())
+    assert demo.demoShowcase(root) != None
+    root.quit()