caxlsx 3.0.4 → 3.2.0

data/test/drawing/tc_bar_3D_chart.rb

@@ -1,71 +1,86 @@
-require 'tc_helper.rb'
-
-class TestBar3DChart < Test::Unit::TestCase
-
-  def setup
-    @p = Axlsx::Package.new
-    ws = @p.workbook.add_worksheet
-    @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
-  end
-
-  def teardown
-  end
-
-  def test_initialization
-    assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
-    assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
-    assert_equal(@chart.bar_dir, :bar, " bar direction incorrect")
-    assert(@chart.cat_axis.is_a?(Axlsx::CatAxis), "category axis not created")
-    assert(@chart.val_axis.is_a?(Axlsx::ValAxis), "value access not created")
-  end
-
-  def test_bar_direction
-    assert_raise(ArgumentError, "require valid bar direction") { @chart.bar_dir = :left }
-    assert_nothing_raised("allow valid bar direction") { @chart.bar_dir = :col }
-    assert(@chart.bar_dir == :col)
-  end
-
- def test_grouping
-   assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
-   assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
-   assert(@chart.grouping == :standard)
- end
-
-
- def test_gapWidth
-   assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = 200 }
-   assert_nothing_raised("allow valid gapWidth") { @chart.gap_width = "200%" }
-   assert(@chart.gap_width == "200%")
- end
-
- def test_gapDepth
-   assert_raise(ArgumentError, "require valid gap_depth") { @chart.gap_depth = 200 }
-   assert_nothing_raised("allow valid gap_depth") { @chart.gap_depth = "200%" }
-   assert(@chart.gap_depth == "200%")
- end
-
-  def test_shape
-    assert_raise(ArgumentError, "require valid shape") { @chart.shape = :star }
-    assert_nothing_raised("allow valid shape") { @chart.shape = :cone }
-    assert(@chart.shape == :cone)
-  end
-
-  def test_to_xml_string
-    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
-    assert(errors.empty?, "error free validation")
-  end
-
-  def test_to_xml_string_has_axes_in_correct_order
-    str = @chart.to_xml_string
-    cat_axis_position = str.index(@chart.axes[:cat_axis].id.to_s)
-    val_axis_position = str.index(@chart.axes[:val_axis].id.to_s)
-    assert(cat_axis_position < val_axis_position, "cat_axis must occur earlier than val_axis in the XML")
-  end
-end
+require 'tc_helper.rb'
+
+class TestBar3DChart < Test::Unit::TestCase
+
+  def setup
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet
+    @row = ws.add_row ["one", 1, Time.now]
+    @chart = ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
+  end
+
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
+    assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
+    assert_equal(@chart.bar_dir, :bar, " bar direction incorrect")
+    assert(@chart.cat_axis.is_a?(Axlsx::CatAxis), "category axis not created")
+    assert(@chart.val_axis.is_a?(Axlsx::ValAxis), "value access not created")
+  end
+
+  def test_bar_direction
+    assert_raise(ArgumentError, "require valid bar direction") { @chart.bar_dir = :left }
+    assert_nothing_raised("allow valid bar direction") { @chart.bar_dir = :col }
+    assert(@chart.bar_dir == :col)
+  end
+
+ def test_grouping
+   assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+   assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
+   assert(@chart.grouping == :standard)
+ end
+
+  def test_gap_width
+    assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = -1 }
+    assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = 501 }
+    assert_nothing_raised("allow valid gapWidth") { @chart.gap_width = 200 }
+    assert_equal(@chart.gap_width, 200, 'gap width is incorrect')
+  end
+
+  def test_gap_depth
+    assert_raise(ArgumentError, "require valid gap_depth") { @chart.gap_depth = -1 }
+    assert_raise(ArgumentError, "require valid gap_depth") { @chart.gap_depth = 501 }
+    assert_nothing_raised("allow valid gap_depth") { @chart.gap_depth = 200 }
+    assert_equal(@chart.gap_depth, 200, 'gap depth is incorrect')
+  end
+
+  def test_shape
+    assert_raise(ArgumentError, "require valid shape") { @chart.shape = :star }
+    assert_nothing_raised("allow valid shape") { @chart.shape = :cone }
+    assert(@chart.shape == :cone)
+  end
+
+  def test_to_xml_string
+    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
+    assert(errors.empty?, "error free validation")
+  end
+
+  def test_to_xml_string_has_axes_in_correct_order
+    str = @chart.to_xml_string
+    cat_axis_position = str.index(@chart.axes[:cat_axis].id.to_s)
+    val_axis_position = str.index(@chart.axes[:val_axis].id.to_s)
+    assert(cat_axis_position < val_axis_position, "cat_axis must occur earlier than val_axis in the XML")
+  end
+
+  def test_to_xml_string_has_gap_depth
+    gap_depth_value = rand(0..500)
+    @chart.gap_depth = gap_depth_value
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//c:bar3DChart/c:gapDepth").first.attribute('val').value, gap_depth_value.to_s)
+  end
+
+  def test_to_xml_string_has_gap_width
+    gap_width_value = rand(0..500)
+    @chart.gap_width = gap_width_value
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//c:bar3DChart/c:gapWidth").first.attribute('val').value, gap_width_value.to_s)
+  end
+end

