write_xlsx 0.70.0 → 0.71.0

data/test/chart/test_write_number_format.rb

@@ -8,7 +8,7 @@ def setup
   end
 
   def test_write_number_format
-    axis = Writexlsx::Chart::Axis.new
+    axis = Writexlsx::Chart::Axis.new(@chart)
     axis.num_format = 'General'
     axis.defaults   = { :num_format => 'General' }
 
@@ -18,7 +18,7 @@ def test_write_number_format
   end
 
   def test_write_number_format02
-    axis = Writexlsx::Chart::Axis.new
+    axis = Writexlsx::Chart::Axis.new(@chart)
     axis.num_format = '#,##0.00'
     axis.defaults   = { :num_format => 'General' }
 
@@ -28,7 +28,7 @@ def test_write_number_format02
   end
 
   def test_write_number_format03
-    axis = Writexlsx::Chart::Axis.new
+    axis = Writexlsx::Chart::Axis.new(@chart)
     axis.num_format = 'General'
     axis.defaults   = { :num_format => 'General' }
 
@@ -38,7 +38,7 @@ def test_write_number_format03
   end
 
   def test_write_number_format04
-    axis = Writexlsx::Chart::Axis.new
+    axis = Writexlsx::Chart::Axis.new(@chart)
     axis.num_format = '#,##0.00'
     axis.defaults   = { :num_format => 'General' }
 

data/test/helper.rb

@@ -108,6 +108,19 @@ def compare_xlsx(exp_filename, got_filename, ignore_members = nil, ignore_elemen
         got_xml_str = got_xml_str.gsub(/\d\d\d\d-\d\d-\d\dT\d\d\:\d\d:\d\dZ/,'')
       end
 
+      # Remove workbookView dimensions which are almost always different.
+      if exp_members[i].name == 'xl/workbook.xml'
+        exp_xml_str.sub!(/<workbookView[^>]*>/, '<workbookView/>')
+        got_xml_str.sub!(/<workbookView[^>]*>/, '<workbookView/>')
+      end
+
+      # Remove the calcpr elements which may have different Excel version ids.
+      if exp_members[i].name == 'xl/workbook.xml'
+        exp_xml_str.sub!(/<calcPr[^>]*>/, '<calcPr/>')
+        got_xml_str.sub!(/<calcPr[^>]*>/, '<calcPr/>')
+      end
+
+      # Remove printer specific settings from Worksheet pageSetup elements.
       if exp_members[i].name =~ %r!xl/worksheets/sheet\d.xml!
         exp_xml_str = exp_xml_str.
           sub(/horizontalDpi="200" /, '').

data/test/regression/test_chart_area04.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartArea04 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_area04
+    @xlsx = 'chart_area04.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'area', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [63591168, 63592704])
+    chart.instance_variable_set(:@axis2_ids, [74921856, 73764224])
+
+    data = [
+            [1, 2, 3,  4,  5],
+            [6, 8, 6,  4,  2]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5', :y2_axis => 1)
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+                                [],
+                                {
+                                  'xl/charts/chart1.xml' => ['<c:pageMargins'],
+                                  'xl/workbook.xml'      => [ '<fileVersion' ]
+                                }
+                                )
+  end
+end

data/test/regression/test_chart_bar24.rb

@@ -38,9 +38,8 @@ def test_chart_bar24
                                 nil,
                                 {
                                   'xl/charts/chart1.xml' => ['<c:pageMargins'],
-                                  'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+                                  'xl/workbook.xml'      => [ '<fileVersion' ]
                                 }
                                 )
   end
 end
-

data/test/regression/test_chart_column04.rb

@@ -38,7 +38,7 @@ def test_chart_column04
                                 nil,
                                 {
                                   'xl/charts/chart1.xml' => ['<c:pageMargins'],
-                                  'xl/workbook.xml'      => ['<fileVersion', '<calcPr']
+                                  'xl/workbook.xml'      => ['<fileVersion']
                                 }
                                 )
   end

data/test/regression/test_chart_line02.rb

@@ -38,7 +38,7 @@ def test_chart_line02
                                 nil,
                                 {
     'xl/charts/chart1.xml' => ['<c:pageMargins'],
-    'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+    'xl/workbook.xml'      => [ '<fileVersion' ]
                                 }
                                 )
   end

data/test/regression/test_chart_scatter07.rb

@@ -52,7 +52,7 @@ def test_chart_scatter07
                                 nil,
                                 {
                                   'xl/charts/chart1.xml' => ['<c:pageMargins'],
-                                  'xl/workbook.xml'      => [ '<fileVersion', '<calcPr' ]
+                                  'xl/workbook.xml'      => [ '<fileVersion' ]
                                 }
                                 )
 

data/test/regression/test_chart_stock02.rb

@@ -65,7 +65,7 @@ def test_chart_stock02
                                 nil,
                                 {
                                   'xl/charts/chart1.xml' => [ '<c:formatCode', '<c:pageMargins' ],
-                                  'xl/workbook.xml'      => [ '<fileVersion',  '<calcPr' ],
+                                  'xl/workbook.xml'      => [ '<fileVersion' ],
                                   'xl/worksheets/sheet1.xml' => [ '<sheetView', '<selection activeCell', '</sheetView' ],
                                 }
                                 )

data/test/regression/test_image10.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage10 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image10
+    @xlsx = 'image10.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image11.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage11 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image11
+    @xlsx = 'image11.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png', 8, 5)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image12.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage12 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image12
+    @xlsx = 'image12.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 75)
+    worksheet.set_column('C:C', 32)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image13.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage13 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image13
+    @xlsx = 'image13.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 75)
+    worksheet.set_column('C:C', 32)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png', 8, 5)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image14.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage14 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image14
+    @xlsx = 'image14.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 4.5)
+    worksheet.set_row(2, 35.25)
+    worksheet.set_column('C:E', 3.29)
+    worksheet.set_column('F:F', 10.71)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image15.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage15 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image15
+    @xlsx = 'image15.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 4.5)
+    worksheet.set_row(2, 35.25)
+    worksheet.set_column('C:E', 3.29)
+    worksheet.set_column('F:F', 10.71)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/logo.png', 13, 2)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image16.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage16 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image16
+    @xlsx = 'image16.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/issue32.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image17.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage17 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image17
+    @xlsx = 'image17.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 96)
+    worksheet.set_column('C:C', 18)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/issue32.png')
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

data/test/regression/test_image18.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage18 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_image18
+    @xlsx = 'image18.xlsx'
+    workbook  = WriteXLSX.new(@xlsx)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_row(1, 96)
+    worksheet.set_column('C:C', 18)
+
+    worksheet.insert_image('C2',
+                           'test/regression/images/issue32.png', 5, 5)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end