tbl: reimplement _Column.cells

Steve Canny · Steve Canny · commit cbc2d60edf17 · 2014-11-28T21:22:24.000-05:00
diff --git a/docx/table.py b/docx/table.py
@@ -61,6 +61,12 @@ def cell(self, row_idx, col_idx):
         row = self.rows[row_idx]
         return row.cells[col_idx]
 
+    def column_cells(self, column_idx):
+        """
+        Sequence of cells in the column at *column_idx* in this table.
+        """
+        raise NotImplementedError
+
     @lazyproperty
     def columns(self):
         """
@@ -237,6 +243,20 @@ def cells(self):
         """
         return _ColumnCells(self._tbl, self._gridCol, self)
 
+    @property
+    def cells_new(self):
+        """
+        Sequence of |_Cell| instances corresponding to cells in this column.
+        """
+        return tuple(self.table.column_cells(self._index))
+
+    @property
+    def table(self):
+        """
+        Reference to the |Table| object this column belongs to.
+        """
+        raise NotImplementedError
+
     @property
     def width(self):
         """
@@ -249,6 +269,13 @@ def width(self):
     def width(self, value):
         self._gridCol.w = value
 
+    @property
+    def _index(self):
+        """
+        Index of this column in its table, starting from zero.
+        """
+        raise NotImplementedError
+
 
 class _ColumnCells(Parented):
     """
diff --git a/features/steps/table.py b/features/steps/table.py
@@ -216,7 +216,9 @@ def then_table_cell_row_col_text_is_text(context, row, col, expected_text):
 @then('the column cells text is {expected_text}')
 def then_the_column_cells_text_is_expected_text(context, expected_text):
     table = context.table_
-    cells_text = ' '.join(c.text for col in table.columns for c in col.cells)
+    cells_text = ' '.join(
+        c.text for col in table.columns for c in col.cells_new
+    )
     assert cells_text == expected_text, 'got %s' % cells_text
 
 
diff --git a/tests/test_table.py b/tests/test_table.py
@@ -374,10 +374,11 @@ def width_set_fixture(self, request):
 
 class Describe_Column(object):
 
-    def it_provides_access_to_the_column_cells(self):
-        column = _Column(None, None, None)
-        cells = column.cells
-        assert isinstance(cells, _ColumnCells)
+    def it_provides_access_to_its_cells(self, cells_fixture):
+        column, column_idx, expected_cells = cells_fixture
+        cells = column.cells_new
+        column.table.column_cells.assert_called_once_with(column_idx)
+        assert cells == expected_cells
 
     def it_knows_its_width_in_EMU(self, width_get_fixture):
         column, expected_width = width_get_fixture
@@ -391,6 +392,14 @@ def it_can_change_its_width(self, width_set_fixture):
 
     # fixtures -------------------------------------------------------
 
+    @pytest.fixture
+    def cells_fixture(self, _index_, table_prop_, table_):
+        column = _Column(None, None, None)
+        _index_.return_value = column_idx = 4
+        expected_cells = (3, 2, 1)
+        table_.column_cells.return_value = list(expected_cells)
+        return column, column_idx, expected_cells
+
     @pytest.fixture(params=[
         ('w:gridCol{w:w=4242}',   2693670),
         ('w:gridCol{w:w=1440}',    914400),
@@ -416,6 +425,20 @@ def width_set_fixture(self, request):
         expected_xml = xml(expected_cxml)
         return column, new_value, expected_xml
 
+    # fixture components ---------------------------------------------
+
+    @pytest.fixture
+    def _index_(self, request):
+        return property_mock(request, _Column, '_index')
+
+    @pytest.fixture
+    def table_(self, request):
+        return instance_mock(request, Table)
+
+    @pytest.fixture
+    def table_prop_(self, request, table_):
+        return property_mock(request, _Column, 'table', return_value=table_)
+
 
 class Describe_ColumnCells(object):
 
