axlsx 1.1.3 → 1.2.0

data/test/stylesheet/tc_pattern_fill.rb

@@ -33,5 +33,11 @@ class TestPatternFill < Test::Unit::TestCase
     assert_nothing_raised { @item.patternType = :lightUp }
     assert_equal(@item.patternType, :lightUp)
   end
-
+ 
+  def test_to_xml_string
+    @item = Axlsx::PatternFill.new :bgColor => Axlsx::Color.new(:rgb => "FF0000"), :fgColor => Axlsx::Color.new(:rgb=>"00FF00") 
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath('//color[@rgb="FFFF0000"]'))
+    assert(doc.xpath('//color[@rgb="FF00FF00"]'))
+  end
 end

data/test/stylesheet/tc_styles.rb

@@ -19,7 +19,7 @@ class TestStyles < Test::Unit::TestCase
   end
   def test_add_style_border_hash
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
     assert_equal(@styles.borders.size, border_count + 1)
     assert_equal(@styles.borders.last.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"} }
@@ -27,7 +27,7 @@ class TestStyles < Test::Unit::TestCase
   end
 
   def test_add_style_border_edges
-    s = @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
+    @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
     parts = @styles.borders.last.prs
     parts.each { |pr| assert_equal(pr.color.rgb, "0000FFFF", "Style is applied to #{pr.name} properly") }
     assert((parts.map { |pr| pr.name.to_s }.sort && ['bottom', 'top']).size == 2, "specify two edges, and you get two border prs")
@@ -44,7 +44,6 @@ class TestStyles < Test::Unit::TestCase
   def test_parse_num_fmt
     f_code = {:format_code => "YYYY/MM"}
     num_fmt = {:num_fmt => 5}
-    both = { :format_code => "#000", :num_fmt => 0 }
     assert_equal(@styles.parse_num_fmt_options, nil, 'noop if neither :format_code or :num_fmt exist')
     max = @styles.numFmts.map{ |nf| nf.numFmtId }.max
     @styles.parse_num_fmt_options(f_code)
@@ -181,7 +180,7 @@ class TestStyles < Test::Unit::TestCase
 
   def test_basic_add_style_dxf
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}, :type => :dxf
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}, :type => :dxf
     assert_equal(@styles.borders.size, border_count, "styles borders not affected")
     assert_equal(@styles.dxfs.last.border.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"}, :type => :dxf }

data/test/stylesheet/tc_table_style.rb

@@ -13,6 +13,10 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.name, "fisher")
     assert_equal(@item.pivot, nil)
     assert_equal(@item.table, nil)
+    ts = Axlsx::TableStyle.new 'price', :pivot => true, :table => true
+    assert_equal(ts.name, 'price')
+    assert_equal(ts.pivot, true)
+    assert_equal(ts.table, true)
   end
 
   def test_name
@@ -33,4 +37,8 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.table, true)
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath("//tableStyle[@name='#{@item.name}']"))
+  end
 end

data/test/stylesheet/tc_table_style_element.rb

@@ -13,6 +13,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_equal(@item.type, nil)
     assert_equal(@item.size, nil)
     assert_equal(@item.dxfId, nil)
+    options = { :type => :headerRow, :size => 10, :dxfId => 1 }
+
+    tse = Axlsx::TableStyleElement.new options
+    options.each { |key, value| assert_equal(tse.send(key.to_sym), value) }
   end
 
   def test_type
@@ -32,5 +36,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_nothing_raised { @item.dxfId = 7 }
     assert_equal(@item.dxfId, 7)
   end
-
+  
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+   @item.type = :headerRow
+    assert(doc.xpath("//tableStyleElement[@type='#{@item.type.to_s}']"))
+  end
 end

data/test/tc_helper.rb

@@ -1,3 +1,4 @@
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
+require 'cover_me' unless RUBY_VERSION == '1.8.7'
 require 'test/unit'
 require "axlsx.rb"

data/test/tc_package.rb

@@ -1,13 +1,78 @@
+# encoding: UTF-8
 require 'tc_helper.rb'
 
 class TestPackage < Test::Unit::TestCase
   def setup
     @package = Axlsx::Package.new
     ws = @package.workbook.add_worksheet
