Merge from ‘testscenarios.id_in_description’.

2 files changed, 46 insertions, 8 deletions

diff --git a/lib/testscenarios/scenarios.py b/lib/testscenarios/scenarios.py
index eacd9d2..540285a 100644
--- a/lib/testscenarios/scenarios.py
+++ b/lib/testscenarios/scenarios.py
@@ -38,8 +38,13 @@ def apply_scenario((name, parameters), test):
     :param test: The test to apply the scenario to. This test is unaltered.
     :return: A new test cloned from test, with the scenario applied.
     """
+    scenario_suffix = '(' + name + ')'
     newtest = clone_test_with_new_id(test,
-        test.id() + '(' + name + ')')
+        test.id() + scenario_suffix)
+    test_desc = test.shortDescription()
+    if test_desc is not None:
+        newtest_desc = "%(test_desc)s %(scenario_suffix)s" % vars()
+        newtest.shortDescription = (lambda: newtest_desc)
     for key, value in parameters.iteritems():
         setattr(newtest, key, value)
     return newtest
diff --git a/lib/testscenarios/tests/test_scenarios.py b/lib/testscenarios/tests/test_scenarios.py
index 07db03f..087d987 100644
--- a/lib/testscenarios/tests/test_scenarios.py
+++ b/lib/testscenarios/tests/test_scenarios.py
@@ -107,17 +107,50 @@ class TestGenerateScenarios(testtools.TestCase):
 
 class TestApplyScenario(testtools.TestCase):
 
-    def test_apply_scenario_sets_id_and_attributes(self):
+    def setUp(self):
+        super(TestApplyScenario, self).setUp()
+
+        self.scenario_name = 'demo'
+        self.scenario_attrs = {'foo': 'bar'}
+        self.scenario = (self.scenario_name, self.scenario_attrs)
+
         class ReferenceTest(unittest.TestCase):
             def test_pass(self):
                 pass
-        test = ReferenceTest("test_pass")
-        result = apply_scenario(('demo', {'foo': 'bar'}), test)
-        self.assertEqual(
-            'testscenarios.tests.test_scenarios.ReferenceTest.test_pass(demo)',
-            result.id())
-        self.assertEqual('bar', result.foo)
+            def test_pass_with_docstring(self):
+                """ The test that always passes.
+
+                    This test case has a PEP 257 conformant docstring,
+                    with its first line being a brief synopsis and the
+                    rest of the docstring explaining that this test
+                    does nothing but pass unconditionally.
+
+                    """
+                pass
 
+        self.ReferenceTest = ReferenceTest
+
+    def test_sets_specified_id(self):
+        raw_test = self.ReferenceTest('test_pass')
+        raw_id = "testscenarios.tests.test_scenarios.ReferenceTest.test_pass"
+        scenario_name = self.scenario_name
+        expect_id = "%(raw_id)s(%(scenario_name)s)" % vars()
+        modified_test = apply_scenario(self.scenario, raw_test)
+        self.assertEqual(expect_id, modified_test.id())
+
+    def test_sets_specified_attributes(self):
+        raw_test = self.ReferenceTest('test_pass')
+        modified_test = apply_scenario(self.scenario, raw_test)
+        self.assertEqual('bar', modified_test.foo)
+
+    def test_appends_scenario_name_to_short_description(self):
+        raw_test = self.ReferenceTest('test_pass_with_docstring')
+        modified_test = apply_scenario(self.scenario, raw_test)
+        raw_doc = self.ReferenceTest.test_pass_with_docstring.__doc__
+        raw_desc = raw_doc.split("\n")[0].strip()
+        scenario_name = self.scenario_name
+        expect_desc = "%(raw_desc)s (%(scenario_name)s)" % vars()
+        self.assertEqual(expect_desc, modified_test.shortDescription())
 
 class TestApplyScenarios(testtools.TestCase):