caxlsx 2.0.2 → 3.0.0

data/test/drawing/tc_drawing.rb

@@ -59,9 +59,9 @@ class TestDrawing < Test::Unit::TestCase
   end
 
   def test_relationships
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
+    @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
     assert_equal(@ws.drawing.relationships.size, 1, "adding a chart adds a relationship")
-    chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
+    @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
     assert_equal(@ws.drawing.relationships.size, 2, "adding a chart adds a relationship")
   end
 

data/test/drawing/tc_line_chart.rb

@@ -19,11 +19,11 @@ class TestLineChart < Test::Unit::TestCase
     assert(@chart.val_axis.is_a?(Axlsx::ValAxis), "value access not created")
   end
 
- def test_grouping
-   assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
-   assert_nothing_raised("allow valid grouping") { @chart.grouping = :stacked }
-   assert(@chart.grouping == :stacked)
- end
+  def test_grouping
+    assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+    assert_nothing_raised("allow valid grouping") { @chart.grouping = :stacked }
+    assert(@chart.grouping == :stacked)
+  end
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))

data/test/drawing/tc_line_series.rb

@@ -6,25 +6,66 @@ class TestLineSeries < Test::Unit::TestCase
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
     chart = @ws.add_chart Axlsx::Line3DChart, :title => "fishery"
-    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :color => "#FF0000", :show_marker => true
+    @series = chart.add_series(
+      :data => [0,1,2],
+      :labels => ["zero", "one", "two"],
+      :title => "bob",
+      :color => "#FF0000",
+      :show_marker => true,
+      :smooth => true
+    )
   end
 
   def test_initialize
     assert_equal(@series.title.text, "bob", "series title has been applied")
     assert_equal(@series.labels.class, Axlsx::AxDataSource)
     assert_equal(@series.data.class, Axlsx::NumDataSource)
-
   end
 
   def test_show_marker
     assert_equal(true, @series.show_marker)
     @series.show_marker = false
     assert_equal(false, @series.show_marker)
-  end  
+  end
+
+  def test_smooth
+    assert_equal(true, @series.smooth)
+    @series.smooth = false
+    assert_equal(false, @series.smooth)
+  end
+
+  def test_marker_symbol
+    assert_equal(:default, @series.marker_symbol)
+    @series.marker_symbol = :circle
+    assert_equal(:circle, @series.marker_symbol)
+  end
+
   def test_to_xml_string
-    doc = Nokogiri::XML(@series.to_xml_string)
+    doc = Nokogiri::XML(wrap_with_namespaces(@series))
     assert(doc.xpath("//srgbClr[@val='#{@series.color}']"))
-    assert(doc.xpath("//marker"))
+    assert_equal(xpath_with_namespaces(doc, "//c:marker").size, 0)
+    assert(doc.xpath("//smooth"))
+
+    @series.marker_symbol = :diamond
+    doc = Nokogiri::XML(wrap_with_namespaces(@series))
+    assert_equal(xpath_with_namespaces(doc, "//c:marker/c:symbol[@val='diamond']").size, 1)
+
+    @series.show_marker = false
+    doc = Nokogiri::XML(wrap_with_namespaces(@series))
+    assert_equal(xpath_with_namespaces(doc, "//c:marker/c:symbol[@val='none']").size, 1)
+  end
+
+  def wrap_with_namespaces(series)
+    '<c:chartSpace xmlns:c="' <<
+      Axlsx::XML_NS_C <<
+      '" xmlns:a="' <<
+      Axlsx::XML_NS_A <<
+      '">' <<
+      series.to_xml_string <<
+      '</c:chartSpace>'
+  end
+
+  def xpath_with_namespaces(doc, xpath)
+    doc.xpath(xpath, "a" => Axlsx::XML_NS_A, "c" => Axlsx::XML_NS_C)
   end
-  #TODO serialization testing
 end

data/test/drawing/tc_pic.rb

@@ -5,12 +5,11 @@ class TestPic < Test::Unit::TestCase
   def setup
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
-    @test_img =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
-    @test_img_up = File.dirname(__FILE__) + "/../../examples/IMAGE1UP.JPEG"
-    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?"
-  end
-
-  def teardown
+    @test_img = @test_img_jpg =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
+    @test_img_png =  File.dirname(__FILE__) + "/../../examples/image1.png"
+    @test_img_gif =  File.dirname(__FILE__) + "/../../examples/image1.gif"
+    @test_img_fake =  File.dirname(__FILE__) + "/../../examples/image1_fake.jpg"
+    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?", :opacity => 5
   end
 
   def test_initialization
@@ -38,6 +37,7 @@ class TestPic < Test::Unit::TestCase
     assert_equal(200, @image.width)
 
   end
