axlsx 1.1.4 → 1.3.1

data/test/workbook/worksheet/tc_sheet_view.rb

@@ -0,0 +1,214 @@
+# encoding: UTF-8
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../"
+require 'tc_helper.rb'
+
+class TestSheetView < Test::Unit::TestCase
+  def setup
+    #inverse defaults for booleans
+    @boolean_options = { :right_to_left => true, :show_formulas => true, :show_outline_symbols => true, 
+      :show_white_space => true, :tab_selected => true, :default_grid_color => false, :show_grid_lines => false,
+      :show_row_col_headers => false, :show_ruler => false, :show_zeros => false, :window_protection => true }
+    @symbol_options = { :view => :page_break_preview }
+    @nil_options = { :color_id => 2, :top_left_cell => 'A2' }
+    @int_0 = { :zoom_scale_normal => 100, :zoom_scale_page_layout_view => 100, :zoom_scale_sheet_layout_view => 100, :workbook_view_id => 2 }
+    @int_100 = { :zoom_scale => 10 }
+    
+    @integer_options = { :color_id => 2, :workbook_view_id => 2 }.merge(@int_0).merge(@int_100)
+    @string_options = { :top_left_cell => 'A2' }
+    
+    
+    @options = @boolean_options.merge(@boolean_options).merge(@symbol_options).merge(@nil_options).merge(@int_0).merge(@int_100)
+    
+    @sv = Axlsx::SheetView.new(@options)
+  end
+  
+  def test_initialize
+    sv = Axlsx::SheetView.new
+    
+    @boolean_options.each do |key, value|
+      assert_equal(!value, sv.send(key.to_sym), "initialized default #{key} should be #{!value}")
+      assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
+    end
+    
+    @nil_options.each do |key, value|
+      assert_equal(nil, sv.send(key.to_sym), "initialized default #{key} should be nil")
+      assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
+    end
+    
+    @int_0.each do |key, value|
+      assert_equal(0, sv.send(key.to_sym), "initialized default #{key} should be 0")
+      assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
+    end
+    
+    @int_100.each do |key, value|
+      assert_equal(100, sv.send(key.to_sym), "initialized default #{key} should be 100")
+      assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
+    end
+  end
+  
+  def test_boolean_attribute_validation
+    @boolean_options.each do |key, value|
+      assert_raise(ArgumentError, "#{key} must be boolean") { @sv.send("#{key}=".to_sym, 'A') }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, true) }
+    end
+  end
+  
+  def test_string_attribute_validation
+    @string_options.each do |key, value|
+      assert_raise(ArgumentError, "#{key} must be string") { @sv.send("#{key}=".to_sym, :symbol) }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, "foo") }
+    end
+  end
+  
+  def test_symbol_attribute_validation
+    @symbol_options.each do |key, value|
+      assert_raise(ArgumentError, "#{key} must be symbol") { @sv.send("#{key}=".to_sym, "foo") }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
+    end
+  end
+  
+  def test_integer_attribute_validation
+    @integer_options.each do |key, value|
+      assert_raise(ArgumentError, "#{key} must be integer") { @sv.send("#{key}=".to_sym, "foo") }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
+    end
+  end
+  
+  def test_color_id
+    assert_raise(ArgumentError) { @sv.color_id = "10" }
+    assert_nothing_raised { @sv.color_id = 2 }
+    assert_equal(@sv.color_id, 2)
+  end
+  
+  def test_default_grid_color
+    assert_raise(ArgumentError) { @sv.default_grid_color = "foo" }
+    assert_nothing_raised { @sv.default_grid_color = false }
+    assert_equal(@sv.default_grid_color, false)
+  end
+  
+  def test_right_to_left
+    assert_raise(ArgumentError) { @sv.right_to_left = "foo´" }
+    assert_nothing_raised { @sv.right_to_left = true }
+    assert_equal(@sv.right_to_left, true)
+  end
+  
+  def test_show_formulas
+    assert_raise(ArgumentError) { @sv.show_formulas = 'foo' }
+    assert_nothing_raised { @sv.show_formulas = false }
+    assert_equal(@sv.show_formulas, false)
+  end
+  
+  def test_show_grid_lines
+    assert_raise(ArgumentError) { @sv.show_grid_lines = "foo" }
+    assert_nothing_raised { @sv.show_grid_lines = false }
+    assert_equal(@sv.show_grid_lines, false)
+  end
+  
+  def test_show_outline_symbols
+    assert_raise(ArgumentError) { @sv.show_outline_symbols = 'foo' }
+    assert_nothing_raised { @sv.show_outline_symbols = false }
+    assert_equal(@sv.show_outline_symbols, false)
+  end
+  
+  def test_show_row_col_headers
+    assert_raise(ArgumentError) { @sv.show_row_col_headers = "foo" }
+    assert_nothing_raised { @sv.show_row_col_headers = false }
+    assert_equal(@sv.show_row_col_headers, false)
+  end
+  
+  def test_show_ruler
+    assert_raise(ArgumentError) { @sv.show_ruler = 'foo' }
+    assert_nothing_raised { @sv.show_ruler = false }
+    assert_equal(@sv.show_ruler, false)
+  end
+  
+  def test_show_white_space
+    assert_raise(ArgumentError) { @sv.show_white_space = 'foo' }
+    assert_nothing_raised { @sv.show_white_space = false }
+    assert_equal(@sv.show_white_space, false)
+  end
+  
+  def test_show_zeros
+    assert_raise(ArgumentError) { @sv.show_zeros = "foo" }
+    assert_nothing_raised { @sv.show_zeros = false }
+    assert_equal(@sv.show_zeros, false)
+  end
+  
+  def test_tab_selected
+    assert_raise(ArgumentError) { @sv.tab_selected = "foo" }
+    assert_nothing_raised { @sv.tab_selected = false }
+    assert_equal(@sv.tab_selected, false)
+  end
+  
+  def test_top_left_cell
+    assert_raise(ArgumentError) { @sv.top_left_cell = :cell_adress }
+    assert_nothing_raised { @sv.top_left_cell = "A2" }
+    assert_equal(@sv.top_left_cell, "A2")
+  end
+  
+  def test_view
+    assert_raise(ArgumentError) { @sv.view = 'view' }
+    assert_nothing_raised { @sv.view = :page_break_preview }
+    assert_equal(@sv.view, :page_break_preview)
+  end
+  
+  def test_window_protection
+    assert_raise(ArgumentError) { @sv.window_protection = "foo" }
+    assert_nothing_raised { @sv.window_protection = false }
+    assert_equal(@sv.window_protection, false)
+  end
+  
+  def test_workbook_view_id
+    assert_raise(ArgumentError) { @sv.workbook_view_id = "1" }
+    assert_nothing_raised { @sv.workbook_view_id = 1 }
+    assert_equal(@sv.workbook_view_id, 1)
+  end
+  
+  def test_zoom_scale
+    assert_raise(ArgumentError) { @sv.zoom_scale = "50" }
+    assert_nothing_raised { @sv.zoom_scale = 50 }
+    assert_equal(@sv.zoom_scale, 50)
+  end
+  
+  def test_zoom_scale_normal
+    assert_raise(ArgumentError) { @sv.zoom_scale_normal = "50" }
+    assert_nothing_raised { @sv.zoom_scale_normal = 50 }
+    assert_equal(@sv.zoom_scale_normal, 50)
+  end
+  
+  def test_zoom_scale_page_layout_view
+    assert_raise(ArgumentError) { @sv.zoom_scale_page_layout_view = "50" }
+    assert_nothing_raised { @sv.zoom_scale_page_layout_view = 50 }
+    assert_equal(@sv.zoom_scale_page_layout_view, 50)
+  end
+  
+  def test_zoom_scale_sheet_layout_view
+    assert_raise(ArgumentError) { @sv.zoom_scale_sheet_layout_view = "50" }
+    assert_nothing_raised { @sv.zoom_scale_sheet_layout_view = 50 }
+    assert_equal(@sv.zoom_scale_sheet_layout_view, 50)
+  end
+  
+  def test_to_xml
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet :name => "sheetview"
+    @ws.sheet_view do |vs|
+      vs.view = :page_break_preview
+    end
+    
+    doc = Nokogiri::XML.parse(@ws.sheet_view.to_xml_string)
+    
+    assert_equal(1, doc.xpath("//sheetView[@tabSelected='false']").size)
+    
+    assert_equal(1, doc.xpath("//sheetView[@tabSelected='false'][@showWhiteSpace='false'][@showOutlineSymbols='false'][@showFormulas='false']
+        [@rightToLeft='false'][@windowProtection='false'][@showZeros='true'][@showRuler='true']
+        [@showRowColHeaders='true'][@showGridLines='true'][@defaultGridColor='true']
+        [@zoomScale='100'][@workbookViewId='0'][@zoomScaleSheetLayoutView='0'][@zoomScalePageLayoutView='0']
+        [@zoomScaleNormal='0'][@view='page_break_preview']").size)
+  end
+  
+  def test_add_selection
+     @sv.add_selection(:top_left, :active_cell => "A1")
+     assert_equal('A1', @sv.selections[:top_left].active_cell)
+  end
+
+end

data/test/workbook/worksheet/{table/tc_table.rb → tc_table.rb}

@@ -15,6 +15,12 @@ class TestTable < Test::Unit::TestCase
 
   end
 
+  def test_table_style_info
+    table = @ws.add_table('A1:D5', :name => 'foo', :style_info => { :show_row_stripes => true, :name => "TableStyleMedium25" })
+    assert_equal('TableStyleMedium25', table.table_style_info.name)
+    assert_equal(true, table.table_style_info.show_row_stripes)
+  end
+
   def test_add_table
     name = "test"
     table = @ws.add_table("A1:D5", :name => name)
@@ -22,29 +28,20 @@ class TestTable < Test::Unit::TestCase
     assert_equal(@ws.workbook.tables.last, table, "must be added to workbook table collection")
     assert_equal(@ws.tables.last, table, "must be added to worksheet table collection")
     assert_equal(table.name, name, "options for name are applied")
-
-  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_table_style_info.rb

@@ -0,0 +1,53 @@
+require 'tc_helper.rb'
+
+class TestTableStyleInfo < Test::Unit::TestCase
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet
+    40.times do 
+      @ws.add_row %w(aa bb cc dd ee ff gg hh ii jj kk)
+    end
+    @table = @ws.add_table(Axlsx::cell_range([@ws.rows.first.cells.first,@ws.rows.last.cells.last], false), :name => 'foo')
+    @options =  { :show_first_column => 1,
+                :show_last_column => 1,
+                :show_row_stripes => 1,
+                :show_column_stripes => 1,
+                :name => "TableStyleDark4" }
+
+
+  end
+
+  def test_initialize
+    table_style = Axlsx::TableStyleInfo.new @options
+    @options.each do |key, value|
+      assert_equal(value, table_style.send(key.to_sym))
+    end
+  end
+
+  def test_boolean_properties
+    table_style = Axlsx::TableStyleInfo.new
+    @options.keys.each do |key|
+     assert_nothing_raised { table_style.send("#{key.to_sym}=", true) }
+     assert_raises(ArgumentError) { table_style.send(key.to_sym, 'foo') }
+    end
+  end
+  def doc
+    @doc ||= Nokogiri::XML(Axlsx::TableStyleInfo.new(@options).to_xml_string)
+  end
+
+  def test_to_xml_string_first_column
+    assert(doc.xpath('//tableStyleInfo[@showLastColumn=1]'))
+  end
+
+  def test_to_xml_string_row_stripes
+    assert(doc.xpath('//tableStyleInfo[@showRowStripes=1]'))
+  end
+
+  def test_to_xml_string_column_stripes
+    assert(doc.xpath('//tableStyleInfo[@showColumnStripes=1]'))
+  end
+
+  def test_to_xml_string_name
+    assert(doc.xpath("//tableStyleInfo[@name=#{@options[:name]}]"))
+  end
+end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -14,6 +14,14 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(ws.pn, "worksheets/sheet2.xml")
   end
 
+  def test_name_is_html_encoded
+    @ws.name = '<foo> & <bar>'
+    assert_equal(@ws.name, '&lt;foo&gt; &amp; &lt;bar&gt;')
+  end
+
+  def test_name_exception_on_colon
+    assert_raises(ArgumentError) { @ws.name = 'foo:bar' }
+  end
   def test_page_margins
     assert(@ws.page_margins.is_a? Axlsx::PageMargins)
   end
@@ -25,6 +33,28 @@ class TestWorksheet < Test::Unit::TestCase
     end
   end
 
+  def test_page_setup
+    assert(@ws.page_setup.is_a? Axlsx::PageSetup)
+  end
+
+  def test_page_setup_yield
+    @ws.page_setup do |ps|
+      assert(ps.is_a? Axlsx::PageSetup)
+      assert(@ws.page_setup == ps)
+    end
+  end
+
+  def test_print_options
+    assert(@ws.print_options.is_a? Axlsx::PrintOptions)
+  end
+
+  def test_print_options_yield
+    @ws.print_options do |po|
+      assert(po.is_a? Axlsx::PrintOptions)
+      assert(@ws.print_options == po)
+    end
+  end
+
   def test_no_autowidth
     @ws.workbook.use_autowidth = false
     @ws.add_row [1,2,3,4]
@@ -33,16 +63,22 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_initialization_options
     page_margins = {:left => 2, :right => 2, :bottom => 2, :top => 2, :header => 2, :footer => 2}
-    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :selected => true, :show_gridlines => false)
-    assert_equal(optioned.page_margins.left, page_margins[:left])
-    assert_equal(optioned.page_margins.right, page_margins[:right])
-    assert_equal(optioned.page_margins.top, page_margins[:top])
-    assert_equal(optioned.page_margins.bottom, page_margins[:bottom])
-    assert_equal(optioned.page_margins.header, page_margins[:header])
-    assert_equal(optioned.page_margins.footer, page_margins[:footer])
+    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}
+    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :selected => true, :show_gridlines => false)
+    page_margins.keys.each do |key|
+      assert_equal(page_margins[key], optioned.page_margins.send(key))
+    end
+    page_setup.keys.each do |key|
+      assert_equal(page_setup[key], optioned.page_setup.send(key))
+    end
+    print_options.keys.each do |key|
+      assert_equal(print_options[key], optioned.print_options.send(key))
+    end
     assert_equal(optioned.name, 'bob')
     assert_equal(optioned.selected, true)
     assert_equal(optioned.show_gridlines, false)
