test: reorg fixtures in DescribeDocument

Steve Canny · Steve Canny · commit 9351335236b4 · 2014-06-22T14:10:37.000-07:00
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -167,27 +167,21 @@ def it_creates_styles_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture
+    def add_empty_paragraph_fixture(self, document, document_part_, p_):
+        return document, document_part_, p_
+
     @pytest.fixture(params=[0, 1, 2, 5, 9])
     def add_heading_fixture(self, request, document, add_paragraph_, p_):
         level = request.param
         text = 'Spam vs. Bacon'
         style = 'Title' if level == 0 else 'Heading%d' % level
         return document, add_paragraph_, p_, text, level, style
 
-    @pytest.fixture
-    def add_empty_paragraph_fixture(self, document, document_part_, p_):
-        return document, document_part_, p_
-
     @pytest.fixture
     def add_page_break_fixture(self, document, document_part_, p_, r_):
         return document, document_part_, p_, r_
 
-    @pytest.fixture
-    def add_paragraph_(self, request, p_):
-        return method_mock(
-            request, Document, 'add_paragraph', return_value=p_
-        )
-
     @pytest.fixture(params=[
         (None, None,  200,  100),
         (1000, 500,  1000,  500),
@@ -225,6 +219,41 @@ def add_text_paragraph_fixture(self, document, p_, r_):
         text = 'foobar\rbarfoo'
         return document, text, p_, r_
 
+    @pytest.fixture
+    def init_fixture(self, docx_, open_):
+        return docx_, open_
+
+    @pytest.fixture
+    def num_part_get_fixture(self, document, document_part_, numbering_part_):
+        document_part_.part_related_by.return_value = numbering_part_
+        return document, document_part_, numbering_part_
+
+    @pytest.fixture
+    def open_fixture(self, docx_, Package_, package_, document_part_):
+        return docx_, Package_, package_, document_part_
+
+    @pytest.fixture
+    def paragraphs_fixture(self, document, paragraphs_):
+        return document, paragraphs_
+
+    @pytest.fixture
+    def save_fixture(self, request, open_, package_):
+        file_ = instance_mock(request, str)
+        document = Document()
+        return document, package_, file_
+
+    @pytest.fixture
+    def tables_fixture(self, document, tables_):
+        return document, tables_
+
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def add_paragraph_(self, request, p_):
+        return method_mock(
+            request, Document, 'add_paragraph', return_value=p_
+        )
+
     @pytest.fixture
     def default_docx_(self, request):
         return var_mock(request, 'docx.api._default_docx_path')
@@ -254,10 +283,6 @@ def document_part_(self, request, p_, paragraphs_, table_, tables_):
     def docx_(self, request):
         return instance_mock(request, str)
 
-    @pytest.fixture
-    def init_fixture(self, docx_, open_):
-        return docx_, open_
-
     @pytest.fixture
     def inline_shapes_(self, request):
         return instance_mock(request, InlineShapes)
@@ -268,11 +293,6 @@ def num_part_create_fixture(
         document_part_.part_related_by.side_effect = KeyError
         return document, NumberingPart_, document_part_, numbering_part_
 
-    @pytest.fixture
-    def num_part_get_fixture(self, document, document_part_, numbering_part_):
-        document_part_.part_related_by.return_value = numbering_part_
-        return document, document_part_, numbering_part_
-
     @pytest.fixture
     def NumberingPart_(self, request, numbering_part_):
         NumberingPart_ = class_mock(request, 'docx.api.NumberingPart')
@@ -290,10 +310,6 @@ def open_(self, request, document_part_, package_):
             return_value=(document_part_, package_)
         )
 
-    @pytest.fixture
-    def open_fixture(self, docx_, Package_, package_, document_part_):
-        return docx_, Package_, package_, document_part_
-
     @pytest.fixture
     def p_(self, request, r_):
         p_ = instance_mock(request, Paragraph)
@@ -316,20 +332,10 @@ def package_(self, request, document_part_):
     def paragraphs_(self, request):
         return instance_mock(request, list)
 
-    @pytest.fixture
-    def paragraphs_fixture(self, document, paragraphs_):
-        return document, paragraphs_
-
     @pytest.fixture
     def r_(self, request):
         return instance_mock(request, Run)
 
-    @pytest.fixture
-    def save_fixture(self, request, open_, package_):
-        file_ = instance_mock(request, str)
-        document = Document()
-        return document, package_, file_
-
     @pytest.fixture
     def StylesPart_(self, request, styles_part_):
         StylesPart_ = class_mock(request, 'docx.api.StylesPart')
@@ -358,7 +364,3 @@ def table_(self, request):
     @pytest.fixture
     def tables_(self, request):
         return instance_mock(request, list)
-
-    @pytest.fixture
-    def tables_fixture(self, document, tables_):
-        return document, tables_
