Updated to deal with changed interface in Testing.TestEvents.

Libraries/iTasks/Extensions/Development/Testing.icl

@@ -9,7 +9,8 @@ import iTasks.Extensions.Development.Tools
 import iTasks.Extensions.Development.Codebase
 import Text, Data.Tuple, Data.Error, Data.Func, System.FilePath, System.OS
 
-derive class iTask EndEventType
+derive class iTask EndEventType, Expression
+
 derive gEditor EndEvent, FailReason, FailedAssertion, CounterExample, Relation
 derive gText EndEvent, FailReason, FailedAssertion, CounterExample, Relation
 derive gDefault EndEvent, FailReason, FailedAssertion, CounterExample, Relation

Libraries/iTasks/Util/Testing.icl

@@ -62,13 +62,13 @@ assertEqualWorld name exp sut = {UnitTest|name=name,test=test}
 where
 	test w
 		# (res,w) = sut w
-		= (if (exp === res) Passed (Failed (Just (FailedAssertions [ExpectedRelation (toJSON exp) Eq (toJSON res)]))),w)
+		= (if (exp === res) Passed (Failed (Just (FailedAssertions [ExpectedRelation (JSON (toJSON exp)) Eq (JSON (toJSON res))]))),w)
 
 checkEqual :: a a -> EndEventType | gEq{|*|} a & JSONEncode{|*|} a
 checkEqual exp sut = checkEqualWith (===) exp sut
 
 checkEqualWith :: (a a -> Bool) a a -> EndEventType | JSONEncode{|*|} a
-checkEqualWith pred exp sut = if (pred exp sut) Passed (Failed (Just (FailedAssertions [ExpectedRelation (toJSON exp) Eq (toJSON sut)])))
+checkEqualWith pred exp sut = if (pred exp sut) Passed (Failed (Just (FailedAssertions [ExpectedRelation (JSON (toJSON exp)) Eq (JSON (toJSON sut))])))
 
 pass :: String -> UnitTest
 pass name = {UnitTest|name=name,test = \w -> (Passed,w)}

Tools/CodeQualityMonitor.icl

@@ -36,7 +36,7 @@ EXAMPLE_MODULES :== ["../Examples/BasicApiExamples.icl"
                     ,"../Examples/GIS/LeafletMapExample.icl"
                     ]
 
-derive class iTask EndEventType
+derive class iTask EndEventType, Expression
 
 derive gEditor EndEvent, FailReason, FailedAssertion, CounterExample, Relation
 derive gDefault EndEvent, FailReason, FailedAssertion, CounterExample, Relation