axlsx 1.0.18 → 1.1.0

data/test/content_type/tc_default.rb

@@ -1,13 +1,8 @@
 # encoding: UTF-8
-
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestDefault < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
+
   def test_initialization_requires_Extension_and_ContentType
     assert_raise(ArgumentError, "raises argument error if Extension and/or ContentType are not specified") { Axlsx::Default.new }
     assert_raise(ArgumentError, "raises argument error if Extension and/or ContentType are not specified") { Axlsx::Default.new :Extension=>"xml" }
@@ -19,23 +14,13 @@ class TestDefault < Test::Unit::TestCase
   def test_content_type_restriction
     assert_raise(ArgumentError, "raises argument error if invlalid ContentType is") { Axlsx::Default.new :ContentType=>"asdf" }
   end
-  
-  def test_to_xml
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::CONTENT_TYPES_XSD))
+
+  def test_to_xml_string
     type = Axlsx::Default.new :Extension=>"xml", :ContentType=>Axlsx::XML_CT
-    builder = Nokogiri::XML::Builder.new(:encoding => Axlsx::ENCODING) do |xml|
-      xml.Types(:xmlns => Axlsx::XML_NS_T) {
-        type.to_xml(xml)
-      }
-    end
-    doc = Nokogiri::XML(builder.to_xml)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-    assert_equal(errors.size, 0, "[Content Types].xml Invalid" + errors.map{ |e| e.message }.to_s)
-    
+    doc = Nokogiri::XML(type.to_xml_string)
+    assert_equal(doc.xpath("Default[@ContentType='#{Axlsx::XML_CT}']").size, 1)
+    assert_equal(doc.xpath("Default[@Extension='xml']").size, 1)
+
   end
 
 

data/test/content_type/tc_override.rb

@@ -1,12 +1,8 @@
 # -*- coding: utf-8 -*-
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestOverride < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
+
   def test_initialization_requires_Extension_and_ContentType
     err = "requires PartName and ContentType options"
     assert_raise(ArgumentError, err) { Axlsx::Override.new }
@@ -18,23 +14,13 @@ class TestOverride < Test::Unit::TestCase
   def test_content_type_restriction
     assert_raise(ArgumentError, "requires known content type") { Axlsx::Override.new :ContentType=>"asdf" }
   end
-  
+
   def test_to_xml
-    schema = Nokogiri::XML::Schema(File.open(Axlsx::CONTENT_TYPES_XSD))
     type = Axlsx::Override.new :PartName=>"somechart.xml", :ContentType=>Axlsx::CHART_CT
-    builder = Nokogiri::XML::Builder.new(:encoding => Axlsx::ENCODING) do |xml|
-      xml.Types(:xmlns => Axlsx::XML_NS_T) {
-        type.to_xml(xml)
-      }
-    end
-    doc = Nokogiri::XML(builder.to_xml)
-    errors = []
-    schema.validate(doc).each do |error|
-      puts error.message
-      errors << error
-    end
-    assert_equal(errors.size, 0, "Override content type caused invalid content_type doc" + errors.map{ |e| e.message }.to_s)
-    
+    doc = Nokogiri::XML(type.to_xml_string)
+    assert_equal(doc.xpath("Override[@ContentType='#{Axlsx::CHART_CT}']").size, 1)
+    assert_equal(doc.xpath("Override[@PartName='somechart.xml']").size, 1)
+
   end
 
 

data/test/doc_props/tc_app.rb

@@ -1,15 +1,9 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestApp < Test::Unit::TestCase
-  def setup    
-  end
-  def teardown
-  end
-  
   def test_valid_document
     schema = Nokogiri::XML::Schema(File.open(Axlsx::APP_XSD))