+
   def test_hyperlink
     assert_equal(@image.hyperlink.href, "https://github.com/randym")
     @image.hyperlink = "http://axlsx.blogspot.com"
@@ -70,15 +70,12 @@ class TestPic < Test::Unit::TestCase
   end
 
   def test_image_src
-    assert_raise(ArgumentError) { @image.image_src = 49 }
-    assert_raise(ArgumentError) { @image.image_src = 'Unknown' }
     assert_raise(ArgumentError) { @image.image_src = __FILE__ }
-    assert_nothing_raised { @image.image_src = @test_img }
-    assert_equal(@image.image_src, @test_img)
-  end
-
-  def test_image_src_downcase
-    assert_nothing_raised { @image.image_src = @test_img_up }
+    assert_raise(ArgumentError) { @image.image_src = @test_img_fake }
+    assert_nothing_raised { @image.image_src = @test_img_gif }
+    assert_nothing_raised { @image.image_src = @test_img_png }
+    assert_nothing_raised { @image.image_src = @test_img_jpg }
+    assert_equal(@image.image_src, @test_img_jpg)
   end
 
   def test_descr
@@ -103,5 +100,4 @@ class TestPic < Test::Unit::TestCase
     doc = Nokogiri::XML(@image.anchor.drawing.to_xml_string)
     assert_equal r_id, doc.xpath("//a:blip").first["r:embed"]
   end
-
 end

data/test/drawing/tc_scatter_series.rb

@@ -6,16 +6,51 @@ class TestScatterSeries < Test::Unit::TestCase
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
     @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'
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"exponents", :color => 'FF0000', :smooth => true
   end
 
   def test_initialize
     assert_equal(@series.title.text, "exponents", "series title has been applied")
   end
 
+  def test_smoothed_chart_default_smoothing
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart", :scatter_style => :smoothMarker
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"smoothed exponents"
+    assert(@series.smooth, "series is smooth by default on smooth charts")
+  end
+
+  def test_unsmoothed_chart_default_smoothing
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart", :scatter_style => :line
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"unsmoothed exponents"
+    assert(!@series.smooth, "series is not smooth by default on non-smooth charts")
+  end
+
+  def test_explicit_smoothing
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart, Smooth Series", :scatter_style => :line
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"smoothed exponents", :smooth => true
+    assert(@series.smooth, "series is smooth when overriding chart default")
+  end
+
+  def test_explicit_unsmoothing
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart, Unsmooth Series", :scatter_style => :smoothMarker
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"unsmoothed exponents", :smooth => false
+    assert(!@series.smooth, "series is not smooth when overriding chart default")
+  end
+
+  def test_ln_width
+    @chart = @ws.add_chart Axlsx::ScatterChart, :title => "ln width", :scatter_style => :line
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"ln_width"
+    @series.ln_width = 12700
+    assert_equal(@series.ln_width, 12700, 'line width assigment is allowed')
+  end
+
   def test_to_xml_string
+    @chart.scatter_style = :line
+    @series.ln_width = 12700
     doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(12700, @series.ln_width)
     assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,4)
+    assert_equal(doc.xpath("//a:ln[@w='#{@series.ln_width}']").length, 1)
   end
 
 end

data/test/drawing/tc_str_val.rb

@@ -4,6 +4,7 @@ class TestStrVal < Test::Unit::TestCase
 
   def setup
     @str_val = Axlsx::StrVal.new :v => "1"
+    @str_val_with_special_characters = Axlsx::StrVal.new :v => "a & b <c>"
   end
 
   def test_initialize
@@ -18,4 +19,12 @@ class TestStrVal < Test::Unit::TestCase
     assert_equal(doc.xpath("//c:pt/c:v[text()='1']").size, 1)
   end
 
+  def test_to_xml_string_special_characters
+    str = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '">'
+    str << @str_val_with_special_characters.to_xml_string(0)
+    doc = Nokogiri::XML(str)
+    assert_equal(doc.xpath("//c:pt/c:v[text()='a & b <c>']").size, 1)
+  end
+
 end

data/test/drawing/tc_title.rb

@@ -19,6 +19,11 @@ class TestTitle < Test::Unit::TestCase
     assert(@title.cell == nil)
   end
 
+  def test_initialize_title_size
+    title = Axlsx::Title.new 'bob', 90
+    assert_equal "90", title.text_size
+  end
+
   def test_text
     assert_raise(ArgumentError, "text must be a string") { @title.text = 123 }
     @title.cell = @row.cells.first

data/test/stylesheet/tc_styles.rb

@@ -133,7 +133,7 @@ class TestStyles < Test::Unit::TestCase
       :font_name => "woot font"
     }
     assert_equal(@styles.parse_font_options {}, nil, "noop if no font keys are set")