-    chart = ws.add_chart Axlsx::Pie3DChart
-    chart.add_series :data=>[1,2,3], :labels=>["a", "b", "c"]
+    ws.add_row ['Can', 'we', 'build it?']
+    ws.add_row ['Yes!', 'We', 'can!']
+    ws.workbook.add_defined_name("#{ws.name}!A1:C2", :name => '_xlnm.Print_Titles', :hidden => true)
+    ws.protect_range('A1:C1')
+    ws.protect_range(ws.rows.last.cells)
+    ws.add_comment :author => 'alice', :text => 'Hi Bob', :ref => 'A12'
+    ws.add_comment :author => 'bob', :text => 'Hi Alice', :ref => 'F19'
+    ws.sheet_view do |vs|
+      vs.pane do |p|
+        p.active_pane = :top_right
+        p.state = :split
+        p.x_split = 11080
+        p.y_split = 5000
+        p.top_left_cell = 'C44'
+      end
+
+      vs.add_selection(:top_left, { :active_cell => 'A2', :sqref => 'A2' })
+      vs.add_selection(:top_right, { :active_cell => 'I10', :sqref => 'I10' })
+      vs.add_selection(:bottom_left, { :active_cell => 'E55', :sqref => 'E55' })
+      vs.add_selection(:bottom_right, { :active_cell => 'I57', :sqref => 'I57' })
+    end
+
+    ws.add_chart(Axlsx::Pie3DChart, :title => "これは？", :start_at => [0,3]) do |chart|
+      chart.add_series :data=>[1,2,3], :labels=>["a", "b", "c"]
+      chart.d_lbls.show_val = true
+      chart.d_lbls.d_lbl_pos = :outEnd
+      chart.d_lbls.show_percent = true
+    end
+
+    ws.add_chart(Axlsx::Line3DChart, :title => "axis labels") do |chart|
+      chart.valAxis.title = 'bob'
+      chart.d_lbls.show_val = true
+    end 
+    
+    ws.add_chart(Axlsx::Bar3DChart, :title => 'bar chart') do |chart|
+      chart.add_series :data => [1,4,5], :labels => %w(A B C)
+      chart.d_lbls.show_percent = true
+    end
+
+    ws.add_chart(Axlsx::ScatterChart, :title => 'scat man') do |chart|
+      chart.add_series :xData => [1,2,3,4], :yData => [4,3,2,1] 
+      chart.d_lbls.show_val = true
+    end
+
     @fname = 'axlsx_test_serialization.xlsx'
+    img = File.expand_path('../../examples/image1.jpeg', __FILE__)
+    ws.add_image(:image_src => img, :noSelect => true, :noMove => true, :hyperlink=>"http://axlsx.blogspot.com") do |image|
+      image.width=720
+      image.height=666
+      image.hyperlink.tooltip = "Labeled Link"
+      image.start_at 5, 5
+    end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.gif', __FILE__) do |image|
+      image.start_at 0, 20
+      image.width=360
+      image.height=333 
+    end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.png', __FILE__) do |image|
+      image.start_at 9, 20
+      image.width = 180
+      image.height = 167
+    end
+    ws.add_table 'A1:C1'
+  end
 
+  def test_use_autowidth
+    @package.use_autowidth = false
+    assert(@package.workbook.use_autowidth == false)
   end
 
   def test_core_accessor
@@ -35,30 +100,26 @@ class TestPackage < Test::Unit::TestCase
   end
 
   def test_serialization
-    fname = 'axlsx_test_serialization.xlsx'
     assert_nothing_raised do
       begin
-         z= @package.serialize(@fname)
-         zf = Zip::ZipFile.open(@fname)
-         @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
-         File.delete(@fname)
+        @package.serialize(@fname)
+        zf = Zip::ZipFile.open(@fname)
+        @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
+        File.delete(@fname)
       rescue Errno::EACCES
-         puts "WARNING:: test_serialization requires write access."
+        puts "WARNING:: test_serialization requires write access."
       end
-     end
-   end
+    end
+  end
 
   def test_validation
     assert_equal(@package.validate.size, 0, @package.validate)
-    #how to test for failure? the internal validations on the models are so strict I cant break anthing.....
+    Axlsx::Workbook.send(:class_variable_set, :@@date1904, 9900)
+    assert(@package.validate.size > 0)
   end
 
   def test_parts
     p = @package.send(:parts)