+
   end
 
 
@@ -77,7 +113,12 @@ class TestWorksheet < Test::Unit::TestCase
   def test_dimension
     @ws.add_row [1, 2, 3]
     @ws.add_row [4, 5, 6]
-    assert_equal @ws.dimension, "A1:C2"
+    assert_equal @ws.dimension.sqref, "A1:C2"
+  end
+
+  def test_dimension_with_empty_row
+    @ws.add_row
+    assert_equal "A1:AA200", @ws.dimension.sqref
   end
 
   def test_referencing
@@ -107,7 +148,9 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_drawing
-    assert @ws.drawing.is_a? Axlsx::Drawing
+    assert @ws.drawing == nil
+    @ws.add_chart(Axlsx::Pie3DChart)
+    assert @ws.drawing.is_a?(Axlsx::Drawing)
   end
 
   def test_col_style
@@ -152,10 +195,16 @@ class TestWorksheet < Test::Unit::TestCase
     end
     assert_equal(@ws.rows[1].cells[0].style, 0)
     assert_equal(@ws.rows[2].cells[1].style, 0)
+    @ws.row_style( 1..2, 1, :col_offset => 2)
+    @ws.rows[(1..2)].each do |r|
+      r.cells[(2..-1)].each do |c|
+        assert_equal(c.style, 1)
+      end
+    end
   end
 
   def test_to_xml_string_fit_to_page
