-refactoring chart position and axis data/category for chart.

-additional specs and documentation improvements.

9 files changed, 95 insertions, 30 deletions

diff --git a/test/drawing/tc_axis.rb b/test/drawing/tc_axis.rb
index 6b08d842..426bf4ad 100644
--- a/test/drawing/tc_axis.rb
+++ b/test/drawing/tc_axis.rb
@@ -14,6 +14,7 @@ class TestAxis < Test::Unit::TestCase
     assert_equal(@axis.tickLblPos, :nextTo, "tick label position default incorrect")
     assert_equal(@axis.crosses, :autoZero, "tick label position default incorrect")
     assert(@axis.scaling.is_a?(Axlsx::Scaling) && @axis.scaling.orientation == :minMax, "scaling default incorrect")
+    assert_raise(ArgumentError) { Axlsx::Axis.new -1234, 'abcd' }
   end
 
   def test_axis_position
diff --git a/test/drawing/tc_cat_axis_data.rb b/test/drawing/tc_cat_axis_data.rb
new file mode 100644
index 00000000..e8a71fb1
--- /dev/null
+++ b/test/drawing/tc_cat_axis_data.rb
@@ -0,0 +1,18 @@
+require 'test/unit'
+require 'axlsx.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
+
+end
diff --git a/test/drawing/tc_chart.rb b/test/drawing/tc_chart.rb
index 586df2c5..f303fab9 100644
--- a/test/drawing/tc_chart.rb
+++ b/test/drawing/tc_chart.rb
@@ -34,6 +34,18 @@ class TestChart < Test::Unit::TestCase
     assert_equal(@chart.style, 2)
   end
 
+  def test_start_at
+    @chart.start_at 15,25
+    assert_equal(@chart.graphic_frame.anchor.from.col, 15)
+    assert_equal(@chart.graphic_frame.anchor.from.row, 25)
+
+  end
+
+  def end_at
+    @chart.end_at 25, 90
+    assert_equal(@chart.graphic_frame.anchor.from.col, 25)
+    assert_equal(@chart.graphic_frame.anchor.to.row, 90)
+  end
 
   def test_add_series    
     s = @chart.add_series :data=>[0,1,2,3], :labels => ["one", 1, "anything"], :title=>"bob"
diff --git a/test/drawing/tc_line_series.tc b/test/drawing/tc_line_series.rb
index 54cbc256..602e7770 100644
--- a/test/drawing/tc_line_series.tc
+++ b/test/drawing/tc_line_series.rb
@@ -14,7 +14,6 @@ class TestLineSeries < Test::Unit::TestCase
     assert_equal(@series.title.text, "bob", "series title has been applied")
     assert_equal(@series.data, [0,1,2], "data option applied")
     assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")    
-    assert_equal(@series.shape, :box, "series shape has been applied")   
   end
 
   def test_data
@@ -25,10 +24,4 @@ class TestLineSeries < Test::Unit::TestCase
     assert_equal(@series.labels, ["zero", "one", "two"])
   end
 
-  def test_shape
-    assert_raise(ArgumentError, "require valid shape") { @series.shape = :teardropt }
-    assert_nothing_raised("allow valid shape") { @series.shape = :cone }
-    assert(@series.shape == :cone)
-  end
-
 end
diff --git a/test/drawing/tc_ser_axis.rb b/test/drawing/tc_ser_axis.rb
index 1882e1f1..3d744907 100644
--- a/test/drawing/tc_ser_axis.rb
+++ b/test/drawing/tc_ser_axis.rb
@@ -8,16 +8,24 @@ class TestSerAxis < Test::Unit::TestCase
   def teardown
   end
 
+  def test_options
+    a = Axlsx::SerAxis.new 12345, 54321, :tickLblSkip => 9, :tickMarkSkip => 7
+    assert_equal(a.tickLblSkip, 9)
+    assert_equal(a.tickMarkSkip, 7)
+  end
+
+
   def test_tickLblSkip
-    assert_raise(ArgumentError, "requires valid tickLblSkip") { @axis.tickLblSkip = :my_eyes }
-    assert_nothing_raised("accepts valid tickLblSkip") { @axis.tickLblSkip = false }
-    assert_equal(@axis.tickLblSkip, false)
+    assert_raise(ArgumentError, "requires valid tickLblSkip") { @axis.tickLblSkip = -1 }
+    assert_nothing_raised("accepts valid tickLblSkip") { @axis.tickLblSkip = 1 }
+    assert_equal(@axis.tickLblSkip, 1)
   end
 
+
   def test_tickMarkSkip
     assert_raise(ArgumentError, "requires valid tickMarkSkip") { @axis.tickMarkSkip = :my_eyes }