data/test/drawing/tc_bar_chart.rb

@@ -1,71 +1,86 @@
-require 'tc_helper.rb'
-
-class TestBarChart < Test::Unit::TestCase
-
-  def setup
-    @p = Axlsx::Package.new
-    ws = @p.workbook.add_worksheet
-    @row = ws.add_row ["one", 1, Time.now]
-    @chart = ws.add_chart Axlsx::BarChart, :title => "fishery"
-  end
-
-  def teardown
-  end
-
-  def test_initialization
-    assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
-    assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
-    assert_equal(@chart.bar_dir, :bar, " bar direction incorrect")
-    assert(@chart.cat_axis.is_a?(Axlsx::CatAxis), "category axis not created")
-    assert(@chart.val_axis.is_a?(Axlsx::ValAxis), "value access not created")
-  end
-
-  def test_bar_direction
-    assert_raise(ArgumentError, "require valid bar direction") { @chart.bar_dir = :left }
-    assert_nothing_raised("allow valid bar direction") { @chart.bar_dir = :col }
-    assert(@chart.bar_dir == :col)
-  end
-
- def test_grouping
-   assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
-   assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
-   assert(@chart.grouping == :standard)
- end
-
-
- def test_gapWidth
-   assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = 200 }
-   assert_nothing_raised("allow valid gapWidth") { @chart.gap_width = "200%" }
-   assert(@chart.gap_width == "200%")
- end
-
- def test_gapDepth
-   assert_raise(ArgumentError, "require valid gap_depth") { @chart.gap_depth = 200 }
-   assert_nothing_raised("allow valid gap_depth") { @chart.gap_depth = "200%" }
-   assert(@chart.gap_depth == "200%")
- end
-
-  def test_shape
-    assert_raise(ArgumentError, "require valid shape") { @chart.shape = :star }
-    assert_nothing_raised("allow valid shape") { @chart.shape = :cone }
-    assert(@chart.shape == :cone)
-  end
-
-  def test_to_xml_string
-    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
-    assert(errors.empty?, "error free validation")
-  end
-
-  def test_to_xml_string_has_axes_in_correct_order
-    str = @chart.to_xml_string
-    cat_axis_position = str.index(@chart.axes[:cat_axis].id.to_s)
-    val_axis_position = str.index(@chart.axes[:val_axis].id.to_s)
-    assert(cat_axis_position < val_axis_position, "cat_axis must occur earlier than val_axis in the XML")
-  end
-end
+require 'tc_helper.rb'
+
+class TestBarChart < Test::Unit::TestCase
+
+  def setup
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet
+    @row = ws.add_row ["one", 1, Time.now]
+    @chart = ws.add_chart Axlsx::BarChart, :title => "fishery"
+  end
+
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
+    assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
+    assert_equal(@chart.bar_dir, :bar, " bar direction incorrect")
+    assert(@chart.cat_axis.is_a?(Axlsx::CatAxis), "category axis not created")
+    assert(@chart.val_axis.is_a?(Axlsx::ValAxis), "value access not created")
+  end
+
+  def test_bar_direction
+    assert_raise(ArgumentError, "require valid bar direction") { @chart.bar_dir = :left }
+    assert_nothing_raised("allow valid bar direction") { @chart.bar_dir = :col }
+    assert(@chart.bar_dir == :col)
+  end
+
+ def test_grouping
+   assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+   assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
+   assert(@chart.grouping == :standard)
+ end
+
+  def test_gap_width
+    assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = -1 }
+    assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = 501 }
+    assert_nothing_raised("allow valid gap width") { @chart.gap_width = 200 }
+    assert_equal(@chart.gap_width, 200, 'gap width is incorrect')
+  end
+
+  def test_overlap
+    assert_raise(ArgumentError, "require valid overlap") { @chart.overlap = -101 }
+    assert_raise(ArgumentError, "require valid overlap") { @chart.overlap = 101 }
+    assert_nothing_raised("allow valid overlap") { @chart.overlap = 100 }
+    assert_equal(@chart.overlap, 100, 'overlap is incorrect')
+  end
+
+  def test_shape
+    assert_raise(ArgumentError, "require valid shape") { @chart.shape = :star }
+    assert_nothing_raised("allow valid shape") { @chart.shape = :cone }
+    assert(@chart.shape == :cone)
+  end
+
+  def test_to_xml_string
+    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
+    assert(errors.empty?, "error free validation")
+  end
+
+  def test_to_xml_string_has_axes_in_correct_order
+    str = @chart.to_xml_string
+    cat_axis_position = str.index(@chart.axes[:cat_axis].id.to_s)
+    val_axis_position = str.index(@chart.axes[:val_axis].id.to_s)
+    assert(cat_axis_position < val_axis_position, "cat_axis must occur earlier than val_axis in the XML")
+  end
+
+  def test_to_xml_string_has_gap_width
+    gap_width_value = rand(0..500)
+    @chart.gap_width = gap_width_value
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//c:barChart/c:gapWidth").first.attribute('val').value, gap_width_value.to_s)
+  end
+
+  def test_to_xml_string_has_overlap
+    overlap_value = rand(-100..100)
+    @chart.overlap = overlap_value
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//c:barChart/c:overlap").first.attribute('val').value, overlap_value.to_s)
+  end
+end