-    @ws.fit_to_page = true
+    @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="true"]').size, 1)
   end
@@ -166,6 +215,11 @@ 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_to_xml_string_selected
     @ws.selected = true
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -178,13 +232,6 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@showGridLines="false"]').size, 1)
   end
 
-
-  def test_to_xml_string_show_selection
-    doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@activeCell="A1"]').size, 1)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView/xmlns:selection[@sqref="A1"]').size, 1)
-  end
-
   def test_to_xml_string_auto_fit_data
     @ws.add_row [1, "two"]
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -199,7 +246,7 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_to_xml_string_auto_filter
     @ws.add_row [1, "two"]
-    @ws.auto_filter = "A1:B1"
+    @ws.auto_filter.range = "A1:B1"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:autoFilter[@ref="A1:B1"]').size, 1)
   end
@@ -213,6 +260,12 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
+  def test_to_xml_string_sheet_protection
+    @ws.sheet_protection.password = 'fish'
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert(doc.xpath('//xmlns:sheetProtection'))
+  end
+
   def test_to_xml_string_page_margins
     @ws.page_margins do |pm|
       pm.left = 9
@@ -222,8 +275,26 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:pageMargins[@left="9"][@right="7"]').size, 1)
   end
 
+  def test_to_xml_string_page_setup
+    @ws.page_setup do |ps|
+      ps.paper_width = "210mm"
+      ps.scale = 80
+    end
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:pageSetup[@paperWidth="210mm"][@scale="80"]').size, 1)
+  end
+
+  def test_to_xml_string_print_options
+    @ws.print_options do |po|
+      po.grid_lines = true
+      po.horizontal_centered = true
+    end
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:printOptions[@gridLines="true"][@horizontalCentered="true"]').size, 1)
+  end
+
   def test_to_xml_string_drawing
