acpt: rewrite run style scenarios

Steve Canny · Steve Canny · commit a346cd700173 · 2015-02-08T00:26:27.000-08:00
... to accommodate new Run.style property interface
diff --git a/features/par-add-run.feature b/features/par-add-run.feature
@@ -3,12 +3,15 @@ Feature: Add a run with optional text and style
   As a python-docx programmer
   I want a way to add a styled run of text in a single step
 
+
   Scenario: Add a run specifying its text
     Given a paragraph
      When I add a run specifying its text
      Then the run contains the text I specified
 
+
+  @wip
   Scenario: Add a run specifying its style
     Given a paragraph
      When I add a run specifying the character style Emphasis
-     Then the style of the run is Emphasis
+     Then run.style is styles['Emphasis']
diff --git a/features/run-char-style.feature b/features/run-char-style.feature
@@ -4,26 +4,28 @@ Feature: Each run has a read/write style
   I need the ability to get and set the character style of a run
 
 
+  @wip
   Scenario Outline: Get the character style of a run
-    Given a run having style <char style>
-     Then the style of the run is <char style>
+    Given a run having <style> style
+     Then run.style is styles['<value>']
 
     Examples: Character styles
-      | char style |
-      | None       |
-      | Emphasis   |
-      | Strong     |
+      | style       | value                  |
+      | no explicit | Default Paragraph Font |
+      | Emphasis    | Emphasis               |
+      | Strong      | Strong                 |
 
 
+  @wip
   Scenario Outline: Set the style of a run
-    Given a run having style <char style>
-     When I set the character style of the run to <new char style>
-     Then the style of the run is <new char style>
+    Given a run having <style> style
+     When I assign <value> to run.style
+     Then run.style is styles['<style-name>']
 
     Examples: Character style transitions
-      | char style | new char style |
-      | None       | None           |
-      | None       | Emphasis       |
-      | Emphasis   | None           |
-      | Emphasis   | Emphasis       |
-      | Emphasis   | Strong         |
+      | style       | value              | style-name             |
+      | no explicit | Emphasis           | Emphasis               |
+      | no explicit | styles['Emphasis'] | Emphasis               |
+      | Emphasis    | Strong             | Strong                 |
+      | Emphasis    | styles['Strong']   | Strong                 |
+      | Strong      | None               | Default Paragraph Font |
diff --git a/features/steps/text.py b/features/steps/text.py
@@ -173,12 +173,14 @@ def given_a_run_having_underline_type(context, underline_type):
     context.run = document.paragraphs[0].runs[run_idx]
 
 
-@given('a run having style {char_style}')
-def given_a_run_having_style_char_style(context, char_style):
+@given('a run having {style} style')
+def given_a_run_having_style(context, style):
     run_idx = {
-        'None': 0, 'Emphasis': 1, 'Strong': 2
-    }[char_style]
-    document = Document(test_docx('run-char-style'))
+        'no explicit': 0,
+        'Emphasis':    1,
+        'Strong':      2,
+    }[style]
+    context.document = document = Document(test_docx('run-char-style'))
     context.run = document.paragraphs[0].runs[run_idx]
 
 
@@ -361,19 +363,23 @@ def when_assign_true_to_bool_run_prop(context, value_str, bool_prop_name):
     setattr(run, bool_prop_name, value)
 
 
+@when('I assign {value} to run.style')
+def when_I_assign_value_to_run_style(context, value):
+    if value == 'None':
+        new_value = None
+    elif value.startswith('styles['):
+        new_value = context.document.styles[value.split('\'')[1]]
+    else:
+        new_value = context.document.styles[value]
+
+    context.run.style = new_value
+
+
 @when('I clear the run')
 def when_I_clear_the_run(context):
     context.run.clear()
 
 
-@when('I set the character style of the run to {char_style}')
-def when_I_set_the_character_style_of_the_run(context, char_style):
-    style_value = {
-        'None': None, 'Emphasis': 'Emphasis', 'Strong': 'Strong'
-    }[char_style]
-    context.run.style = style_value
-
-
 @when('I set the run underline to {underline_value}')
 def when_I_set_the_run_underline_to_value(context, underline_value):
     new_value = {
@@ -521,6 +527,13 @@ def then_run_font_is_the_Font_object_for_the_run(context):
     assert font.element is run.element
 
 
+@then('run.style is styles[\'{style_name}\']')
+def then_run_style_is_style(context, style_name):
+    expected_value = context.document.styles[style_name]
+    run = context.run
+    assert run.style == expected_value, 'got %s' % run.style
+
+
 @then('the last item in the run is a break')
 def then_last_item_in_run_is_a_break(context):
     run = context.run
@@ -591,14 +604,6 @@ def then_the_run_underline_property_value_is(context, underline_value):
     assert context.run.underline == expected_value
 
 
-@then('the style of the run is {char_style}')
-def then_the_style_of_the_run_is_char_style(context, char_style):
-    expected_value = {
-        'None': None, 'Emphasis': 'Emphasis', 'Strong': 'Strong'
-    }[char_style]
-    assert context.run.style == expected_value
-
-
 @then('the tab appears at the end of the run')
 def then_the_tab_appears_at_the_end_of_the_run(context):
     r = context.run._r