data/test/drawing/tc_bar_series.rb

@@ -1,37 +1,46 @@
-require 'tc_helper.rb'
-
-class TestBarSeries < Test::Unit::TestCase
-
-  def setup
-    p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name=>"hmmm"
-    @chart = @ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
-    @series = @chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :colors => ['FF0000', '00FF00', '0000FF'], :shape => :cone
-  end
-
-  def test_initialize
-    assert_equal(@series.title.text, "bob", "series title has been applied")
-    assert_equal(@series.data.class, Axlsx::NumDataSource, "data option applied")
-    assert_equal(@series.shape, :cone, "series shape has been applied")
-    assert(@series.data.is_a?(Axlsx::NumDataSource))
-    assert(@series.labels.is_a?(Axlsx::AxDataSource))
-  end
-
-  def test_colors
-    assert_equal(@series.colors.size, 3)
-  end
-
-  def test_shape
-    assert_raise(ArgumentError, "require valid shape") { @series.shape = :teardropt }
-    assert_nothing_raised("allow valid shape") { @series.shape = :box }
-    assert(@series.shape == :box)
-  end
-
-  def test_to_xml_string
-    doc = Nokogiri::XML(@chart.to_xml_string)
-    @series.colors.each_with_index do |color, index|
-      assert_equal(doc.xpath("//c:dPt/c:idx[@val='#{index}']").size,1)
-      assert_equal(doc.xpath("//c:dPt/c:spPr/a:solidFill/a:srgbClr[@val='#{@series.colors[index]}']").size,1)
-    end
-  end
-end
+require 'tc_helper.rb'
+
+class TestBarSeries < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet :name=>"hmmm"
+    @chart = @ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
+    @series = @chart.add_series(
+      data: [0, 1, 2],
+      labels: ['zero', 'one', 'two'],
+      title: 'bob',
+      colors: ['FF0000', '00FF00', '0000FF'],
+      shape: :cone,
+      series_color: '5A5A5A'
+    )
+  end
+
+  def test_initialize
+    assert_equal(@series.title.text, "bob", "series title has been applied")
+    assert_equal(@series.data.class, Axlsx::NumDataSource, "data option applied")
+    assert_equal(@series.shape, :cone, "series shape has been applied")
+    assert_equal(@series.series_color, '5A5A5A', 'series color has been applied')
+    assert(@series.data.is_a?(Axlsx::NumDataSource))
+    assert(@series.labels.is_a?(Axlsx::AxDataSource))
+  end
+
+  def test_colors
+    assert_equal(@series.colors.size, 3)
+  end
+
+  def test_shape
+    assert_raise(ArgumentError, "require valid shape") { @series.shape = :teardropt }
+    assert_nothing_raised("allow valid shape") { @series.shape = :box }
+    assert(@series.shape == :box)
+  end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    @series.colors.each_with_index do |color, index|
+      assert_equal(doc.xpath("//c:dPt/c:idx[@val='#{index}']").size,1)
+      assert_equal(doc.xpath("//c:dPt/c:spPr/a:solidFill/a:srgbClr[@val='#{@series.colors[index]}']").size,1)
+    end
+    assert_equal(doc.xpath('//c:spPr[not(ancestor::c:dPt)]/a:solidFill/a:srgbClr').first.get_attribute('val'), '5A5A5A', 'series color has been applied')
+  end
+end