-    p.each do |part|
-      #all parts must have :doc, :entry, :schema
-      assert(part.keys.size == 3 && part.keys.reject{ |k| [:doc, :entry, :schema].include? k}.empty?)
-    end
     #all parts have an entry
     assert_equal(p.select{ |part| part[:entry] =~ /_rels\/\.rels/ }.size, 1, "rels missing")
     assert_equal(p.select{ |part| part[:entry] =~ /docProps\/core\.xml/ }.size, 1, "core missing")
@@ -72,9 +133,11 @@ class TestPackage < Test::Unit::TestCase
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/charts\/chart\d\.xml/ }.size, @package.workbook.charts.size, "one or more charts missing")
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/worksheets\/sheet\d\.xml/ }.size, @package.workbook.worksheets.size, "one or more sheet missing")
     assert_equal(p.select{ |part| part[:entry] =~ /xl\/worksheets\/_rels\/sheet\d\.xml\.rels/ }.size, @package.workbook.worksheets.size, "one or more sheet rels missing")
+    assert_equal(p.select{ |part| part[:entry] =~ /xl\/comments\d\.xml/ }.size, @package.workbook.worksheets.size, "one or more sheet rels missing")
+
 
     #no mystery parts
-    assert_equal(p.size, 12)
+    assert_equal(p.size, 21)
 
   end
 
@@ -102,11 +165,24 @@ class TestPackage < Test::Unit::TestCase
   def test_content_type_added_with_shared_strings
     @package.use_shared_strings = true
     ct = @package.send(:content_types)
-    assert(ct.select { |ct| ct.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
+    assert(ct.select { |type| type.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
   end
 
   def test_name_to_indices
     assert(Axlsx::name_to_indices('A1') == [0,0])
     assert(Axlsx::name_to_indices('A100') == [0,99], 'needs to axcept rows that contain 0')
   end
+
+  def test_to_stream
+    stream = @package.to_stream
+    assert(stream.is_a?(StringIO))
+    # this is just a roundabout guess for a package as it is build now
+    # in testing.
+    assert(stream.size > 80000)
+  end
+
+  def test_encrypt
+    # this is no where near close to ready yet
+    assert(@package.encrypt('your_mom.xlsxl', 'has a password') == false)
+  end
 end

data/test/util/tc_simple_typed_list.rb

@@ -61,5 +61,18 @@ class TestSimpleTypedList < Test::Unit::TestCase
     assert_nothing_raised { @list.delete 0 }
     assert_nothing_raised { @list.delete 9 }
   end
+  
+  def test_delete
+    @list.push 1
+    assert(@list.size == 1)
+    @list.delete 1
+    assert(@list.empty?)
+  end
 
+  def test_equality
+    @list.push 1
+    @list.push 2
+    assert_equal(@list, [1,2])
+    
+  end
 end

data/test/util/tc_validators.rb

@@ -8,15 +8,15 @@ class TestValidators < Test::Unit::TestCase
   def test_validators
     #unsigned_int
     assert_nothing_raised { Axlsx.validate_unsigned_int 1 }
-    assert_nothing_raised { Axlsx.validate_unsigned_int +1 }
-    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int -1 }
-    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int '1' }
+    assert_nothing_raised { Axlsx.validate_unsigned_int(+1) }
+    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int(-1)}
+    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int('1') }
 
     #int
-    assert_nothing_raised { Axlsx.validate_int 1 }
-    assert_nothing_raised { Axlsx.validate_int -1 }
-    assert_raise(ArgumentError) { Axlsx.validate_int 'a' }
-    assert_raise(ArgumentError) { Axlsx.validate_int Array }
+    assert_nothing_raised { Axlsx.validate_int(1) }
+    assert_nothing_raised { Axlsx.validate_int(-1) }
+    assert_raise(ArgumentError) { Axlsx.validate_int('a')}
+    assert_raise(ArgumentError) { Axlsx.validate_int(Array) }
 
     #boolean (as 0 or 1, :true, :false, true, false, or "true," "false")
     [0,1,:true, :false, true, false, "true", "false"].each do |v|
@@ -70,6 +70,92 @@ class TestValidators < Test::Unit::TestCase
     assert_raise(ArgumentError) { Axlsx.validate_relationship_type "http://some.url" }
     assert_raise(ArgumentError) { Axlsx.validate_relationship_type false }
 
