acpt: migrate doc-access-collections.feature

Steve Canny · Steve Canny · commit 2350c523de52 · 2015-02-15T00:07:50.000-08:00
* Provide a home for testing access to the various collections in a
  document.
* Segregate access to the collection from access to individual items
  in the collection.
diff --git a/features/doc-access-collections.feature b/features/doc-access-collections.feature
@@ -0,0 +1,9 @@
+Feature: Access document collections
+  In order to operate on objects related to a document
+  As a developer using python-docx
+  I need a way to access each of the document's collections
+
+
+  Scenario: Access the inline shapes collection of a document
+     Given a document having inline shapes
+      Then I can access the inline shape collection of the document
diff --git a/features/shp-inline-shape-access.feature b/features/shp-inline-shape-access.feature
@@ -1,18 +1,16 @@
-Feature: Access inline shapes in document
-  In order to query or manipulate inline shapes in a document
+Feature: Access inline shape in inline shape collection
+  In order to operate on an inline shape
   As a developer using python-docx
-  I need the ability to access the inline shapes in a document
+  I need a way to access each inline shape in the inline shape collection
 
-  Scenario: Access inline shapes collection of document
-     Given a document containing five inline shapes
-      Then I can access the inline shape collection of the document
-       And the length of the inline shape collection is 5
 
   Scenario: Access shape in inline shape collection
      Given an inline shape collection containing five shapes
-      Then I can iterate over the inline shape collection
+      Then the length of the inline shape collection is 5
+       And I can iterate over the inline shape collection
        And I can access each inline shape by index
 
+
   Scenario Outline: Identify type of inline shape
      Given an inline shape known to be <shape of type>
       Then its inline shape type is <shape type>
diff --git a/features/steps/document.py b/features/steps/document.py
@@ -10,7 +10,7 @@
 
 from docx import Document
 from docx.enum.section import WD_ORIENT, WD_SECTION
-from docx.parts.document import Sections
+from docx.parts.document import InlineShapes, Sections
 from docx.section import Section
 from docx.shared import Inches
 from docx.table import Table
@@ -25,6 +25,11 @@ def given_a_blank_document(context):
     context.document = Document()
 
 
+@given('a document having inline shapes')
+def given_a_document_having_inline_shapes(context):
+    context.document = Document(test_docx('shp-inline-shape-access'))
+
+
 @given('a document having three sections')
 def given_a_document_having_three_sections(context):
     context.document = Document(test_docx('doc-access-sections'))
@@ -154,6 +159,13 @@ def then_I_can_access_a_section_by_index(context):
         assert isinstance(section, Section)
 
 
+@then('I can access the inline shape collection of the document')
+def then_can_access_inline_shape_collection_of_document(context):
+    document = context.document
+    inline_shapes = document.inline_shapes
+    assert isinstance(inline_shapes, InlineShapes)
+
+
 @then('I can access the section collection of the document')
 def then_I_can_access_the_section_collection_of_the_document(context):
     sections = context.document.sections
diff --git a/features/steps/shape.py b/features/steps/shape.py
@@ -12,22 +12,16 @@
 
 from docx import Document
 from docx.enum.shape import WD_INLINE_SHAPE
-from docx.parts.document import InlineShape, InlineShapes
+from docx.parts.document import InlineShape
 from docx.shared import Inches
 
 from helpers import test_docx, test_file
 
 
 # given ===================================================
 
-@given('a document containing five inline shapes')
-def given_a_document_containing_two_inline_shapes(context):
-    docx_path = test_docx('shp-inline-shape-access')
-    context.document = Document(docx_path)
-
-
 @given('an inline shape collection containing five shapes')
-def given_inline_shape_collection_containing_two_shapes(context):
+def given_an_inline_shape_collection_containing_five_shapes(context):
     docx_path = test_docx('shp-inline-shape-access')
     document = Document(docx_path)
     context.inline_shapes = document.inline_shapes
@@ -89,13 +83,6 @@ def then_can_access_each_inline_shape_by_index(context):
         assert isinstance(inline_shape, InlineShape)
 
 
-@then('I can access the inline shape collection of the document')
-def then_can_access_inline_shape_collection_of_document(context):
-    document = context.document
-    inline_shapes = document.inline_shapes
-    assert isinstance(inline_shapes, InlineShapes)
-
-
 @then('I can iterate over the inline shape collection')
 def then_can_iterate_over_inline_shape_collection(context):
     inline_shapes = context.inline_shapes
@@ -152,7 +139,7 @@ def then_the_document_contains_the_inline_picture(context):
 
 @then('the length of the inline shape collection is 5')
 def then_len_of_inline_shape_collection_is_5(context):
-    inline_shapes = context.document.inline_shapes
+    inline_shapes = context.inline_shapes
     shape_count = len(inline_shapes)
     assert shape_count == 5, 'got %s' % shape_count
 