data/test/drawing/tc_bubble_chart.rb

@@ -1,44 +1,44 @@
-require 'tc_helper.rb'
-
-class TestBubbleChart < Test::Unit::TestCase
-  def setup
-    @p = Axlsx::Package.new
-    @chart = nil
-    @p.workbook.add_worksheet do |sheet|
-      sheet.add_row ["First",  1,  5,  7,  9]
-      sheet.add_row ["",       1, 25, 49, 81]
-      sheet.add_row ["",       1, 42, 60, 75]
-      sheet.add_row ["Second", 5,  2, 14,  9]
-      sheet.add_row ["",       5, 10, 15, 20]
-      sheet.add_row ["",       5, 28, 92, 13]
-      sheet.add_chart(Axlsx::BubbleChart, :title => "example: Bubble Chart") do |chart|
-        chart.start_at 0, 4
-        chart.end_at 10, 19
-        chart.add_series :xData => sheet["B1:E1"], :yData => sheet["B2:E2"], :bubbleSize => sheet["B3:E3"], :title => sheet["A1"]
-        chart.add_series :xData => sheet["B4:E4"], :yData => sheet["B5:E5"], :bubbleSize => sheet["B6:E6"], :title => sheet["A3"]
-        @chart = chart
-      end
-    end
-  end
-
-  def teardown
-  end
-
-  def test_initialization
-    assert_equal(@chart.series_type, Axlsx::BubbleSeries, "series type incorrect")
-    assert(@chart.xValAxis.is_a?(Axlsx::ValAxis), "independant value axis not created")
-    assert(@chart.yValAxis.is_a?(Axlsx::ValAxis), "dependant value axis not created")
-  end
-
-  def test_to_xml_string
-    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
-    assert(errors.empty?, "error free validation")
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestBubbleChart < Test::Unit::TestCase
+  def setup
+    @p = Axlsx::Package.new
+    @chart = nil
+    @p.workbook.add_worksheet do |sheet|
+      sheet.add_row ["First",  1,  5,  7,  9]
+      sheet.add_row ["",       1, 25, 49, 81]
+      sheet.add_row ["",       1, 42, 60, 75]
+      sheet.add_row ["Second", 5,  2, 14,  9]
+      sheet.add_row ["",       5, 10, 15, 20]
+      sheet.add_row ["",       5, 28, 92, 13]
+      sheet.add_chart(Axlsx::BubbleChart, :title => "example: Bubble Chart") do |chart|
+        chart.start_at 0, 4
+        chart.end_at 10, 19
+        chart.add_series :xData => sheet["B1:E1"], :yData => sheet["B2:E2"], :bubbleSize => sheet["B3:E3"], :title => sheet["A1"]
+        chart.add_series :xData => sheet["B4:E4"], :yData => sheet["B5:E5"], :bubbleSize => sheet["B6:E6"], :title => sheet["A3"]
+        @chart = chart
+      end
+    end
+  end
+
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@chart.series_type, Axlsx::BubbleSeries, "series type incorrect")
+    assert(@chart.xValAxis.is_a?(Axlsx::ValAxis), "independant value axis not created")
+    assert(@chart.yValAxis.is_a?(Axlsx::ValAxis), "dependant value axis not created")
+  end
+
+  def test_to_xml_string
+    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
+    assert(errors.empty?, "error free validation")
+  end
+
+end