-    c = @ws.add_chart Axlsx::Pie3DChart
+    @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:drawing[@r:id="rId1"]').size, 1)
   end
@@ -237,64 +308,71 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
   end
 
-  def test_abs_auto_filter
-    @ws.add_row [1, "two", 3]
-    @ws.auto_filter = "A1:C1"
-    assert_equal(@ws.abs_auto_filter, "'Sheet1'!$A$1:$C$1")
-  end
-
   def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
-    assert(errors.empty?, "error free validation")
+    assert(schema.validate(doc).map{ |e| puts e.message; e }.empty?, "error free validation")
+  end
+
+  def test_styles
+    assert(@ws.styles.is_a?(Axlsx::Styles), 'worksheet provides access to styles')
+  end
+  
+  def test_to_xml_string_with_illegal_chars
+    nasties =  "\v\u2028\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u001f"
+    @ws.add_row [nasties]
+    assert_equal(0, @ws.rows.last.cells.last.value.index("\v"))
+    assert_equal(nil,@ws.to_xml_string.index("\v"))
   end
 
+  def test_to_xml_string_with_newlines
+    cell_with_newline = "foo\n\r\nbar"
+    @ws.add_row [cell_with_newline]
+    assert_equal("foo\n\r\nbar", @ws.rows.last.cells.last.value)
+    assert_not_nil(@ws.to_xml_string.index("foo\n\r\nbar"))
+  end
   # Make sure the XML for all optional elements (like pageMargins, autoFilter, ...)
   # is generated in correct order.
   def test_valid_with_optional_elements
     @ws.page_margins.set :left => 9