-    assert_equal(@styles.parse_font_options(:b=>1).class, Fixnum, "return index of font if not :dxf type")
+    assert(@styles.parse_font_options(:b=>1).is_a?(Integer), "return index of font if not :dxf type")
     assert_equal(@styles.parse_font_options(:b=>1, :type => :dxf).class, Axlsx::Font, "return font object if :dxf type")
 
     f = @styles.parse_font_options(options.merge(:type => :dxf))
@@ -147,7 +147,7 @@ class TestStyles < Test::Unit::TestCase
 
   def test_parse_fill_options
     assert_equal(@styles.parse_fill_options {}, nil, "noop if no fill keys are set")
-    assert_equal(@styles.parse_fill_options(:bg_color => "DE").class, Fixnum, "return index of fill if not :dxf type")
+    assert(@styles.parse_fill_options(:bg_color => "DE").is_a?(Integer), "return index of fill if not :dxf type")
     assert_equal(@styles.parse_fill_options(:bg_color => "DE", :type => :dxf).class, Axlsx::Fill, "return fill object if :dxf type")
     f = @styles.parse_fill_options(:bg_color => "DE", :type => :dxf)
     assert(f.fill_type.bgColor.rgb == "FFDEDEDE")

data/test/tc_axlsx.rb

@@ -45,6 +45,16 @@ class TestAxlsx < Test::Unit::TestCase
     assert_equal(Axlsx.cell_range([c2, c1], true), "'Sheet &lt;''&gt;&quot; 1'!$A$1:$B$1")
   end
 
+  def test_cell_range_row
+    p = Axlsx::Package.new
+    ws = p.workbook.add_worksheet
+    row = ws.add_row
+    row.add_cell
+    row.add_cell
+    row.add_cell
+    assert_equal("A1:C1", Axlsx.cell_range(row, false))
+  end
+
   def test_name_to_indices
     setup_wide
     @wide_test_points.each do |key, value|
@@ -69,4 +79,25 @@ class TestAxlsx < Test::Unit::TestCase
     assert_equal([['Z5', 'AA5', 'AB5'], ['Z6', 'AA6', 'AB6']], Axlsx::range_to_a('Z5:AB6'))
   end
 
+  def test_sanitize_frozen_control_strippped
+    needs_sanitize = "legit\x08".freeze # Backspace control char
+
+    assert_equal(Axlsx.sanitize(needs_sanitize), 'legit', 'should strip control chars')
+  end
+
+  def test_sanitize_unfrozen_control_strippped
+    needs_sanitize = "legit\x08" # Backspace control char
+    sanitized_str = Axlsx.sanitize(needs_sanitize)
+
+    assert_equal(sanitized_str,           'legit',                  'should strip control chars')
+    assert_equal(sanitized_str.object_id, sanitized_str.object_id,  'should preserve object')
+  end
+
+  def test_sanitize_unfrozen_no_sanitize
+    legit_str = 'legit'
+    sanitized_str = Axlsx.sanitize(legit_str)
+
+    assert_equal(sanitized_str,           legit_str,            'should preserve value')
+    assert_equal(sanitized_str.object_id, legit_str.object_id,  'should preserve object')
+  end
 end

data/test/tc_helper.rb

@@ -8,3 +8,5 @@ end
 require 'test/unit'
 require "timecop"
 require "axlsx.rb"
+# MIME detection for Microsoft Office 2007+ formats
+require 'mimemagic/overlay'

data/test/tc_package.rb

@@ -7,10 +7,17 @@ class TestPackage < Test::Unit::TestCase
     ws = @package.workbook.add_worksheet
     ws.add_row ['Can', 'we', 'build it?']
     ws.add_row ['Yes!', 'We', 'can!']
+    @rt = Axlsx::RichText.new
+    @rt.add_run "run 1", :b => true, :i => false
+    ws.add_row [@rt]
+
+    ws.rows.last.add_cell('b', :type => :text)
+
     ws.outline_level_rows 0, 1
     ws.outline_level_columns 0, 1
     ws.add_hyperlink :ref => ws.rows.first.cells.last, :location => 'https://github.com/randym'
     ws.workbook.add_defined_name("#{ws.name}!A1:C2", :name => '_xlnm.Print_Titles', :hidden => true)
+    ws.workbook.add_view active_tab: 1, first_sheet: 0
     ws.protect_range('A1:C1')
     ws.protect_range(ws.rows.last.cells)
     ws.add_comment :author => 'alice', :text => 'Hi Bob', :ref => 'A12'
@@ -52,6 +59,11 @@ class TestPackage < Test::Unit::TestCase
       chart.d_lbls.show_val = true
     end
 
