axlsx 1.1.4 → 1.2.0

data/test/drawing/tc_pic.rb

@@ -6,7 +6,7 @@ class TestPic < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @test_img =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
-    @image = ws.add_image :image_src => @test_img
+    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?"
   end
 
   def teardown
@@ -14,11 +14,31 @@ class TestPic < Test::Unit::TestCase
 
   def test_initialization
     assert_equal(@p.workbook.images.first, @image)
+    assert_equal(@image.file_name, 'image1.jpeg')
     assert_equal(@image.image_src, @test_img)
   end
 
+  def test_anchor_swapping
+    #swap from one cell to two cell when end_at is specified
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    start_at = @image.anchor.from 
+    @image.end_at 10,5
+    assert(@image.anchor.is_a?(Axlsx::TwoCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(10,@image.anchor.to.col)
+    assert_equal(5, @image.anchor.to.row)
+  
+    #swap from two cell to one cell when width or height are specified
+    @image.width = 200
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(200, @image.width)
+  
+  end
   def test_hyperlink
-    assert_equal(@image.hyperlink, nil)
+    assert_equal(@image.hyperlink.href, "https://github.com/randym")
     @image.hyperlink = "http://axlsx.blogspot.com"
     assert_equal(@image.hyperlink.href, "http://axlsx.blogspot.com")
   end

data/test/drawing/tc_pie_3D_chart.rb

@@ -6,26 +6,22 @@ class TestPie3DChart < Test::Unit::TestCase
     p = Axlsx::Package.new
     ws = p.workbook.add_worksheet
     @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
+    @chart = ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
   end
 
   def teardown
   end
 
   def test_initialization
-    assert_equal(@chart.view3D.rotX, 30, "view 3d default rotX incorrect")
-    assert_equal(@chart.view3D.perspective, 30, "view 3d default perspective incorrect")
+    assert_equal(@chart.view_3D.rot_x, 30, "view 3d default rot_x incorrect")
+    assert_equal(@chart.view_3D.perspective, 30, "view_3d default perspective incorrect")
     assert_equal(@chart.series_type, Axlsx::PieSeries, "series type incorrect")
   end
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
     doc = Nokogiri::XML(@chart.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
+    errors = schema.validate(doc).map {|error| puts error.message; error }
     assert(errors.empty?, "error free validation")
   end
 

data/test/drawing/tc_pie_series.rb

@@ -5,8 +5,8 @@ class TestPieSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
-    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
+    chart = @ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
+    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :colors => ["FF0000", "00FF00", "0000FF"]
   end
 
   def test_initialize
@@ -22,6 +22,11 @@ class TestPieSeries < Test::Unit::TestCase
     assert(@series.explosion == 20)
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@series.to_xml_string)
+    assert(doc.xpath("//srgbClr[@val='#{@series.colors[0]}']"))
+
+  end
   #TODO test unique serialization parts
 
 end

data/test/drawing/tc_scatter_chart.rb

@@ -4,7 +4,7 @@ class TestScatterChart < Test::Unit::TestCase
   def setup
     @p = Axlsx::Package.new
     @chart = nil
-    ws = @p.workbook.add_worksheet do |sheet|
+    @p.workbook.add_worksheet do |sheet|
       sheet.add_row ["First",  1,  5,  7,  9]
       sheet.add_row ["",       1, 25, 49, 81]
       sheet.add_row ["Second", 5,  2, 14,  9]
@@ -22,6 +22,11 @@ class TestScatterChart < Test::Unit::TestCase
   def teardown
   end
 
+  def test_scatter_style
+    @chart.scatterStyle = :marker
+    assert(@chart.scatterStyle == :marker)
+    assert_raise(ArgumentError) { @chart.scatterStyle = :buckshot }
+  end
   def test_initialization
     assert_equal(@chart.scatterStyle, :lineMarker, "scatterStyle defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::ScatterSeries, "series type incorrect")

data/test/drawing/tc_scatter_series.rb

@@ -5,7 +5,7 @@ class TestScatterSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    @chart = @ws.drawing.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
     @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"exponents", :color => 'FF0000'
   end
 

data/test/drawing/tc_series.rb

@@ -5,7 +5,7 @@ class TestSeries < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Chart, :title => "fishery"
+    chart = @ws.add_chart Axlsx::Chart, :title => "fishery"
     @series = chart.add_series :title=>"bob"
   end
 

data/test/drawing/tc_title.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../"
+
 require 'tc_helper.rb'
 
 class TestTitle < Test::Unit::TestCase
@@ -30,4 +32,18 @@ class TestTitle < Test::Unit::TestCase
     assert(@title.text == "one")
   end
 
+  def test_to_xml_string_text
+    @chart.title.text = 'foo'
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(1, doc.xpath('//c:rich').size)
+    assert_equal(1, doc.xpath("//a:t[text()='foo']").size)
+  end
+
+  def test_to_xml_string_cell
+    @chart.title.cell = @row.cells.first
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(1, doc.xpath('//c:strCache').size)
+    assert_equal(1, doc.xpath('//c:v[text()="one"]').size)
+  end
+
 end

data/test/drawing/tc_two_cell_anchor.rb

@@ -5,8 +5,7 @@ class TestTwoCellAnchor < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
-    row = @ws.add_row ["one", 1, Time.now]
-    title = Axlsx::Title.new
+    @ws.add_row ["one", 1, Time.now]
     chart = @ws.add_chart Axlsx::Bar3DChart
     @anchor = chart.graphic_frame.anchor
   end

data/test/drawing/tc_view_3D.rb

@@ -9,33 +9,33 @@ class TestView3D < Test::Unit::TestCase
   end
 
   def test_options
-    v = Axlsx::View3D.new :rotX => 10, :rotY => 5, :hPercent => "30%", :depthPercent => "45%", :rAngAx => false, :perspective => 10
-    assert_equal(v.rotX, 10)
-    assert_equal(v.rotY, 5)
-    assert_equal(v.hPercent, "30%")
-    assert_equal(v.depthPercent, "45%")
-    assert_equal(v.rAngAx, false)
+    v = Axlsx::View3D.new :rot_x => 10, :rot_y => 5, :h_percent => "30%", :depth_percent => "45%", :r_ang_ax => false, :perspective => 10
+    assert_equal(v.rot_x, 10)
+    assert_equal(v.rot_y, 5)
+    assert_equal(v.h_percent, "30%")
+    assert_equal(v.depth_percent, "45%")
+    assert_equal(v.r_ang_ax, false)
     assert_equal(v.perspective, 10)
   end
 
-  def test_rotX
-    assert_raise(ArgumentError) {@view.rotX = "bob"}
-    assert_nothing_raised {@view.rotX = -90}
+  def test_rot_x
+    assert_raise(ArgumentError) {@view.rot_x = "bob"}
+    assert_nothing_raised {@view.rot_x = -90}
   end
 
-  def test_rotY
-    assert_raise(ArgumentError) {@view.rotY = "bob"}
-    assert_nothing_raised {@view.rotY = 90}
+  def test_rot_y
+    assert_raise(ArgumentError) {@view.rot_y = "bob"}
+    assert_nothing_raised {@view.rot_y = 90}
   end
 
-  def test_hPercent
-    assert_raise(ArgumentError) {@view.hPercent = "bob"}
-    assert_nothing_raised {@view.hPercent = "500%"}
+  def test_h_percent
+    assert_raise(ArgumentError) {@view.h_percent = "bob"}
+    assert_nothing_raised {@view.h_percent = "500%"}
   end
 
-  def test_depthPercent
-    assert_raise(ArgumentError) {@view.depthPercent = "bob"}
-    assert_nothing_raised {@view.depthPercent = "20%"}
+  def test_depth_percent
+    assert_raise(ArgumentError) {@view.depth_percent = "bob"}
+    assert_nothing_raised {@view.depth_percent = "20%"}
   end
 
 

data/test/drawing/tc_vml_drawing.rb

@@ -0,0 +1,25 @@
+require 'tc_helper.rb'
+
+class TestVmlDrawing < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @vml_drawing = @ws.comments.vml_drawing
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
+  end
+
+  def test_to_xml_string
+    str = @vml_drawing.to_xml_string()
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//v:shape").size, 2)
+    assert(doc.xpath("//o:idmap[@o:data='#{@ws.index+1}']"))
+  end
+
+end

data/test/drawing/tc_vml_shape.rb

@@ -0,0 +1,100 @@
+require 'tc_helper.rb'
+
+class TestVmlShape < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    wb = p.workbook
+    @ws = wb.add_worksheet
+    @ws.add_comment :ref => 'A1', :text => 'penut machine', :author => 'crank'
+    @ws.add_comment :ref => 'C3', :text => 'rust bucket', :author => 'PO'
+    @comments = @ws.comments
+  end
+
+  def test_initialize
+    assert_raise(ArgumentError) { Axlsx::VmlDrawing.new }
+  end
+
+  def test_row
+    shape = @comments.first.vml_shape
+    assert_equal(shape.row, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.row, 2)
+  end
+
+  def test_column
+    shape = @comments.first.vml_shape
+    assert_equal(shape.column, 0)
+    shape = @comments.last.vml_shape
+    assert_equal(shape.column, 2)
+  end
+
+  def test_left_column
+    shape = @comments.first.vml_shape
+    shape.left_column = 3
+    assert(shape.left_column == 3)
+    assert_raise(ArgumentError) { shape.left_column = [] }
+  end
+
+  def test_left_offset
+    shape = @comments.first.vml_shape
+    shape.left_offset = 3
+    assert(shape.left_offset == 3)
+    assert_raise(ArgumentError) { shape.left_offset = [] }
+  end
+
+  def test_right_column
+    shape = @comments.first.vml_shape
+    shape.right_column = 3
+    assert(shape.right_column == 3)
+    assert_raise(ArgumentError) { shape.right_column = [] }
+  end
+
+  def test_right_offset
+    shape = @comments.first.vml_shape
+    shape.right_offset = 3
+    assert(shape.right_offset == 3)
+    assert_raise(ArgumentError) { shape.right_offset = [] }
+  end
+
+  def test_top_offset
+    shape = @comments.first.vml_shape
+    shape.top_offset = 3
+    assert(shape.top_offset == 3)
+    assert_raise(ArgumentError) { shape.top_offset = [] }
+  end
+
+  def test_bottom_offset
+    shape = @comments.first.vml_shape
+    shape.bottom_offset = 3
+    assert(shape.bottom_offset == 3)
+    assert_raise(ArgumentError) { shape.bottom_offset = [] }
+  end
+
+  def test_bottom_row
+    shape = @comments.first.vml_shape
+    shape.bottom_row = 3
+    assert(shape.bottom_row == 3)
+    assert_raise(ArgumentError) { shape.bottom_row = [] }
+  end
+
+  def test_top_row
+    shape = @comments.first.vml_shape
+    shape.top_row = 3
+    assert(shape.top_row == 3)
+    assert_raise(ArgumentError) { shape.top_row = [] }
+  end
+
+  def test_to_xml_string
+    str = @comments.vml_drawing.to_xml_string()
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//v:shape").size, 2)
+    @comments.each do |comment|
+      shape = comment.vml_shape
+      assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size == 1)
+      assert(doc.xpath("//v:shape/x:ClientData/x:Anchor[text()='#{shape.left_column}, #{shape.left_offset}, #{shape.top_row}, #{shape.top_offset}, #{shape.right_column}, #{shape.right_offset}, #{shape.bottom_row}, #{shape.bottom_offset}']").size == 1)
+    end
+  end
+
+end

data/test/rels/tc_relationship.rb

@@ -10,6 +10,7 @@ class TestRelationships < Test::Unit::TestCase
   def test_type
     assert_raise(ArgumentError) { Axlsx::Relationship.new 'type', 'target' }
     assert_nothing_raised { Axlsx::Relationship.new Axlsx::WORKSHEET_R, 'target' }
+    assert_nothing_raised { Axlsx::Relationship.new Axlsx::COMMENT_R, 'target' }
   end
 
   def test_target_mode

data/test/stylesheet/tc_gradient_fill.rb

@@ -61,4 +61,12 @@ class TestGradientFill < Test::Unit::TestCase
     assert(@item.stop.size == 1)
     assert(@item.stop.last.is_a?(Axlsx::GradientStop))
   end
+
+  def test_to_xml_string
+    @item.stop << Axlsx::GradientStop.new(Axlsx::Color.new(:rgb => "000000"), 0.5)
+    @item.stop << Axlsx::GradientStop.new(Axlsx::Color.new(:rgb => "FFFFFF"), 0.5)
+    @item.type = :path
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath("//color[@rgb='FF000000']"))
+  end
 end

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