data/test/drawing/tc_bubble_series.rb

@@ -1,21 +1,21 @@
-require 'tc_helper.rb'
-
-class TestBubbleSeries < Test::Unit::TestCase
-
-  def setup
-    p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name=>"hmmm"
-    @chart = @ws.add_chart Axlsx::BubbleChart, :title => "Bubble Chart"
-    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :bubbleSize=>[1,5,7], :title=>"GDP", :color => 'FF0000'
-  end
-
-  def test_initialize
-    assert_equal(@series.title.text, "GDP", "series title has been applied")
-  end
-
-  def test_to_xml_string
-    doc = Nokogiri::XML(@chart.to_xml_string)
-    assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,2)
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestBubbleSeries < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet :name=>"hmmm"
+    @chart = @ws.add_chart Axlsx::BubbleChart, :title => "Bubble Chart"
+    @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :bubbleSize=>[1,5,7], :title=>"GDP", :color => 'FF0000'
+  end
+
+  def test_initialize
+    assert_equal(@series.title.text, "GDP", "series title has been applied")
+  end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML(@chart.to_xml_string)
+    assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,2)
+  end
+
+end

data/test/drawing/tc_cat_axis.rb

@@ -1,31 +1,31 @@
-require 'tc_helper.rb'
-
-class TestCatAxis < Test::Unit::TestCase
-  def setup
-    @axis = Axlsx::CatAxis.new
-  end
-  def teardown
-  end
-
-  def test_initialization
-    assert_equal(@axis.auto, 1, "axis auto default incorrect")
-    assert_equal(@axis.lbl_algn, :ctr, "label align default incorrect")
-    assert_equal(@axis.lbl_offset, "100", "label offset default incorrect")
-  end
-
-  def test_auto
-    assert_raise(ArgumentError, "requires valid auto") { @axis.auto = :nowhere }
-    assert_nothing_raised("accepts valid auto") { @axis.auto = false }
-  end
-
-  def test_lbl_algn
-    assert_raise(ArgumentError, "requires valid label alignment") { @axis.lbl_algn = :nowhere }
-    assert_nothing_raised("accepts valid label alignment") { @axis.lbl_algn = :r }
-  end
-
-  def test_lbl_offset
-    assert_raise(ArgumentError, "requires valid label offset") { @axis.lbl_offset = 'foo' }
-    assert_nothing_raised("accepts valid label offset") { @axis.lbl_offset = "20" }
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestCatAxis < Test::Unit::TestCase
+  def setup
+    @axis = Axlsx::CatAxis.new
+  end
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@axis.auto, 1, "axis auto default incorrect")
+    assert_equal(@axis.lbl_algn, :ctr, "label align default incorrect")
+    assert_equal(@axis.lbl_offset, "100", "label offset default incorrect")
+  end
+
+  def test_auto
+    assert_raise(ArgumentError, "requires valid auto") { @axis.auto = :nowhere }
+    assert_nothing_raised("accepts valid auto") { @axis.auto = false }
+  end
+
+  def test_lbl_algn
+    assert_raise(ArgumentError, "requires valid label alignment") { @axis.lbl_algn = :nowhere }
+    assert_nothing_raised("accepts valid label alignment") { @axis.lbl_algn = :r }
+  end
+
+  def test_lbl_offset
+    assert_raise(ArgumentError, "requires valid label offset") { @axis.lbl_offset = 'foo' }
+    assert_nothing_raised("accepts valid label offset") { @axis.lbl_offset = "20" }
+  end
+
+end

