Fixed LineChart and refactored chart axes management

5 files changed, 45 insertions, 47 deletions

diff --git a/test/drawing/tc_axis.rb b/test/drawing/tc_axis.rb
index 807655d7..3546f786 100644
--- a/test/drawing/tc_axis.rb
+++ b/test/drawing/tc_axis.rb
@@ -2,25 +2,22 @@ require 'tc_helper.rb'
 
 class TestAxis < Test::Unit::TestCase
   def setup
-    
-    @axis = Axlsx::Axis.new 12345, 54321, :gridlines => false, :title => 'Foo'
+    @axis = Axlsx::Axis.new :gridlines => false, :title => 'Foo'
   end
 
-  def teardown
-  end
 
   def test_initialization
-    assert_equal(@axis.axPos, :b, "axis position default incorrect")
-    assert_equal(@axis.tickLblPos, :nextTo, "tick label position default incorrect")
-    assert_equal(@axis.tickLblPos, :nextTo, "tick label position default incorrect")
+    assert_equal(@axis.ax_pos, :b, "axis position default incorrect")
+    assert_equal(@axis.tick_lbl_pos, :nextTo, "tick label position default incorrect")
+    assert_equal(@axis.tick_lbl_pos, :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') }
     assert_equal('Foo', @axis.title.text)
   end
 
   def test_color
     @axis.color = "00FF00"
+    @axis.cross_axis = Axlsx::CatAxis.new
     str  = '<?xml version="1.0" encoding="UTF-8"?>'
     str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '">'
     doc = Nokogiri::XML(@axis.to_xml_string(str)) 
@@ -35,15 +32,15 @@ class TestAxis < Test::Unit::TestCase
       sheet.add_row ['cat', 7, 9, 10]
       sheet.add_chart(Axlsx::Line3DChart) do |chart|
         chart.add_series :data => sheet['B2:D2'], :labels => sheet['B1']
-        chart.valAxis.title = sheet['A1']
-        assert_equal('battle victories', chart.valAxis.title.text)  
+        chart.val_axis.title = sheet['A1']
+        assert_equal('battle victories', chart.val_axis.title.text)
       end
     end
   end
 
   def test_axis_position
-    assert_raise(ArgumentError, "requires valid axis position") { @axis.axPos = :nowhere }
-    assert_nothing_raised("accepts valid axis position") { @axis.axPos = :r }
+    assert_raise(ArgumentError, "requires valid axis position") { @axis.ax_pos = :nowhere }
+    assert_nothing_raised("accepts valid axis position") { @axis.ax_pos = :r }
   end
 
   def test_label_rotation
@@ -55,13 +52,13 @@ class TestAxis < Test::Unit::TestCase
   end
 
   def test_tick_label_position
-    assert_raise(ArgumentError, "requires valid tick label position") { @axis.tickLblPos = :nowhere }
-    assert_nothing_raised("accepts valid tick label position") { @axis.tickLblPos = :high }
+    assert_raise(ArgumentError, "requires valid tick label position") { @axis.tick_lbl_pos = :nowhere }
+    assert_nothing_raised("accepts valid tick label position") { @axis.tick_lbl_pos = :high }
   end
 
   def test_format_code
-    assert_raise(ArgumentError, "requires valid format code") { @axis.format_code = 1 }
-    assert_nothing_raised("accepts valid format code") { @axis.tickLblPos = :high }
+    assert_raise(ArgumentError, "requires valid format code") { @axis.format_code = :high }
+    assert_nothing_raised("accepts valid format code") { @axis.format_code = "00.##"  }
   end
 
   def test_crosses
@@ -75,12 +72,13 @@ class TestAxis < Test::Unit::TestCase
   end
   
   def test_to_xml_string
+    @axis.cross_axis = Axlsx::CatAxis.new
     str  = '<?xml version="1.0" encoding="UTF-8"?>'
     str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '">'
     doc = Nokogiri::XML(@axis.to_xml_string(str)) 
     assert(doc.xpath('//a:noFill'))
     assert(doc.xpath("//c:crosses[@val='#{@axis.crosses.to_s}']"))
-    assert(doc.xpath("//c:crossAx[@val='#{@axis.crossAx.to_s}']"))
+    assert(doc.xpath("//c:crossAx[@val='#{@axis.cross_axis.to_s}']"))
     assert(doc.xpath("//a:bodyPr[@rot='#{@axis.label_rotation.to_s}']"))
     assert(doc.xpath("//a:t[text()='Foo']"))
   end
diff --git a/test/drawing/tc_cat_axis.rb b/test/drawing/tc_cat_axis.rb
index 6529b45d..ac690336 100644
--- a/test/drawing/tc_cat_axis.rb
+++ b/test/drawing/tc_cat_axis.rb
@@ -2,15 +2,15 @@ require 'tc_helper.rb'
 
 class TestCatAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::CatAxis.new 12345, 54321
+    @axis = Axlsx::CatAxis.new
   end
   def teardown
   end
 
   def test_initialization
     assert_equal(@axis.auto, 1, "axis auto default incorrect")
-    assert_equal(@axis.lblAlgn, :ctr, "label align default incorrect")
-    assert_equal(@axis.lblOffset, "100", "label offset 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
@@ -18,14 +18,14 @@ class TestCatAxis < Test::Unit::TestCase
     assert_nothing_raised("accepts valid auto") { @axis.auto = false }
   end
 
-  def test_lblAlgn
-    assert_raise(ArgumentError, "requires valid label alignment") { @axis.lblAlgn = :nowhere }
-    assert_nothing_raised("accepts valid label alignment") { @axis.lblAlgn = :r }
+  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_lblOffset
-    assert_raise(ArgumentError, "requires valid label offset") { @axis.lblOffset = 'foo' }
-    assert_nothing_raised("accepts valid label offset") { @axis.lblOffset = "20" }
+  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
diff --git a/test/drawing/tc_line_chart.rb b/test/drawing/tc_line_chart.rb
index 07e23702..83ebef97 100644
--- a/test/drawing/tc_line_chart.rb
+++ b/test/drawing/tc_line_chart.rb
@@ -15,9 +15,8 @@ class TestLineChart < Test::Unit::TestCase
   def test_initialization
     assert_equal(@chart.grouping, :standard, "grouping defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::LineSeries, "series type incorrect")
-    assert(@chart.catAxis.is_a?(Axlsx::CatAxis), "category axis not created")
-    assert(@chart.valAxis.is_a?(Axlsx::ValAxis), "value access not created")
-    assert(@chart.serAxis.is_a?(Axlsx::SerAxis), "value access not created")
+    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_grouping
diff --git a/test/drawing/tc_ser_axis.rb b/test/drawing/tc_ser_axis.rb
index 2f30ceb8..7febafce 100644
--- a/test/drawing/tc_ser_axis.rb
+++ b/test/drawing/tc_ser_axis.rb
@@ -2,29 +2,30 @@ require 'tc_helper.rb'
 
 class TestSerAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::SerAxis.new 12345, 54321
+    @axis = Axlsx::SerAxis.new
   end
+
   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)
+    a = Axlsx::SerAxis.new(:tick_lbl_skip => 9, :tick_mark_skip => 7)
+    assert_equal(a.tick_lbl_skip, 9)
+    assert_equal(a.tick_mark_skip, 7)
   end
 
 
-  def test_tickLblSkip
-    assert_raise(ArgumentError, "requires valid tickLblSkip") { @axis.tickLblSkip = -1 }
-    assert_nothing_raised("accepts valid tickLblSkip") { @axis.tickLblSkip = 1 }
-    assert_equal(@axis.tickLblSkip, 1)
+  def test_tick_lbl_skip
+    assert_raise(ArgumentError, "requires valid tick_lbl_skip") { @axis.tick_lbl_skip = -1 }
+    assert_nothing_raised("accepts valid tick_lbl_skip") { @axis.tick_lbl_skip = 1 }
+    assert_equal(@axis.tick_lbl_skip, 1)
   end
 
 
-  def test_tickMarkSkip
-    assert_raise(ArgumentError, "requires valid tickMarkSkip") { @axis.tickMarkSkip = :my_eyes }
-    assert_nothing_raised("accepts valid tickMarkSkip") { @axis.tickMarkSkip = 2 }
-    assert_equal(@axis.tickMarkSkip, 2)
+  def test_tick_mark_skip
+    assert_raise(ArgumentError, "requires valid tick_mark_skip") { @axis.tick_mark_skip = :my_eyes }
+    assert_nothing_raised("accepts valid tick_mark_skip") { @axis.tick_mark_skip = 2 }
+    assert_equal(@axis.tick_mark_skip, 2)
   end
 
 end
diff --git a/test/drawing/tc_val_axis.rb b/test/drawing/tc_val_axis.rb
index f3f55421..aa1cb23a 100644
--- a/test/drawing/tc_val_axis.rb
+++ b/test/drawing/tc_val_axis.rb
@@ -2,23 +2,23 @@ require 'tc_helper.rb'
 
 class TestValAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::ValAxis.new 12345, 54321
+    @axis = Axlsx::ValAxis.new
   end
   def teardown
   end
 
   def test_initialization
-    assert_equal(@axis.crossBetween, :between, "axis crossBetween default incorrect")
+    assert_equal(@axis.cross_between, :between, "axis crossBetween default incorrect")
   end
 
   def test_options
-    a = Axlsx::ValAxis.new 2345, 4321, :crossBetween => :midCat
-    assert_equal(a.crossBetween, :midCat)
+    a = Axlsx::ValAxis.new(:cross_between => :midCat)
+    assert_equal(:midCat, a.cross_between)
   end
 
   def test_crossBetween
-    assert_raise(ArgumentError, "requires valid crossBetween") { @axis.crossBetween = :my_eyes }
-    assert_nothing_raised("accepts valid crossBetween") { @axis.crossBetween = :midCat }
+    assert_raise(ArgumentError, "requires valid crossBetween") { @axis.cross_between = :my_eyes }
+    assert_nothing_raised("accepts valid crossBetween") { @axis.cross_between = :midCat }
   end
 
 end