TestWithScenarios.run now sets attributes too, and includes some docstring docs.

2 files changed, 41 insertions, 1 deletions

diff --git a/lib/testscenarios/testcase.py b/lib/testscenarios/testcase.py
index 0b8898c..ec27e39 100644
--- a/lib/testscenarios/testcase.py
+++ b/lib/testscenarios/testcase.py
@@ -26,7 +26,14 @@ import unittest
 from testtools.testcase import clone_test_with_new_id
 
 class TestWithScenarios(unittest.TestCase):
-    """A TestCase with support for scenarios via a scenarios attribute."""
+    """A TestCase with support for scenarios via a scenarios attribute.
+    
+    When a test object which is an instance of TestWithScenarios is run,
+    and there is a non-empty scenarios attribute on the object, the test is
+    multiplied by the run method into one test per scenario. For this to work
+    reliably the TestWithScenarios.run method must not be overriden in a
+    subclass (or overridden compatibly with TestWithScenarios).
+    """
 
     def run(self, result=None):
         scenarios = getattr(self, 'scenarios', None)
@@ -35,6 +42,8 @@ class TestWithScenarios(unittest.TestCase):
                 newtest = clone_test_with_new_id(self,
                     self.id() + '(' + name + ')')
                 newtest.scenarios = None
+                for key, value in parameters.iteritems():
+                    setattr(newtest, key, value)
                 newtest.run(result)
             return
         else:
diff --git a/lib/testscenarios/tests/test_testcase.py b/lib/testscenarios/tests/test_testcase.py
index 9cfd724..5b86e24 100644
--- a/lib/testscenarios/tests/test_testcase.py
+++ b/lib/testscenarios/tests/test_testcase.py
@@ -67,3 +67,34 @@ class TestTestWithScenarios(unittest.TestCase):
         self.assertEqual(
             'testscenarios.tests.test_testcase.ReferenceTest.test_pass(2)',
             log[4][1].id())
+
+    def test_attributes_set(self):
+        class ReferenceTest(testscenarios.TestWithScenarios):
+            scenarios = [
+                ('1', {'foo': 1, 'bar': 2}),
+                ('2', {'foo': 2, 'bar': 4})]
+            def test_check_foo(self):
+                self.assertEqual(self.foo * 2, self.bar)
+        test = ReferenceTest("test_check_foo")
+        log = []
+        result = LoggingResult(log)
+        test.run(result)
+        self.assertTrue(result.wasSuccessful())
+        self.assertEqual(2, result.testsRun)
+
+    def test_scenarios_attribute_cleared(self):
+        class ReferenceTest(testscenarios.TestWithScenarios):
+            scenarios = [
+                ('1', {'foo': 1, 'bar': 2}),
+                ('2', {'foo': 2, 'bar': 4})]
+            def test_check_foo(self):
+                self.assertEqual(self.foo * 2, self.bar)
+        test = ReferenceTest("test_check_foo")
+        log = []
+        result = LoggingResult(log)
+        test.run(result)
+        self.assertTrue(result.wasSuccessful())
+        self.assertEqual(2, result.testsRun)
+        self.assertNotEqual(None, test.scenarios)
+        self.assertEqual(None, log[0][1].scenarios)
+        self.assertEqual(None, log[4][1].scenarios)