From 4a70ff6090066505d55f1d44fdd60d38594fe69e Mon Sep 17 00:00:00 2001
From: Eugenio Parodi <ceccopierangiolieugenio@googlemail.com>
Date: Wed, 25 Oct 2023 17:37:48 +0100
Subject: [PATCH] Adapted mock test objects to the new driver

---
 TermTk/TTkCore/drivers/pyodide.py      |  2 +-
 TermTk/TTkCore/drivers/term_windows.py |  2 +-
 tests/pytest/conftest.py               |  4 ++--
 tests/pytest/mock_input.py             | 20 ++++++++++++++------
 tests/pytest/mock_term.py              |  2 +-
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/TermTk/TTkCore/drivers/pyodide.py b/TermTk/TTkCore/drivers/pyodide.py
index d81af6d7..7e383849 100644
--- a/TermTk/TTkCore/drivers/pyodide.py
+++ b/TermTk/TTkCore/drivers/pyodide.py
@@ -22,7 +22,7 @@
 
 __all__ = ['TTkSignalDriver','TTkInputDriver']
 
-from TermTk.TTkCore.signal import pyTTkSignal, pyTTkSlot
+from TermTk.TTkCore.signal import pyTTkSignal
 
 class TTkInputDriver():
     def close(self): pass
diff --git a/TermTk/TTkCore/drivers/term_windows.py b/TermTk/TTkCore/drivers/term_windows.py
index cd9ee35e..f0506724 100644
--- a/TermTk/TTkCore/drivers/term_windows.py
+++ b/TermTk/TTkCore/drivers/term_windows.py
@@ -22,7 +22,7 @@
 
 __all__ = ['TTkTerm']
 
-import sys, os, signal
+import sys, os
 from threading import Thread, Lock
 
 from ..TTkTerm.term_base import TTkTermBase
diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py
index 7523a2b9..e29ebc03 100644
--- a/tests/pytest/conftest.py
+++ b/tests/pytest/conftest.py
@@ -27,11 +27,11 @@ import sys
 from mock_term  import Mock_TTkTerm
 from mock_input import Mock_TTkInput
 
-moduleTerm = type(sys)('TermTk.TTkCore.TTkTerm.term')
+moduleTerm = type(sys)('TermTk.TTkCore.drivers.term_unix')
 moduleTerm.TTkTerm = Mock_TTkTerm
 
 moduleInput = type(sys)('TermTk.TTkCore.TTkTerm.input')
 moduleInput.TTkInput = Mock_TTkInput
 
-sys.modules['TermTk.TTkCore.TTkTerm.term']  = moduleTerm
+sys.modules['TermTk.TTkCore.drivers.term_unix']  = moduleTerm
 sys.modules['TermTk.TTkCore.TTkTerm.input'] = moduleInput
\ No newline at end of file
diff --git a/tests/pytest/mock_input.py b/tests/pytest/mock_input.py
index 0f64eefa..8173d09c 100644
--- a/tests/pytest/mock_input.py
+++ b/tests/pytest/mock_input.py
@@ -23,12 +23,20 @@
 # Thanks to: https://stackoverflow.com/questions/43162722/mocking-a-module-import-in-pytest
 
 class Mock_TTkInput():
-    def __init__(self): pass
-    def close(self): pass
-    def stop(self): pass
-    def cont(self): pass
-    def get_key(self, callback=None): pass
-    def start(self): pass
+    @staticmethod
+    def init(mouse, directMouse):pass
+    @staticmethod
+    def setMouse(mouse, directMouse): pass
+    @staticmethod
+    def close(): pass
+    @staticmethod
+    def stop(): pass
+    @staticmethod
+    def cont(): pass
+    @staticmethod
+    def get_key( callback=None): pass
+    @staticmethod
+    def start(): pass
 
     class inputEvent():
         def connect(*args):
diff --git a/tests/pytest/mock_term.py b/tests/pytest/mock_term.py
index 003f0506..3e514f2e 100644
--- a/tests/pytest/mock_term.py
+++ b/tests/pytest/mock_term.py
@@ -79,7 +79,7 @@ class Mock_TTkTerm():
     @staticmethod
     def exit(): pass
     @staticmethod
-    def init(title,sigmask,mouse,directMouse): pass
+    def init(title,sigmask): pass
     @staticmethod
     def getTerminalSize():
         return 250,70