-    @ws.auto_filter = "A1:C3"
+    @ws.page_setup.set :fit_to_width => 1
+    @ws.print_options.set :headings => true
+    @ws.auto_filter.range = "A1:C3"
     @ws.merge_cells "A4:A5"
     @ws.add_chart Axlsx::Pie3DChart
     @ws.add_table "E1:F3"
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
-    errors = []
-    schema.validate(doc).each do |error|
-      errors.push error
-      puts error.message
-    end
-    assert(errors.empty?, "error free validation")
-
+    assert(schema.validate(doc).map { |e| puts e.message; e }.empty?, schema.validate(doc).map { |e| e.message }.join('\n'))
   end
 
   def test_relationships
+    @ws.add_row [1,2,3]
     assert(@ws.relationships.empty?, "No Drawing relationship until you add a chart")
     c = @ws.add_chart Axlsx::Pie3DChart
     assert_equal(@ws.relationships.size, 1, "adding a chart creates the relationship")
     c = @ws.add_chart Axlsx::Pie3DChart
     assert_equal(@ws.relationships.size, 1, "multiple charts still only result in one relationship")
+    c = @ws.add_comment :text => 'builder', :author => 'bob', :ref => @ws.rows.last.cells.last
+    assert_equal(@ws.relationships.size, 4, "adding a comment adds 3 relationships")
+    c = @ws.add_comment :text => 'not that is a comment!', :author => 'travis', :ref => "A1"
+    assert_equal(@ws.relationships.size, 4, "adding multiple comments in the same worksheet should not add any additional comment relationships")
   end
 
 
   def test_name_unique
