Factor out the assertions.

1 files changed, 31 insertions, 98 deletions

diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py
index 7d1a869..d90dcba 100644
--- a/python/subunit/tests/test_test_results.py
+++ b/python/subunit/tests/test_test_results.py
@@ -309,6 +309,17 @@ class TestByTestResultTests(testtools.TestCase):
         self.result = subunit.test_results.TestByTestResult(self.on_test)
         self.result._now = iter(range(5)).next
 
+    def assertCalled(self, **kwargs):
+        defaults = {
+            'test': self,
+            'tags': None,
+            'details': None,
+            'start_time': 0,
+            'stop_time': 1,
+            }
+        defaults.update(kwargs)
+        self.assertEqual([defaults], self.log)
+
     def on_test(self, **kwargs):
         self.log.append(kwargs)
 
@@ -321,45 +332,23 @@ class TestByTestResultTests(testtools.TestCase):
         self.result.startTest(self)
         self.result.addSuccess(self)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'success',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': None}],
-            self.log)
+        self.assertCalled(status='success')
 
     def test_add_success_details(self):
         self.result.startTest(self)
         details = {'foo': 'bar'}
         self.result.addSuccess(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'success',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='success', details=details)
 
     def test_tags(self):
         if not getattr(self.result, 'tags', None):
             self.skipTest("No tags in testtools")
         self.result.tags(['foo'])
         self.result.startTest(self)
-        details = {'foo': 'bar'}
-        self.result.addSuccess(self, details=details)
+        self.result.addSuccess(self)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'success',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': set('foo'),
-              'details': details}],
-            self.log)
+        self.assertCalled(status='success', tags=set('foo'))
 
     def test_add_error(self):
         self.result.startTest(self)
@@ -369,28 +358,16 @@ class TestByTestResultTests(testtools.TestCase):
             error = sys.exc_info()
         self.result.addError(self, error)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'error',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': {'traceback': TracebackContent(error, self)}}],
-            self.log)
+        self.assertCalled(
+            status='error',
+            details={'traceback': TracebackContent(error, self)})
 
     def test_add_error_details(self):
         self.result.startTest(self)
         details = {"foo": text_content("bar")}
         self.result.addError(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'error',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='error', details=details)
 
     def test_add_failure(self):
         self.result.startTest(self)
@@ -400,28 +377,16 @@ class TestByTestResultTests(testtools.TestCase):
             failure = sys.exc_info()
         self.result.addFailure(self, failure)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'failure',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': {'traceback': TracebackContent(failure, self)}}],
-            self.log)
+        self.assertCalled(
+            status='failure',
+            details={'traceback': TracebackContent(failure, self)})
 
     def test_add_failure_details(self):
         self.result.startTest(self)
         details = {"foo": text_content("bar")}
         self.result.addFailure(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'failure',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='failure', details=details)
 
     def test_add_xfail(self):
         self.result.startTest(self)
@@ -431,70 +396,38 @@ class TestByTestResultTests(testtools.TestCase):
             error = sys.exc_info()
         self.result.addExpectedFailure(self, error)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'xfail',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': {'traceback': TracebackContent(error, self)}}],
-            self.log)
+        self.assertCalled(
+            status='xfail',
+            details={'traceback': TracebackContent(error, self)})
 
     def test_add_xfail_details(self):
         self.result.startTest(self)
         details = {"foo": text_content("bar")}
         self.result.addExpectedFailure(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'xfail',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='xfail', details=details)
 
     def test_add_unexpected_success(self):
         self.result.startTest(self)
         details = {'foo': 'bar'}
         self.result.addUnexpectedSuccess(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'success',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='success', details=details)
 
     def test_add_skip_reason(self):
         self.result.startTest(self)
         reason = self.getUniqueString()
         self.result.addSkip(self, reason)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'skip',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': {'reason': text_content(reason)}}],
-            self.log)
+        self.assertCalled(
+            status='skip', details={'reason': text_content(reason)})
 
     def test_add_skip_details(self):
         self.result.startTest(self)
         details = {'foo': 'bar'}
         self.result.addSkip(self, details=details)
         self.result.stopTest(self)
-        self.assertEqual(
-            [{'test': self,
-              'status': 'skip',
-              'start_time': 0,
-              'stop_time': 1,
-              'tags': None,
-              'details': details}],
-            self.log)
+        self.assertCalled(status='skip', details=details)
 
     def test_twice(self):
         self.result.startTest(self)