-  end
-end
+    #number_with_unit
+    assert_nothing_raised { Axlsx.validate_number_with_unit "210mm" }
+    assert_nothing_raised { Axlsx.validate_number_with_unit "8.5in" }
+    assert_nothing_raised { Axlsx.validate_number_with_unit "29.7cm" }
+    assert_nothing_raised { Axlsx.validate_number_with_unit "120pt" }
+    assert_nothing_raised { Axlsx.validate_number_with_unit "0pc" }
+    assert_nothing_raised { Axlsx.validate_number_with_unit "12.34pi" }
+    assert_raise(ArgumentError) { Axlsx.validate_number_with_unit nil }
+    assert_raise(ArgumentError) { Axlsx.validate_number_with_unit "210" }
+    assert_raise(ArgumentError) { Axlsx.validate_number_with_unit 210 }
+    assert_raise(ArgumentError) { Axlsx.validate_number_with_unit "mm" }
+    assert_raise(ArgumentError) { Axlsx.validate_number_with_unit "-29cm" }
 
+    #scale_10_400
+    assert_nothing_raised { Axlsx.validate_scale_10_400 10 }
+    assert_nothing_raised { Axlsx.validate_scale_10_400 100 }
+    assert_nothing_raised { Axlsx.validate_scale_10_400 400 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_10_400 9 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_10_400 10.0 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_10_400 400.1 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_10_400 "99" }
+    
+    #scale_0_10_400
+    assert_nothing_raised { Axlsx.validate_scale_0_10_400 0 }
+    assert_nothing_raised { Axlsx.validate_scale_0_10_400 10 }
+    assert_nothing_raised { Axlsx.validate_scale_0_10_400 100 }
+    assert_nothing_raised { Axlsx.validate_scale_0_10_400 400 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_0_10_400 9 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_0_10_400 10.0 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_0_10_400 400.1 }
+    assert_raise(ArgumentError) { Axlsx.validate_scale_0_10_400 "99" }
+    
+    #page_orientation
+    assert_nothing_raised { Axlsx.validate_page_orientation :default }
+    assert_nothing_raised { Axlsx.validate_page_orientation :landscape }
+    assert_nothing_raised { Axlsx.validate_page_orientation :portrait }
+    assert_raise(ArgumentError) { Axlsx.validate_page_orientation nil }
+    assert_raise(ArgumentError) { Axlsx.validate_page_orientation 1 }
+    assert_raise(ArgumentError) { Axlsx.validate_page_orientation "landscape" }
+    
+    #data_validation_error_style
+    [:information, :stop, :warning].each do |sym|
+      assert_nothing_raised { Axlsx.validate_data_validation_error_style sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 'warning' }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 0 }
+    
+    #data_validation_operator
+    [:lessThan, :lessThanOrEqual, :equal, :notEqual, :greaterThanOrEqual, :greaterThan, :between, :notBetween].each do |sym|
+      assert_nothing_raised { Axlsx.validate_data_validation_operator sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 'lessThan' }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 0 }
+    
+    #data_validation_type
+    [:custom, :data, :decimal, :list, :none, :textLength, :time, :whole].each do |sym|
+      assert_nothing_raised { Axlsx.validate_data_validation_type sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 'decimal' }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 0 }
+    
+    #sheet_view_type
+    [:normal, :page_break_preview, :page_layout].each do |sym|
+      assert_nothing_raised { Axlsx.validate_sheet_view_type sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 'page_layout' }
+    assert_raise(ArgumentError) { Axlsx.validate_data_validation_error_style 0 }
+    
+    #active_pane_type
+    [:bottom_left, :bottom_right, :top_left, :top_right].each do |sym|
+      assert_nothing_raised { Axlsx.validate_pane_type sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_pane_type :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_pane_type 'bottom_left' }
+    assert_raise(ArgumentError) { Axlsx.validate_pane_type 0 }
+    
+    #split_state_type
+    [:frozen, :frozen_split, :split].each do |sym|
+      assert_nothing_raised { Axlsx.validate_split_state_type sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_split_state_type :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_split_state_type 'frozen_split' }
+    assert_raise(ArgumentError) { Axlsx.validate_split_state_type 0 }
+  end
+end

data/test/workbook/tc_defined_name.rb