-    doc = Nokogiri::XML(Axlsx::App.new.to_xml)
+    doc = Nokogiri::XML(Axlsx::App.new.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors << error

data/test/doc_props/tc_core.rb

@@ -1,11 +1,10 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCore < Test::Unit::TestCase
-  
-  def setup    
+
+  def setup
     @core = Axlsx::Core.new
-    @doc = Nokogiri::XML(@core.to_xml)
+    @doc = Nokogiri::XML(@core.to_xml_string)
   end
 
   def test_valid_document
@@ -21,14 +20,14 @@ class TestCore < Test::Unit::TestCase
   def test_populates_created
     assert_equal(@doc.xpath('//dcterms:created').text, Time.now.strftime('%Y-%m-%dT%H:%M:%S'), "dcterms:created incorrect")
   end
- 
+
   def test_populates_default_name
     assert_equal(@doc.xpath('//dc:creator').text, "axlsx", "Default name not populated")
   end
 
   def test_creator_as_option
     c = Axlsx::Core.new :creator => "some guy"
-    doc = Nokogiri::XML(c.to_xml)
+    doc = Nokogiri::XML(c.to_xml_string)
     assert(doc.xpath('//dc:creator').text == "some guy")
   end
 end

data/test/drawing/tc_axis.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestAxis < Test::Unit::TestCase
-  def setup    
+  def setup
     @axis = Axlsx::Axis.new 12345, 54321
   end
   def teardown
@@ -37,4 +36,9 @@ class TestAxis < Test::Unit::TestCase
     assert_nothing_raised("accepts valid crosses") { @axis.crosses = :min }
   end
 
+  def test_gridlines
+    assert_raise(ArgumentError, "requires valid gridlines") { @axis.gridlines = 'alice' }
+    assert_nothing_raised("accepts valid crosses") { @axis.gridlines = false }
+  end
+
 end

data/test/drawing/tc_bar_3D_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBar3DChart < Test::Unit::TestCase
 
@@ -13,7 +12,7 @@ class TestBar3DChart < Test::Unit::TestCase
   def teardown
   end
 
-  def test_initialization    
+  def test_initialization
     assert_equal(@chart.grouping, :clustered, "grouping defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::BarSeries, "series type incorrect")
     assert_equal(@chart.barDir, :bar, " bar direction incorrect")
@@ -52,15 +51,15 @@ class TestBar3DChart < Test::Unit::TestCase
     assert(@chart.shape == :cone)
   end
 
-  def test_to_xml
+  def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@chart.to_xml)
+    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
+
 end

data/test/drawing/tc_bar_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestBarSeries < Test::Unit::TestCase
 
@@ -9,12 +8,12 @@ class TestBarSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Bar3DChart, :title => "fishery"
     @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
   end
-  
+
   def test_initialize
     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")   
+    assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")
+    assert_equal(@series.shape, :box, "series shape has been applied")
   end
 
   def test_data

data/test/drawing/tc_cat_axis.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCatAxis < Test::Unit::TestCase
-  def setup    
+  def setup
     @axis = Axlsx::CatAxis.new 12345, 54321
   end
   def teardown

data/test/drawing/tc_cat_axis_data.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestCatAxisData < Test::Unit::TestCase
 
@@ -9,7 +8,7 @@ class TestCatAxisData < Test::Unit::TestCase
     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"])

data/test/drawing/tc_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestChart < Test::Unit::TestCase
 
@@ -16,7 +15,7 @@ class TestChart < Test::Unit::TestCase
   def test_initialization
     assert_equal(@p.workbook.charts.last,@chart, "the chart is in the workbook")
     assert_equal(@chart.title.text, "fishery", "the title option has been applied")
-    assert((@chart.series.is_a?(Axlsx::SimpleTypedList) && @chart.series.empty?), "The series is initialized and empty") 
+    assert((@chart.series.is_a?(Axlsx::SimpleTypedList) && @chart.series.empty?), "The series is initialized and empty")
   end
 
   def test_title
@@ -47,27 +46,27 @@ class TestChart < Test::Unit::TestCase
     assert_equal(@chart.graphic_frame.anchor.to.row, 90)
   end
 
-  def test_add_series    
+  def test_add_series
     s = @chart.add_series :data=>[0,1,2,3], :labels => ["one", 1, "anything"], :title=>"bob"
     assert_equal(@chart.series.last, s, "series has been added to chart series collection")
     assert_equal(s.title.text, "bob", "series title has been applied")
     assert_equal(s.data, [0,1,2,3], "data option applied")
-    assert_equal(s.labels, ["one",1,"anything"], "labels option applied")    
-  end  
-  
+    assert_equal(s.labels, ["one",1,"anything"], "labels option applied")
+  end
+
   def test_pn
     assert_equal(@chart.pn, "charts/chart1.xml")
   end
- 
-  def test_to_xml
+
+  def test_to_xml_string
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@chart.to_xml)
+    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
+
 end

