chore(test): update tests for depreciated methods

2 files changed, 54 insertions, 43 deletions

diff --git a/test/drawing/tc_chart.rb b/test/drawing/tc_chart.rb
index 8b69e73a..64a5435b 100644
--- a/test/drawing/tc_chart.rb
+++ b/test/drawing/tc_chart.rb
@@ -6,7 +6,7 @@ class TestChart < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery", :bg_color => "000000"
   end
 
   def teardown
@@ -27,17 +27,30 @@ class TestChart < Test::Unit::TestCase
     assert_equal(@chart.title.cell, @row.cells.first)
   end
 
+  def test_style
+    assert_raise(ArgumentError) { @chart.style = 49 }
+    assert_nothing_raised { @chart.style = 2 }
+    assert_equal(@chart.style, 2)
+  end
+
   def test_to_from_marker_access
     assert(@chart.to.is_a?(Axlsx::Marker))
     assert(@chart.from.is_a?(Axlsx::Marker))
   end
 
-  def test_style
-    assert_raise(ArgumentError) { @chart.style = 49 }
-    assert_nothing_raised { @chart.style = 2 }
-    assert_equal(@chart.style, 2)
+  def test_bg_color
+    assert_raise(ArgumentError) { @chart.bg_color = 2 }
+    assert_nothing_raised { @chart.bg_color = "FFFFFF" }
+    assert_equal(@chart.bg_color, "FFFFFF")
+
   end
-  
+
+  def test_title_size
+    assert_raise(ArgumentError) { @chart.title_size = 2 }
+    assert_nothing_raised { @chart.title_size = "100" }
+    assert_equal(@chart.title.text_size, "100")
+  end
+
   def test_vary_colors
     assert_equal(true, @chart.vary_colors)
     assert_raise(ArgumentError) { @chart.vary_colors = 7 }
@@ -63,7 +76,7 @@ class TestChart < Test::Unit::TestCase
     @chart.start_at [5,6]
     assert_equal(@chart.graphic_frame.anchor.from.col, 5)
     assert_equal(@chart.graphic_frame.anchor.from.row, 6)
-    
+
   end
 
   def test_end_at
@@ -76,7 +89,7 @@ class TestChart < Test::Unit::TestCase
     @chart.end_at [10,11]
     assert_equal(@chart.graphic_frame.anchor.to.col, 10)
     assert_equal(@chart.graphic_frame.anchor.to.row, 11)
-  
+
   end
 
   def test_add_series
@@ -88,13 +101,13 @@ class TestChart < Test::Unit::TestCase
   def test_pn
     assert_equal(@chart.pn, "charts/chart1.xml")
   end
-  
+
   def test_d_lbls
     assert_equal(nil, @chart.instance_values[:d_lbls])
     @chart.d_lbls.d_lbl_pos = :t
     assert(@chart.d_lbls.is_a?(Axlsx::DLbls), 'DLbls instantiated on access')
   end
-  
+
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
     doc = Nokogiri::XML(@chart.to_xml_string)
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 166850e5..c7e963f5 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -93,7 +93,7 @@ class TestWorksheet < Test::Unit::TestCase
     page_setup = {:fit_to_height => 1, :fit_to_width => 1, :orientation => :landscape, :paper_width => "210mm", :paper_height => "297mm", :scale => 80}
     print_options = {:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true}
     header_footer = {:different_first => false, :different_odd_even => false, :odd_header => 'Header'}
-    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :header_footer => header_footer, :selected => true, :show_gridlines => false)
+    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :header_footer => header_footer)
     page_margins.keys.each do |key|
       assert_equal(page_margins[key], optioned.page_margins.send(key))
     end
@@ -107,23 +107,21 @@ class TestWorksheet < Test::Unit::TestCase
       assert_equal(header_footer[key], optioned.header_footer.send(key))
     end
     assert_equal(optioned.name, 'bob')
-    assert_equal(optioned.selected, true)
-    assert_equal(optioned.show_gridlines, false)
 
   end
 
 
-  def test_use_gridlines
-    assert_raise(ArgumentError) { @ws.show_gridlines = -1.1 }
-    assert_nothing_raised { @ws.show_gridlines = false }
-    assert_equal(@ws.show_gridlines, false)
-  end
+  # def test_use_gridlines
+  #  assert_raise(ArgumentError) { @ws.show_gridlines = -1.1 }
+  #  assert_nothing_raised { @ws.show_gridlines = false }
+  #  assert_equal(@ws.show_gridlines, false)
+  # end
 
-  def test_selected
-    assert_raise(ArgumentError) { @ws.selected = -1.1 }
-    assert_nothing_raised { @ws.selected = true }
-    assert_equal(@ws.selected, true)
-  end
+  # def test_selected
+  #  assert_raise(ArgumentError) { @ws.selected = -1.1 }
+  #  assert_nothing_raised { @ws.selected = true }
+  #  assert_equal(@ws.selected, true)
+  # end
 
   def test_rels_pn
     assert_equal(@ws.rels_pn, "worksheets/_rels/sheet1.xml.rels")
@@ -266,11 +264,11 @@ class TestWorksheet < Test::Unit::TestCase
     end
   end
 
-  def test_to_xml_string_fit_to_page
-    @ws.page_setup.fit_to_width = 1
-    doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:pageSetUpPr[@fitToPage=1]').size, 1)
-  end
+  # def test_to_xml_string_fit_to_page
+  #  @ws.page_setup.fit_to_width = 1
+  #  doc = Nokogiri::XML(@ws.to_xml_string)
+  #  assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:pageSetUpPr[@fitToPage=1]').size, 1)
+  # end
 
   def test_to_xml_string_dimensions
     @ws.add_row [1,2,3]
@@ -278,22 +276,22 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:dimension[@ref="A1:C1"]').size, 1)
   end
 
-  def test_fit_to_page_assignation_does_nothing
-    @ws.fit_to_page = true
-    assert_equal(@ws.fit_to_page?, false)
-  end
+  # def test_fit_to_page_assignation_does_nothing
+  #  @ws.fit_to_page = true
+  #  assert_equal(@ws.fit_to_page?, false)
+  # end
 
-  def test_to_xml_string_selected
-    @ws.selected = true
-    doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@tabSelected=1]').size, 1)
-  end
+  # def test_to_xml_string_selected
+  #  @ws.selected = true
+  #  doc = Nokogiri::XML(@ws.to_xml_string)
+  #  assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@tabSelected=1]').size, 1)
+  # end
 
-  def test_to_xml_string_show_gridlines
-    @ws.show_gridlines = false
-    doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@showGridLines=0]').size, 1)
-  end
+  # def test_to_xml_string_show_gridlines
+  #  @ws.show_gridlines = false
+  #  doc = Nokogiri::XML(@ws.to_xml_string)
+  #  assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@showGridLines=0]').size, 1)
+  # end
 
   def test_to_xml_string_auto_fit_data
     @ws.add_row [1, "two"]
@@ -580,7 +578,7 @@ class TestWorksheet < Test::Unit::TestCase
     assert_raise(ArgumentError) { @wb.add_worksheet(:name => 'Sheet1') }
     assert_equal(1, @wb.worksheets.size)
   end
-  
+
   def test_worksheet_only_includes_outline_pr_when_set
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:outlinePr').size, 0)