@@ -0,0 +1,41 @@
+require 'tc_helper'
+
+class TestDefinedNames < Test::Unit::TestCase
+  def setup 
+    @dn = Axlsx::DefinedName.new('Sheet1!A1:A1')
+  end
+
+  def test_initialize
+    assert_equal('Sheet1!A1:A1', @dn.formula)
+  end
+  
+  def test_string_attributes
+    Axlsx::DefinedName::STRING_ATTRIBUTES.each do |attr|
+      assert_raise(ArgumentError, 'only strings allowed in string attributes') { @dn.send("#{attr}=", 1) }
+      assert_nothing_raised { @dn.send("#{attr}=", '_xlnm.Sheet_Title') }
+    end
+  end
+
+  def test_boolean_attributes
+   Axlsx::DefinedName::BOOLEAN_ATTRIBUTES.each do |attr|
+      assert_raise(ArgumentError, 'only booleanish allowed in string attributes') { @dn.send("#{attr}=", 'foo') }
+      assert_nothing_raised { @dn.send("#{attr}=", 1) }
+    end
+
+  end
+
+  def test_local_sheet_id
+    assert_raise(ArgumentError, 'local_sheet_id must be an unsigned int') { @dn.local_sheet_id = -1 }
+    assert_nothing_raised { @dn.local_sheet_id = 1 }
+  end
+
+  def test_to_xml_string
+    assert_raise(ArgumentError, 'name is required for serialization') { @dn.to_xml_string }
+    @dn.name = '_xlnm.Print_Titles'
+    @dn.hidden = true
+    doc = Nokogiri::XML(@dn.to_xml_string)
+    assert(doc.xpath("//definedName[@name='_xlnm.Print_Titles']"))
+    assert(doc.xpath("//definedName[@hidden='true']"))
+    assert_equal('Sheet1!A1:A1', doc.xpath('//definedName').text)
+  end
+end

data/test/workbook/tc_workbook.rb

@@ -24,7 +24,10 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(Axlsx::Workbook.date1904, @wb.date1904)
   end
 
-
+  def test_add_defined_name
+    @wb.add_defined_name 'Sheet1!1:1', :name => '_xlnm.Print_Titles', :hidden => true
+    assert_equal(1, @wb.defined_names.size)
+  end
 
   def test_shared_strings
     assert_equal(@wb.use_shared_strings, nil)
@@ -72,14 +75,13 @@ class TestWorkbook < Test::Unit::TestCase
     assert(@wb.worksheets.size == 1)
   end
 