data/test/drawing/tc_cat_axis_data.rb

@@ -1,27 +1,27 @@
-# require 'tc_helper.rb'
-
-# class TestCatAxisData < Test::Unit::TestCase
-
-#   def setup
-#     p = Axlsx::Package.new
-#     @ws = p.workbook.add_worksheet
-#     @chart = @ws.drawing.add_chart Axlsx::Bar3DChart
-#     @series = @chart.add_series :labels=>["zero", "one", "two"]
-#   end
-
-#   def test_initialize
-#     assert(@series.labels.is_a?Axlsx::SimpleTypedList)
-#     assert_equal(@series.labels, ["zero", "one", "two"])
-#   end
-
-#   def test_to_xml_string
-#     doc = Nokogiri::XML(@chart.to_xml_string)
-#     assert_equal(doc.xpath("//c:cat/c:strRef/c:f").size,1)
-#     assert_equal(doc.xpath("//c:strCache/c:ptCount[@val='#{@series.labels.size}']").size,1)
-#     @series.labels.each_with_index do |label, index|
-#       assert_equal(doc.xpath("//c:strCache/c:pt[@idx='#{index}']").size,1)
-#       assert_equal(doc.xpath("//c:strCache/c:pt/c:v[text()='#{label}']").size,1)
-#     end
-#   end
-
-# end
+# require 'tc_helper.rb'
+
+# class TestCatAxisData < Test::Unit::TestCase
+
+#   def setup
+#     p = Axlsx::Package.new
+#     @ws = p.workbook.add_worksheet
+#     @chart = @ws.drawing.add_chart Axlsx::Bar3DChart
+#     @series = @chart.add_series :labels=>["zero", "one", "two"]
+#   end
+
+#   def test_initialize
+#     assert(@series.labels.is_a?Axlsx::SimpleTypedList)
+#     assert_equal(@series.labels, ["zero", "one", "two"])
+#   end
+
+#   def test_to_xml_string
+#     doc = Nokogiri::XML(@chart.to_xml_string)
+#     assert_equal(doc.xpath("//c:cat/c:strRef/c:f").size,1)
+#     assert_equal(doc.xpath("//c:strCache/c:ptCount[@val='#{@series.labels.size}']").size,1)
+#     @series.labels.each_with_index do |label, index|
+#       assert_equal(doc.xpath("//c:strCache/c:pt[@idx='#{index}']").size,1)
+#       assert_equal(doc.xpath("//c:strCache/c:pt/c:v[text()='#{label}']").size,1)
+#     end
+#   end
+
+# end