[gentoo-commits] proj/pms-test-suite:master commit in: pmstestsuite/library/

["Michał Górny" <mgorny@gentoo.org>]

commit:     c8f668f617583998ed87b85f051846036631dbef
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 18:54:02 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  2 18:54:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/pms-test-suite.git;a=commit;h=c8f668f6

Store assertion results.

---
 pmstestsuite/library/case.py |  109 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 100 insertions(+), 9 deletions(-)

diff --git a/pmstestsuite/library/case.py b/pmstestsuite/library/case.py
index 956a1a3..5295002 100644
--- a/pmstestsuite/library/case.py
+++ b/pmstestsuite/library/case.py
@@ -3,7 +3,7 @@
 # Released under the terms of the 2-clause BSD license.
 
 import copy, random, re
-from gentoopm.util import ABCObject
+from gentoopm.util import ABCObject, BoolCompat
 
 from abc import ABCMeta, abstractmethod, abstractproperty
 
@@ -53,6 +53,92 @@ def cleanup_test_case_name(classname):
 		classname = classname[:-4]
 	return pn_re.sub('\\1-\\2', classname).lower()
 
+class AssertionResult(ABCObject, BoolCompat):
+	def __init__(self, name):
+		self._name = name
+
+	@property
+	def name(self):
+		return self._name
+
+	@abstractproperty
+	def expected(self):
+		pass
+
+	@abstractproperty
+	def actual(self):
+		pass
+
+	@abstractmethod
+	def __bool__(self):
+		pass
+
+	def __str__(self):
+		return '%s == %s' % (self.actual, self.expected)
+
+class BoolAssertionResult(AssertionResult):
+	def __init__(self, name, expect, cond):
+		AssertionResult.__init__(self, name)
+		self._expect = bool(expect)
+		self._cond = bool(cond)
+
+	@property
+	def expected(self):
+		return self._expect
+
+	@property
+	def actual(self):
+		return self._cond
+
+	def __bool__(self):
+		return self._cond == self._expect
+
+class ContainsAssertionResult(AssertionResult):
+	def __init__(self, name, needle, container):
+		AssertionResult.__init__(self, name)
+		self._cont = container
+		self._need = needle
+
+	@property
+	def expected(self):
+		return 'contains %s' % repr(self._need)
+
+	@property
+	def actual(self):
+		return repr(self._cont)
+
+	def __bool__(self):
+		return self._need in self._cont
+
+class EqualAssertionResult(AssertionResult):
+	def __init__(self, name, expect, value):
+		AssertionResult.__init__(self, name)
+		self._expect = expect
+		self._value = value
+
+	@property
+	def expected(self):
+		return repr(self._expect)
+
+	@property
+	def actual(self):
+		return repr(self._value)
+
+	def __bool__(self):
+		return self._value == self._expect
+
+class NotEqualAssertionResult(EqualAssertionResult):
+	def __bool__(self):
+		return self._value != self._expect
+
+	@property
+	def expected(self):
+		return 'not %s' % repr(self._expect)
+
+	def __str__(self):
+		return '%s != %s' % (self.actual,
+				repr(self._expect))
+
 class TestCase(ABCObject):
 	"""
 	Base class for a test case.
@@ -64,6 +150,9 @@ class TestCase(ABCObject):
 
 	_finalized = False
 
+	def __init__(self):
+		self.assertions = []
+
 	def _finalize(self):
 		"""
 		Do any final modifications to test case data. Mark it finalized.
@@ -102,6 +191,11 @@ class TestCase(ABCObject):
 		"""
 		pass
 
+	def _append_assert(self, a):
+		self.assertions.append(a)
+		if not a:
+			raise AssertionError(str(a))
+
 	def assertTrue(self, cond, msg):
 		"""
 		Assert that the condition evaluates to True.
@@ -135,8 +229,7 @@ class TestCase(ABCObject):
 		@param msg: assertion description
 		@type msg: string
 		"""
-		if bool(cond) != expect:
-			raise AssertionError(msg)
+		self._append_assert(BoolAssertionResult(msg, expect, cond))
 
 	def assertContains(self, needle, container, msg = None):
 		"""
@@ -151,8 +244,7 @@ class TestCase(ABCObject):
 		"""
 		if msg is None:
 			msg = '%s in %s' % (repr(needle), repr(container))
-		if needle not in container:
-			raise AssertionError(msg)
+		self._append_assert(ContainsAssertionResult(msg, needle, container))
 
 	def assertEqual(self, value, expect, msg):
 		"""
@@ -165,8 +257,7 @@ class TestCase(ABCObject):
 		@param msg: assertion description
 		@type msg: string
 		"""
-		if value != expect:
-			raise AssertionError(msg)
+		self._append_assert(EqualAssertionResult(msg, expect, value))
 
 	def assertNotEqual(self, value, unallowed, msg):
 		"""
@@ -179,8 +270,7 @@ class TestCase(ABCObject):
 		@param msg: assertion description
 		@type msg: string
 		"""
-		if value == unallowed:
-			raise AssertionError(msg)
+		self._append_assert(NotEqualAssertionResult(msg, unallowed, value))
 
 	@abstractmethod
 	def check_result(self, pm):
@@ -324,6 +414,7 @@ class EbuildTestCase(TestCase):
 		@param eapi: the EAPI
 		@type eapi: string
 		"""
+		TestCase.__init__(self)
 		self.eapi = eapi
 
 		for v in ('ebuild_vars', 'inherits', 'phase_funcs'):