-
   def test_to_xml_string_defined_names
     @wb.add_worksheet do |sheet|
       sheet.add_row [1, "two"]
       sheet.auto_filter = "A1:B1"
     end
     doc = Nokogiri::XML(@wb.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:workbook/xmlns:definedNames/xmlns:definedName').inner_text, @wb.worksheets[0].abs_auto_filter)
+    assert_equal(doc.xpath('//xmlns:workbook/xmlns:definedNames/xmlns:definedName').inner_text, @wb.worksheets[0].auto_filter.defined_name)
   end
 
 

data/test/workbook/worksheet/table/tc_table.rb

@@ -25,26 +25,18 @@ class TestTable < Test::Unit::TestCase
 
   end
 
-  def test_charts
-    assert(@ws.drawing.charts.empty?)
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
-    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
-    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
-  end
-
   def test_pn
-    table = @ws.add_table("A1:D5")
+    @ws.add_table("A1:D5")
     assert_equal(@ws.tables.first.pn, "tables/table1.xml")
   end
 
   def test_rId
-    table = @ws.add_table("A1:D5")
+    @ws.add_table("A1:D5")
     assert_equal(@ws.tables.first.rId, "rId1")
   end
 
   def test_index
-    table = @ws.add_table("A1:D5")
+    @ws.add_table("A1:D5")
     assert_equal(@ws.tables.first.index, @ws.workbook.tables.index(@ws.tables.first))
   end
 

data/test/workbook/worksheet/tc_cell.rb

@@ -33,7 +33,7 @@ class TestCell < Test::Unit::TestCase
     assert_equal(@c.index, @row.cells.index(@c))
   end
 
-  def test_index
+  def test_pos
     assert_equal(@c.pos, [@c.index, @c.row.index])
   end
 
@@ -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
@@ -244,9 +242,35 @@ class TestCell < Test::Unit::TestCase
     c_xml = Nokogiri::XML(@c.to_xml_string(1,1))
     assert_equal(c_xml.xpath("/c[@s=1]").size, 1)
   end
+
+  def test_to_xml_string_nil
+    @c.value = nil
+    c_xml = Nokogiri::XML(@c.to_xml_string(1,1))
+    assert_equal(c_xml.xpath("/c[@s=1]").size, 1)
+  end
+  
+  def test_to_xml_string_with_run
+    @c.b = true
+    @c.type = :string
+    @c.value = "a"
+    @c.font_name = 'arial'
+    @c.color = 'FF0000'
+    c_xml = Nokogiri::XML(@c.to_xml_string(1,1))
+    assert(c_xml.xpath("//b"))
+  end
+  def test_to_xml_string_formula
+    p = Axlsx::Package.new
+    ws = p.workbook.add_worksheet do |sheet|
+      sheet.add_row ["=IF(2+2=4,4,5)"]
+    end
+    doc = Nokogiri::XML(ws.to_xml_string)
+    assert(doc.xpath("//f[@text()='IF(2+2=4,4,5)']"))
+
+  end
+
   def test_to_xml
     # TODO This could use some much more stringent testing related to the xml content generated!
-    row = @ws.add_row [Time.now, Date.today, true, 1, 1.0, "text", "=sum(A1:A2)"]
+    @ws.add_row [Time.now, Date.today, true, 1, 1.0, "text", "=sum(A1:A2)"]
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
     errors = []

data/test/workbook/worksheet/tc_col.rb

@@ -6,6 +6,13 @@ class TestCol < Test::Unit::TestCase
     @col = Axlsx::Col.new 1, 1
   end
 
+  def test_initialize
+    options = { :width => 12, :collapsed => true, :hidden => true, :outlineLevel => 1, :phonetic => true, :style => 1} 
+
+    col = Axlsx::Col.new 0, 0, options
+    options.each{ |key, value| assert_equal(col.send(key.to_sym), value) }
+  end
+
   def test_min_max_required
     assert_raise(ArgumentError, 'min and max must be specified when creating a new column') { Axlsx::Col.new }
     assert_raise(ArgumentError, 'min and max must be specified when creating a new column') { Axlsx::Col.new nil, nil }
@@ -53,6 +60,8 @@ class TestCol < Test::Unit::TestCase
 
   def test_style
     assert_equal(@col.style, nil)
+    @col.style = 1
+    assert_equal(@col.style, 1)
     #TODO check that the style specified is actually in the styles xfs collection
   end
 

data/test/workbook/worksheet/tc_comment.rb

@@ -0,0 +1,57 @@
+require 'tc_helper.rb'
+
+class TestComment < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @c1 = @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @c2 = @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+  end
+
+  def test_initailize
+    assert_raise(ArgumentError) { Axlsx::Comment.new }
+  end
+
+  def test_author
+    assert(@c1.author == 'crank')
+    assert(@c2.author == 'PO')
+  end
+
+  def test_text
+    assert(@c1.text == 'penut machine')
+    assert(@c2.text == 'rust bucket')
+  end
+
+  def test_author_index
+    assert_equal(@c1.author_index, 1)
+    assert_equal(@c2.author_index, 0)
+  end
+
+  def test_ref
+    assert(@c1.ref == 'A1')
+    assert(@c2.ref == 'C3')
+  end
+
+  def test_vml_shape
+    pos = Axlsx::name_to_indices(@c1.ref)
+    assert(@c1.vml_shape.is_a?(Axlsx::VmlShape))
+    assert(@c1.vml_shape.column == pos[0])
+    assert(@c1.vml_shape.row == pos[1])
+    assert(@c1.vml_shape.row == pos[1])
+    assert_equal(pos[0], @c1.vml_shape.left_column)
+    assert(@c1.vml_shape.top_row == pos[1])
+    assert_equal(pos[0] + 2 , @c1.vml_shape.right_column)
+    assert(@c1.vml_shape.bottom_row == pos[1]+4)
+  end
+
+  def to_xml_string
+    doc = Nokogiri::XML(@c1.to_xml_string)
+    assert_equal(doc.xpath("//comment[@ref='#{@c1.ref}']").size, 1)
+    assert_equal(doc.xpath("//comment[@authorId='#{@c1.author_index.to}']").size, 1)
+    assert_equal(doc.xpath("//t[text()='#{@c1.author}']").size, 1)
+    assert_equal(doc.xpath("//t[text()='#{@c1.text}']").size, 1)
+  end
+
+end
+