-    assert_nothing_raised("accepts valid tickMarkSkip") { @axis.tickMarkSkip = false }
-    assert_equal(@axis.tickMarkSkip, false)
+    assert_nothing_raised("accepts valid tickMarkSkip") { @axis.tickMarkSkip = 2 }
+    assert_equal(@axis.tickMarkSkip, 2)
   end
 
 end
diff --git a/test/drawing/tc_two_cell_anchor.rb b/test/drawing/tc_two_cell_anchor.rb
index 1c6e6882..2d87b6a7 100644
--- a/test/drawing/tc_two_cell_anchor.rb
+++ b/test/drawing/tc_two_cell_anchor.rb
@@ -2,13 +2,14 @@ require 'test/unit'
 require 'axlsx.rb'
 
 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
-    @chart = ws.add_chart Axlsx::Bar3DChart
-    @anchor = @chart.graphic_frame.anchor
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet
+    row = @ws.add_row ["one", 1, Time.now]
+    title = Axlsx::Title.new
+    chart = @ws.add_chart Axlsx::Bar3DChart
+    @anchor = chart.graphic_frame.anchor
   end
 
   def teardown
@@ -20,18 +21,18 @@ class TestTwoCellAnchor < Test::Unit::TestCase
     assert(@anchor.to.col == 5)
     assert(@anchor.to.row == 10)
   end
+
   
-  def test_start_at
-    @anchor.start_at 5, 10
-    assert(@anchor.from.col == 5)
-    assert(@anchor.from.row == 10)
-  end
-  
-  def test_end_at
-    @anchor.end_at 10, 15
-    assert(@anchor.to.col == 10)
-    assert(@anchor.to.row == 15)
+  def test_options
+    assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at=>[1] }
+    assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, :start_at=>[1,2], :end_at => ["a", 4] }
+    # this is actually raised in the graphic frame
+    assert_raise(ArgumentError, 'invalid Chart') { @ws.add_chart Axlsx::TwoCellAnchor }
+    a = @ws.add_chart Axlsx::Chart, :start_at => [15, 35], :end_at => [90, 45]
+    assert_equal(a.graphic_frame.anchor.from.col, 15)
+    assert_equal(a.graphic_frame.anchor.from.row, 35)
+    assert_equal(a.graphic_frame.anchor.to.col, 90)
+    assert_equal(a.graphic_frame.anchor.to.row, 45)
   end
-
   
 end
diff --git a/test/drawing/tc_val_axis.rb b/test/drawing/tc_val_axis.rb
index 2dcdd416..4bd8b883 100644
--- a/test/drawing/tc_val_axis.rb
+++ b/test/drawing/tc_val_axis.rb
@@ -12,6 +12,11 @@ class TestValAxis < Test::Unit::TestCase
     assert_equal(@axis.crossBetween, :between, "axis crossBetween default incorrect")
   end
 
+  def test_options
+    a = Axlsx::ValAxis.new 2345, 4321, :crossBetween => :midCat
+    assert_equal(a.crossBetween, :midCat)
+  end
+
   def test_crossBetween
     assert_raise(ArgumentError, "requires valid crossBetween") { @axis.crossBetween = :my_eyes }
     assert_nothing_raised("accepts valid crossBetween") { @axis.crossBetween = :midCat }
diff --git a/test/drawing/tc_val_axis_data.rb b/test/drawing/tc_val_axis_data.rb
new file mode 100644
index 00000000..cb39176d
--- /dev/null
+++ b/test/drawing/tc_val_axis_data.rb
@@ -0,0 +1,18 @@
+require 'test/unit'
+require 'axlsx.rb'
+
+class TestValAxisData < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    @ws = p.workbook.add_worksheet
+    chart = @ws.drawing.add_chart Axlsx::Line3DChart
+    @series = chart.add_series :data=>[0,1,2]
+  end
+  
+  def test_initialize
+    assert(@series.data.is_a?Axlsx::SimpleTypedList)
+    assert_equal(@series.data, [0,1,2])
+  end
+
+end
diff --git a/test/drawing/tc_view_3D.rb b/test/drawing/tc_view_3D.rb
index 909550b5..40d8982f 100644
--- a/test/drawing/tc_view_3D.rb
+++ b/test/drawing/tc_view_3D.rb
@@ -8,7 +8,16 @@ class TestView3D < Test::Unit::TestCase
 
   def teardown
   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)
+    assert_equal(v.perspective, 10)
+  end
   
   def test_rotX
     assert_raise(ArgumentError) {@view.rotX = "bob"}