cleanup worksheet initializer.

3 files changed, 9 insertions, 14 deletions

diff --git a/test/workbook/worksheet/tc_cell.rb b/test/workbook/worksheet/tc_cell.rb
index fccffc64..b91ae3d3 100644
--- a/test/workbook/worksheet/tc_cell.rb
+++ b/test/workbook/worksheet/tc_cell.rb
@@ -197,19 +197,17 @@ class TestCell < Test::Unit::TestCase
   end
 
   def test_merge_with_string
-    assert_equal(@c.row.worksheet.merged_cells.size, 0)
     @c.row.add_cell 2
     @c.row.add_cell 3
     @c.merge "A2"
-    assert_equal(@c.row.worksheet.merged_cells.last, "A1:A2")
+    assert_equal(@c.row.worksheet.send(:merged_cells).last, "A1:A2")
   end
 
   def test_merge_with_cell
-    assert_equal(@c.row.worksheet.merged_cells.size, 0)
     @c.row.add_cell 2
     @c.row.add_cell 3
     @c.merge @row.cells.last
-    assert_equal(@c.row.worksheet.merged_cells.last, "A1:C1")
+    assert_equal(@c.row.worksheet.send(:merged_cells).last, "A1:C1")
   end
 
   def test_ssti
diff --git a/test/workbook/worksheet/tc_protected_range.rb b/test/workbook/worksheet/tc_protected_range.rb
index 6a62f58c..4ae942b3 100644
--- a/test/workbook/worksheet/tc_protected_range.rb
+++ b/test/workbook/worksheet/tc_protected_range.rb
@@ -11,7 +11,6 @@ def test_initialize_options
 end
 
 def test_range
-  assert_equal(0, @ws.protected_ranges.size)
   r = @ws.protect_range('A1:B1')
   assert_equal('A1:B1', r.sqref)
 end
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 9f7529c4..df808025 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -383,29 +383,27 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_protect_range
-    assert(@ws.protected_ranges.is_a?(Axlsx::SimpleTypedList))
-    assert_equal(0, @ws.protected_ranges.size)
+    assert(@ws.send(:protected_ranges).is_a?(Axlsx::SimpleTypedList))
+    assert_equal(0, @ws.send(:protected_ranges).size)
     @ws.protect_range('A1:A3')
-    assert_equal('A1:A3', @ws.protected_ranges.last.sqref)
+    assert_equal('A1:A3', @ws.send(:protected_ranges).last.sqref)
   end
 
   def test_protect_range_with_cells
     @ws.add_row [1, 2, 3]
     assert_nothing_raised {@ws.protect_range(@ws.rows.first.cells) }
-    assert_equal('A1:C1', @ws.protected_ranges.last.sqref)
+    assert_equal('A1:C1', @ws.send(:protected_ranges).last.sqref)
     
   end
   def test_merge_cells
-    assert(@ws.merged_cells.is_a?(Array))
-    assert_equal(@ws.merged_cells.size, 0)
     @ws.add_row [1,2,3]
     @ws.add_row [4,5,6]
     @ws.add_row [7,8,9]
     @ws.merge_cells "A1:A2"
     @ws.merge_cells "B2:C3"
     @ws.merge_cells @ws.rows.last.cells[(0..1)]
-    assert_equal(@ws.merged_cells.size, 3)
-    assert_equal(@ws.merged_cells.last, "A3:B3")
+    assert_equal(@ws.send(:merged_cells).size, 3)
+    assert_equal(@ws.send(:merged_cells).last, "A3:B3")
   end
   
   def test_merge_cells_sorts_correctly_by_row_when_given_array
@@ -413,7 +411,7 @@ class TestWorksheet < Test::Unit::TestCase
       @ws.add_row [i]
     end
     @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
-    assert_equal "A9:A10", @ws.merged_cells.first
+    assert_equal "A9:A10", @ws.send(:merged_cells).first
   end
   
   def test_auto_filter