+    ws.add_chart(Axlsx::BubbleChart, :title => 'bubble chart') do |chart|
+      chart.add_series :xData => [1,2,3,4], :yData => [1,3,2,4]
+      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|
@@ -148,6 +160,11 @@ class TestPackage < Test::Unit::TestCase
     assert package_1.to_stream.string == package_2.to_stream.string, "zip files are not identical"
   end
 
+  def test_serialization_creates_files_with_excel_mime_type
+    assert_equal(MimeMagic.by_magic(@package.to_stream).type,
+                 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet')
+  end
+
   def test_validation
     assert_equal(@package.validate.size, 0, @package.validate)
     Axlsx::Workbook.send(:class_variable_set, :@@date1904, 9900)
@@ -176,12 +193,13 @@ class TestPackage < Test::Unit::TestCase
 
 
     #no mystery parts
-    assert_equal(24, p.size)
+    assert_equal(25, p.size)
 
   end
 
   def test_shared_strings_requires_part
     @package.use_shared_strings = true
+    @package.to_stream #ensure all cell_serializer paths are hit
     p = @package.send(:parts)
     assert_equal(p.select{ |part| part[:entry] =~/xl\/sharedStrings.xml/}.size, 1, "shared strings table missing")
   end

data/test/util/tc_mime_type_utils.rb

@@ -0,0 +1,13 @@
+require 'tc_helper.rb'
+class TestMimeTypeUtils < Test::Unit::TestCase
+  def setup
+    @test_img = File.dirname(__FILE__) + "/../../examples/image1.jpeg"
+  end
+
+  def teardown
+  end
+
+  def test_mime_type_utils
+    assert_equal(Axlsx::MimeTypeUtils::get_mime_type(@test_img), 'image/jpeg')
+  end
+end

data/test/util/tc_simple_typed_list.rb

@@ -1,7 +1,7 @@
 require 'tc_helper.rb'
 class TestSimpleTypedList < Test::Unit::TestCase
   def setup
-    @list = Axlsx::SimpleTypedList.new Fixnum
+    @list = Axlsx::SimpleTypedList.new Integer
   end
 
   def teardown
@@ -72,7 +72,6 @@ class TestSimpleTypedList < Test::Unit::TestCase
   def test_equality
     @list.push 1
     @list.push 2
-    assert_equal(@list, [1,2])
-    
+    assert_equal(@list.to_ary, [1,2])
   end
 end

data/test/util/tc_validators.rb

@@ -91,7 +91,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -101,7 +101,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -109,7 +109,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -117,7 +117,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -125,7 +125,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -133,7 +133,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -141,7 +141,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -149,7 +149,7 @@ class TestValidators < Test::Unit::TestCase
     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 }
@@ -157,8 +157,32 @@ class TestValidators < Test::Unit::TestCase
     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 }
+
+    #display_blanks_as
+    [:gap, :span, :zero].each do |sym|
+      assert_nothing_raised { Axlsx.validate_display_blanks_as sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_display_blanks_as :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_display_blanks_as 'other_blank' }
+    assert_raise(ArgumentError) { Axlsx.validate_display_blanks_as 0 }
+
+    #view_visibility
+    [:visible, :hidden, :very_hidden].each do |sym|
+      assert_nothing_raised { Axlsx.validate_view_visibility sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_view_visibility :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_view_visibility 'other_visibility' }
+    assert_raise(ArgumentError) { Axlsx.validate_view_visibility 0 }
+
+    #marker_symbol
+    [:default, :circle, :dash, :diamond, :dot, :picture, :plus, :square, :star, :triangle, :x].each do |sym|
+      assert_nothing_raised { Axlsx.validate_marker_symbol sym }
+    end
+    assert_raise(ArgumentError) { Axlsx.validate_marker_symbol :other_symbol }
+    assert_raise(ArgumentError) { Axlsx.validate_marker_symbol 'other_marker' }
+    assert_raise(ArgumentError) { Axlsx.validate_marker_symbol 0 }
   end
- 
+
   def test_validate_integerish
     assert_raise(ArgumentError) { Axlsx.validate_integerish Axlsx }
     [1, 1.4, "a"].each { |test_value| assert_nothing_raised { Axlsx.validate_integerish test_value } }
@@ -179,7 +203,7 @@ class TestValidators < Test::Unit::TestCase
 
   def test_range_validation
      # exclusive
-     assert_raise(ArgumentError) { Axlsx::RangeValidator.validate('foo', 1, 10, 10, false) } 
+     assert_raise(ArgumentError) { Axlsx::RangeValidator.validate('foo', 1, 10, 10, false) }
      # inclusive by default
      assert_nothing_raised { Axlsx::RangeValidator.validate('foo', 1, 10, 10) }
   end