-    assert_raise(ArgumentError, "worksheet name must be unique") { n = @ws.name; @ws.workbook.add_worksheet(:name=> @ws) }
+    assert_raise(ArgumentError, "worksheet name must be unique") { n = @ws.name; @ws.workbook.add_worksheet(:name=> n) }
   end
 
   def test_name_size
-    assert_raise(ArgumentError, "name too long!") { @ws.name = Array.new(32, "A").join('') }
-    assert_nothing_raised { @ws.name = Array.new(31, "A").join('') }
+    assert_raise(ArgumentError, "name too long!") { @ws.name = Array.new(32, "A").join() }
+    assert_nothing_raised { @ws.name = Array.new(31, "A").join() }
   end
 
   def test_set_fixed_width_column
     @ws.add_row ["mule", "donkey", "horse"], :widths => [20, :ignore, nil]
     assert(@ws.column_info.size == 3, "a data item for each column")
-    assert_equal(@ws.column_info[0].width, 20, "adding a row with fixed width updates :fixed attribute")
+    assert_equal(20, @ws.column_info[0].width, "adding a row with fixed width updates :fixed attribute")
     assert_equal(@ws.column_info[1].width, nil, ":ignore does not set any data")
   end
 
@@ -311,23 +389,49 @@ class TestWorksheet < Test::Unit::TestCase
     assert_raise(ArgumentError, 'only accept Integer, Float or Fixnum') { @ws.column_widths 2, 7, "-1" }
   end
 
+  def test_protect_range
+    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.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.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
+    10.times do |i|
+      @ws.add_row [i]
+    end
+    @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
+    assert_equal "A9:A10", @ws.send(:merged_cells).first
+  end
+  
   def test_auto_filter
-    assert(@ws.auto_filter.nil?)
+    assert(@ws.auto_filter.range.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
-    @ws.auto_filter = "A1:D9"
-    assert_equal(@ws.auto_filter, "A1:D9")
+    @ws.auto_filter.range = "A1:D9"
+    assert_equal(@ws.auto_filter.range, "A1:D9")
+  end
+
+  def test_sheet_pr_for_auto_filter
+    @ws.auto_filter.range = 'A1:D9'
+    @ws.auto_filter.add_column 0, :filters, :filter_items => [1]
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert(doc.xpath('//sheetPr[@filterMode="true"]')) 
   end
 end