Support 'None' as actual assertion result.

1 files changed, 10 insertions, 4 deletions

diff --git a/pmstestsuite/library/case.py b/pmstestsuite/library/case.py
index 4502571..6cf7ebd 100644
--- a/pmstestsuite/library/case.py
+++ b/pmstestsuite/library/case.py
@@ -89,7 +89,7 @@ class BoolAssertionResult(AssertionResult):
 	def __init__(self, name, expect, cond):
 		AssertionResult.__init__(self, name)
 		self._expect = bool(expect)
-		self._cond = bool(cond)
+		self._cond = bool(cond) if cond is not None else None
 
 	@property
 	def expected(self):
@@ -97,9 +97,11 @@ class BoolAssertionResult(AssertionResult):
 
 	@property
 	def actual(self):
-		return self._cond
+		return self._cond if self._cond is not None else '?'
 
 	def __bool__(self):
+		if self._cond is None:
+			return False
 		return self._expect == self._cond
 
 class ContainsAssertionResult(AssertionResult):
@@ -114,12 +116,14 @@ class ContainsAssertionResult(AssertionResult):
 
 	@property
 	def actual(self):
-		return repr(self._cont)
+		return repr(self._cont) if self._cont is not None else '?'
 
 	def __str__(self):
 		return '%s %s' % (self.actual, self.expected)
 
 	def __bool__(self):
+		if self._cont is None:
+			return False
 		return self._need in self._cont
 
 class EqualAssertionResult(AssertionResult):
@@ -134,13 +138,15 @@ class EqualAssertionResult(AssertionResult):
 
 	@property
 	def actual(self):
-		return repr(self._value)
+		return repr(self._value) if self._value is not None else '?'
 
 	def __bool__(self):
 		return self._expect == self._value
 
 class NotEqualAssertionResult(EqualAssertionResult):
 	def __bool__(self):
+		if self._value is None:
+			return False
 		return self._expect != self._value
 
 	@property