data/test/drawing/tc_drawing.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestDrawing < Test::Unit::TestCase
-  def setup    
+  def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
 
@@ -24,14 +23,14 @@ class TestDrawing < Test::Unit::TestCase
     assert_equal([anchor.to.row, anchor.to.col], [1,1], "options for start at are applied")
     assert_equal(chart.title.text, "bob", "option for title is applied")
   end
-  
+
   def test_add_image
     src = File.dirname(__FILE__) + "/../../examples/image1.jpeg"
     image = @ws.add_image(:image_src => src, :start_at=>[0,0], :width=>600, :height=>400)
     assert(@ws.drawing.anchors.last.is_a?(Axlsx::OneCellAnchor))
     assert(image.is_a?(Axlsx::Pic))
     assert_equal(600, image.width)
-    assert_equal(400, image.height)        
+    assert_equal(400, image.height)
   end
 
   def test_charts
@@ -39,7 +38,7 @@ class TestDrawing < Test::Unit::TestCase
     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")   
+    assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
   end
 
   def test_pn
@@ -53,7 +52,7 @@ class TestDrawing < Test::Unit::TestCase
   def test_rId
     assert_equal(@ws.drawing.rId, "rId1")
   end
-  
+
   def test_index
     assert_equal(@ws.drawing.index, @ws.workbook.drawings.index(@ws.drawing))
   end
@@ -68,7 +67,7 @@ class TestDrawing < Test::Unit::TestCase
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@ws.drawing.to_xml)
+    doc = Nokogiri::XML(@ws.drawing.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors.push error

data/test/drawing/tc_graphic_frame.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestGraphicFrame < Test::Unit::TestCase
-  def setup    
+  def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
     @chart = @ws.add_chart Axlsx::Chart
@@ -20,7 +19,7 @@ class TestGraphicFrame < Test::Unit::TestCase
   def test_rId
     assert_equal(@frame.rId, "rId1")
     chart = @ws.add_chart Axlsx::Chart
-    assert_equal(chart.graphic_frame.rId, "rId2")    
+    assert_equal(chart.graphic_frame.rId, "rId2")
   end
 
 end

data/test/drawing/tc_hyperlink.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestHyperlink < Test::Unit::TestCase
 
@@ -66,5 +65,5 @@ class TestHyperlink < Test::Unit::TestCase
     assert_raise(ArgumentError) {@hyperlink.history = "bob"}
     assert_equal(@hyperlink.history, false )
   end
-  
+
 end

data/test/drawing/tc_line_3d_chart.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestLine3DChart < Test::Unit::TestCase
 
@@ -13,7 +12,7 @@ class TestLine3DChart < Test::Unit::TestCase
   def teardown
   end
 
-  def test_initialization    
+  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")
@@ -36,13 +35,13 @@ class TestLine3DChart < Test::Unit::TestCase
 
   def test_to_xml
     schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
-    doc = Nokogiri::XML(@chart.to_xml)
+    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
+
 end

data/test/drawing/tc_line_series.rb

@@ -1,5 +1,4 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestLineSeries < Test::Unit::TestCase
 
@@ -9,11 +8,11 @@ class TestLineSeries < Test::Unit::TestCase
     chart = @ws.drawing.add_chart Axlsx::Line3DChart, :title => "fishery"
     @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
   end
-  
+
   def test_initialize
     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.labels, ["zero", "one","two"], "labels option applied")
   end
 
   def test_data

data/test/drawing/tc_marker.rb

@@ -1,8 +1,7 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestMarker < Test::Unit::TestCase
-  def setup    
+  def setup
     @marker = Axlsx::Marker.new
   end
 
@@ -41,5 +40,5 @@ class TestMarker < Test::Unit::TestCase
     assert_equal(@marker.col, 5)
     assert_equal(@marker.row, 10)
   end
-  
+
 end