acpt: clean up picture-related test steps

Steve Canny · Steve Canny · commit ff0bd9115b59 · 2014-07-11T20:42:49.000-07:00
* rename helpers.test_file_path to test_file
* move picture-related assertions to steps/shape.py
* refactor given_a_run()
diff --git a/features/run-add-content.feature b/features/run-add-content.feature
@@ -3,13 +3,11 @@ Feature: Add content to a run
   As a developer using python-docx
   I need a way to add each of the run content elements to a run
 
-
   Scenario: Add a tab
     Given a run
      When I add a tab
      Then the tab appears at the end of the run
 
-
   Scenario: Assign mixed text to text property
     Given a run
      When I assign mixed text to the text property
diff --git a/features/steps/api.py b/features/steps/api.py
@@ -9,7 +9,7 @@
 from docx.shared import Inches
 from docx.table import Table
 
-from helpers import test_file_path
+from helpers import test_file
 
 
 # when ====================================================
@@ -70,7 +70,7 @@ def when_add_paragraph_without_specifying_text_or_style(context):
 def when_add_picture_specifying_width_and_height(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file_path('monty-truth.png'),
+        test_file('monty-truth.png'),
         width=Inches(1.75), height=Inches(2.5)
     )
 
@@ -79,22 +79,22 @@ def when_add_picture_specifying_width_and_height(context):
 def when_add_picture_specifying_height(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file_path('monty-truth.png'), height=Inches(1.5)
+        test_file('monty-truth.png'), height=Inches(1.5)
     )
 
 
 @when('I add a picture specifying a width of 1.5 inches')
 def when_add_picture_specifying_width(context):
     document = context.document
     context.picture = document.add_picture(
-        test_file_path('monty-truth.png'), width=Inches(1.5)
+        test_file('monty-truth.png'), width=Inches(1.5)
     )
 
 
 @when('I add a picture specifying only the image file')
 def when_add_picture_specifying_only_image_file(context):
     document = context.document
-    context.picture = document.add_picture(test_file_path('monty-truth.png'))
+    context.picture = document.add_picture(test_file('monty-truth.png'))
 
 
 # then =====================================================
@@ -149,37 +149,6 @@ def then_last_p_is_empty_paragraph_added(context):
     assert p.text == ''
 
 
-@then('the picture has its native width and height')
-def then_picture_has_native_width_and_height(context):
-    picture = context.picture
-    assert picture.width == 1905000, 'got %d' % picture.width
-    assert picture.height == 2717800, 'got %d' % picture.height
-
-
-@then('the picture height is 2.14 inches')
-def then_picture_height_is_value_2(context):
-    picture = context.picture
-    assert picture.height == 1956816, 'got %d' % picture.height
-
-
-@then('the picture height is 2.5 inches')
-def then_picture_height_is_value(context):
-    picture = context.picture
-    assert picture.height == 2286000, 'got %d' % picture.height
-
-
-@then('the picture width is 1.05 inches')
-def then_picture_width_is_value_2(context):
-    picture = context.picture
-    assert picture.width == 961402, 'got %d' % picture.width
-
-
-@then('the picture width is 1.75 inches')
-def then_picture_width_is_value(context):
-    picture = context.picture
-    assert picture.width == 1600200, 'got %d' % picture.width
-
-
 @then('the style of the last paragraph is \'{style}\'')
 def then_style_of_last_paragraph_is_style(context, style):
     document = context.document
diff --git a/features/steps/helpers.py b/features/steps/helpers.py
@@ -26,7 +26,7 @@ def test_docx(name):
     return absjoin(thisdir, 'test_files', '%s.docx' % name)
 
 
-def test_file_path(name):
+def test_file(name):
     """
     Return the absolute path to file with *name* in test_files directory
     """
diff --git a/features/steps/image.py b/features/steps/image.py
@@ -10,14 +10,14 @@
 
 from docx.image.image import Image
 
-from helpers import test_file_path
+from helpers import test_file
 
 
 # given ===================================================
 
 @given('the image file \'{filename}\'')
 def given_image_filename(context, filename):
-    context.image_path = test_file_path(filename)
+    context.image_path = test_file(filename)
 
 
 # when ====================================================
diff --git a/features/steps/shape.py b/features/steps/shape.py
@@ -15,7 +15,7 @@
 from docx.parts.document import InlineShape, InlineShapes
 from docx.shared import Inches
 
-from helpers import test_docx, test_file_path
+from helpers import test_docx, test_file
 
 
 # given ===================================================
@@ -59,7 +59,7 @@ def given_inline_shape_known_to_be_shape_of_type(context, shp_of_type):
 def when_add_inline_picture_from_file_like_object(context):
     document = context.document
     run = document.add_paragraph().add_run()
-    with open(test_file_path('monty-truth.png'), 'rb') as f:
+    with open(test_file('monty-truth.png'), 'rb') as f:
         context.inline_shape = document.inline_shapes.add_picture(f, run)
 
 
@@ -68,7 +68,7 @@ def when_add_inline_picture_to_document(context):
     document = context.document
     run = document.add_paragraph().add_run()
     context.inline_shape = (document.inline_shapes.add_picture(
-        test_file_path('monty-truth.png'), run
+        test_file('monty-truth.png'), run
     ))
 
 
@@ -155,3 +155,34 @@ def then_len_of_inline_shape_collection_is_5(context):
     inline_shapes = context.document.inline_shapes
     shape_count = len(inline_shapes)
     assert shape_count == 5, 'got %s' % shape_count
+
+
+@then('the picture has its native width and height')
+def then_picture_has_native_width_and_height(context):
+    picture = context.picture
+    assert picture.width == 1905000, 'got %d' % picture.width
+    assert picture.height == 2717800, 'got %d' % picture.height
+
+
+@then('the picture height is 2.14 inches')
+def then_picture_height_is_value_2(context):
+    picture = context.picture
+    assert picture.height == 1956816, 'got %d' % picture.height
+
+
+@then('the picture height is 2.5 inches')
+def then_picture_height_is_value(context):
+    picture = context.picture
+    assert picture.height == 2286000, 'got %d' % picture.height
+
+
+@then('the picture width is 1.05 inches')
+def then_picture_width_is_value_2(context):
+    picture = context.picture
+    assert picture.width == 961402, 'got %d' % picture.width
+
+
+@then('the picture width is 1.75 inches')
+def then_picture_width_is_value(context):
+    picture = context.picture
+    assert picture.width == 1600200, 'got %d' % picture.width
diff --git a/features/steps/text.py b/features/steps/text.py
@@ -21,8 +21,9 @@
 
 @given('a run')
 def given_a_run(context):
-    p = Document().add_paragraph()
-    context.run = p.add_run()
+    document = Document()
+    run = document.add_paragraph().add_run()
+    context.run = run
 
 
 @given('a run having {bool_prop_name} set on')
