acpt: rewrite table style scenarios

Steve Canny · Steve Canny · commit 3700d2d8f60a · 2015-02-08T15:38:13.000-08:00
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -89,13 +89,6 @@ def given_a_table_having_alignment_alignment(context, alignment):
     context.table_ = document.tables[table_idx]
 
 
-@given('a table having an applied style')
-def given_a_table_having_an_applied_style(context):
-    docx_path = test_docx('tbl-having-applied-style')
-    document = Document(docx_path)
-    context.table_ = document.tables[0]
-
-
 @given('a table having an autofit layout of {autofit}')
 def given_a_table_having_an_autofit_layout_of_autofit(context, autofit):
     tbl_idx = {
@@ -107,6 +100,18 @@ def given_a_table_having_an_autofit_layout_of_autofit(context, autofit):
     context.table_ = document.tables[tbl_idx]
 
 
+@given('a table having {style} style')
+def given_a_table_having_style(context, style):
+    table_idx = {
+        'no explicit': 0,
+        'Table Grid':  1,
+        'Light Shading - Accent 1': 2,
+    }[style]
+    document = Document(test_docx('tbl-having-applied-style'))
+    context.document = document
+    context.table_ = document.tables[table_idx]
+
+
 @given('a table having two columns')
 def given_a_table_having_two_columns(context):
     docx_path = test_docx('blk-containing-table')
@@ -137,12 +142,6 @@ def when_add_row_to_table(context):
     context.row = table.add_row()
 
 
-@when('I apply a style to the table')
-def when_apply_style_to_table(context):
-    table = context.table_
-    table.style = 'LightShading-Accent1'
-
-
 @when('I assign {value_str} to table.alignment')
 def when_I_assign_value_to_table_alignment(context, value_str):
     value = {
@@ -155,6 +154,18 @@ def when_I_assign_value_to_table_alignment(context, value_str):
     table.alignment = value
 
 
+@when('I assign {value} to table.style')
+def when_apply_value_to_table_style(context, value):
+    table, styles = context.table_, context.document.styles
+    if value == 'None':
+        new_value = None
+    elif value.startswith('styles['):
+        new_value = styles[value.split('\'')[1]]
+    else:
+        new_value = styles[value]
+    table.style = new_value
+
+
 @when('I merge from cell {origin} to cell {other}')
 def when_I_merge_from_cell_origin_to_cell_other(context, origin, other):
     def cell(table, idx):
@@ -217,13 +228,6 @@ def then_can_access_row_collection_of_table(context):
     assert isinstance(rows, _Rows)
 
 
-@then('I can get the table style name')
-def then_can_get_table_style_name(context):
-    table = context.table_
-    msg = "got '%s'" % table.style
-    assert table.style == 'LightShading-Accent1', msg
-
-
 @then('I can iterate over the column collection')
 def then_can_iterate_over_column_collection(context):
     columns = context.columns
@@ -264,6 +268,13 @@ def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
     assert cell_text == expected_text, 'got %s' % cell_text
 
 
+@then('table.style is styles[\'{style_name}\']')
+def then_table_style_is_styles_style_name(context, style_name):
+    table, styles = context.table_, context.document.styles
+    expected_style = styles[style_name]
+    assert table.style == expected_style, "got '%s'" % table.style
+
+
 @then('the column cells text is {expected_text}')
 def then_the_column_cells_text_is_expected_text(context, expected_text):
     table = context.table_
@@ -325,13 +336,6 @@ def then_the_row_cells_text_is_expected_text(context, encoded_text):
     assert cells_text == expected_text, 'got %s' % cells_text
 
 
-@then('the table style matches the name I applied')
-def then_table_style_matches_name_applied(context):
-    table = context.table_
-    tmpl = "table.style doesn't match, got '%s'"
-    assert table.style == 'LightShading-Accent1', tmpl % table.style
-
-
 @then('the table has {count} columns')
 def then_table_has_count_columns(context, count):
     column_count = int(count)
diff --git a/features/steps/test_files/tbl-having-applied-style.docx b/features/steps/test_files/tbl-having-applied-style.docx
diff --git a/features/tbl-style.feature b/features/tbl-style.feature
@@ -1,13 +1,31 @@
 Feature: Query and apply a table style
   In order to maintain consistent formatting of tables
   As a developer using python-docx
-  I need the ability to query and apply a table style
+  I need the ability to get and set the style of a table
 
-  Scenario: Access table style
-     Given a table having an applied style
-      Then I can get the table style name
 
-  Scenario: Apply table style
-     Given a table
-      When I apply a style to the table
-      Then the table style matches the name I applied
+  @wip
+  Scenario Outline: Get the style of a table
+    Given a table having <style> style
+     Then table.style is styles['<value>']
+
+    Examples: Table styles
+      | style                    | value                  |
+      | no explicit              | Normal Table           |
+      | Table Grid               | Table Grid             |
+      | Light Shading - Accent 1 | Light Shading Accent 1 |
+
+
+  @wip
+  Scenario Outline: Apply a table style
+    Given a table having <style> style
+     When I assign <value> to table.style
+     Then table.style is styles['<style-name>']
+
+    Examples: Character style transitions
+      | style       | value                  | style-name   |
+      | no explicit | Table Grid             | Table Grid   |
+      | no explicit | styles['Table Grid']   | Table Grid   |
+      | Table Grid  | Normal Table           | Normal Table |
+      | Table Grid  | styles['Normal Table'] | Normal Table |
+      | Table Grid  | None                   | Normal Table |
