refactor check, mark python/mypy#14622 bugs

src/shall/Check.py

@@ -1,29 +1,26 @@
 
 from shall.ShallEntity import ShallEntity, P, R
+from injector import inject
+from src.shall.CheckReturnConstraints import CheckReturnConstraints
+from src.shall.CheckReturnValue import CheckReturnValue
+from src.shall.CheckSideEffects import CheckSideEffects
+
+class Check():
+    @inject
+    def __init__(self,
+                 checkReturnValue:CheckReturnValue[P,R],
+                 checkReturnConstraints: CheckReturnConstraints[P,R],
+                 checkSideEffects: CheckSideEffects[P,R]
+                 ) -> None:
+        self.checkReturnValue = checkReturnValue
+        self.checkReturnConstraints = checkReturnConstraints
+        self.checkSideEffects = checkSideEffects
 
-class Check(ShallEntity[P, R]):
     def check(self) -> None:
         paramlist = self.parameters[0]
         paramkwargs = self.parameters[1]
         print(self.explanation)
         callResult = self.callable(*paramlist, **paramkwargs)
-        if self.returnValue == callResult:
-            print("/return value PASSED")
-        else:
-            raise AssertionError(self.explanation +
-                                 " did return " + str(callResult) + " instead of " + str(self.returnValue))
-        for (explanation, checker) in self.returnConstraints:
-            checked = checker(self.returnValue, *paramlist, **paramkwargs)
-            if checked:
-                print("+"+explanation+": PASSED")
-            else:
-                raise AssertionError(explanation+" did not hold")
-        for (explanation, sideEffectChecker) in self.sideEffectCheckers:
-            sideEffectChecker.setUp(self.callable, *paramlist, **paramkwargs)
-            result = sideEffectChecker.runTest()
-            sideEffectChecker.tearDown()
-            if result:
-                print("-"+explanation+": PASSED")
-            else:
-                raise AssertionError(
-                    explanation+" did not hold: " + str(result))
+        self.checkReturnValue.checkReturnValue(callResult)
+        self.checkReturnConstraints.checkReturnConstraints( paramlist, paramkwargs)
+        self.checkSideEffects.checkSideEffects(paramlist,paramkwargs)

src/shall/CheckReturnConstraints.py

@@ -0,0 +1,11 @@
+from src.shall.ShallEntity import ShallEntity, P, R
+
+
+class CheckReturnConstraints(ShallEntity[P, R]):
+    def checkReturnConstraints(self, paramlist:P.args, paramkwargs: P.kwargs) -> None: #type:ignore # https://github.com/python/mypy/issues/14622
+        for (explanation, checker) in self.returnConstraints:
+            checked = checker(self.returnValue, *paramlist, **paramkwargs)
+            if checked:
+                print("+"+explanation+": PASSED")
+            else:
+                raise AssertionError(explanation+" did not hold")

src/shall/CheckReturnValue.py

@@ -0,0 +1,10 @@
+from src.shall.ShallEntity import ShallEntity, P, R
+
+
+class CheckReturnValue(ShallEntity[P, R]):
+    def checkReturnValue(self, callResult: R) ->None:
+        if self.returnValue == callResult:
+            print("/return value PASSED")
+        else:
+            raise AssertionError(self.explanation +
+                                 " did return " + str(callResult) + " instead of " + str(self.returnValue))

src/shall/CheckSideEffects.py

@@ -0,0 +1,14 @@
+from src.shall.ShallEntity import ShallEntity, P, R
+
+
+class CheckSideEffects(ShallEntity[P, R]):
+    def checkSideEffects(self, paramlist:P.args, paramkwargs: P.kwargs) ->None: #type:ignore #https://github.com/python/mypy/issues/14622
+        for (explanation, sideEffectChecker) in self.sideEffectCheckers:
+            sideEffectChecker.setUp(self.callable, *paramlist, **paramkwargs)
+            result = sideEffectChecker.runTest()
+            sideEffectChecker.tearDown()
+            if result:
+                print("-"+explanation+": PASSED")
+            else:
+                raise AssertionError(
+                    explanation+" did not hold: " + str(result))

test/testcontract.py

@@ -1,15 +1,17 @@
 import sys
 from unittest import TestCase
 from CheckContract import CheckContract
-
+from injector import Inject
 from ExampleContract import ExampleContract
 from ThenreturnContract import ThenreturnContract
 from WhenContract import WhenContract
 from ShallConstructorContract import ShallConstructorContract
 from IfCalledWithContract import IfCalledWithContract
 from MeanWhileContract import MeanWhileContract
 from SuchThatContract import SuchThatContract
+from src.shall.Check import CheckReturnValue
 
+inject = Inject([CheckReturnValue])
 
 class testContract(TestCase):