write_xlsx 0.51.0 → 0.54.0

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -39,12 +39,12 @@ module Writexlsx
       end
 
       def empty_tag(tag, attr = [])
-        str = "<#{tag}#{key_vals(attr)} />"
+        str = "<#{tag}#{key_vals(attr)}/>"
         io_write(str)
       end
 
       def empty_tag_encoded(tag, attr = [])
-        str = "<#{tag}#{key_vals(attr)} />"
+        str = "<#{tag}#{key_vals(attr)}/>"
         io_write(str)
       end
 

data/lib/write_xlsx/version.rb

@@ -0,0 +1,5 @@
+require 'write_xlsx/workbook'
+
+class WriteXLSX < Writexlsx::Workbook
+  VERSION = "0.54.0"
+end

data/test/chart/test_write_a_latin.rb

@@ -0,0 +1,22 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+require 'write_xlsx/chart'
+
+class TestWriteALatin < Test::Unit::TestCase
+  def setup
+    @chart = Writexlsx::Chart.new('Bar')
+  end
+
+  def test_write_a_latin
+    expected = '<a:latin typeface="Arial" pitchFamily="34" charset="0"/>'
+
+    result = @chart.__send__('write_a_latin',
+                             [
+                              'typeface', 'Arial',
+                              'pitchFamily', 34,
+                              'charset', 0
+                             ]
+                         )
+    assert_equal(expected, result)
+  end
+end

data/test/chart/test_write_auto.rb

@@ -8,7 +8,7 @@ class TestWriteAuto < Test::Unit::TestCase
   end
 
   def test_write_auto
-    expected = '<c:auto val="1" />'
+    expected = '<c:auto val="1"/>'
     result = @chart.__send__('write_auto', 1)
     assert_equal(expected, result)
   end

data/test/chart/test_write_ax_id.rb

@@ -8,7 +8,7 @@ class TestWriteAxId < Test::Unit::TestCase
   end
 
   def test_write_axis_id
-    expected = '<c:axId val="53850880" />'
+    expected = '<c:axId val="53850880"/>'
     result = @chart.__send__('write_axis_id', 53850880)
     assert_equal(expected, result)
   end

data/test/chart/test_write_ax_pos.rb

@@ -8,7 +8,7 @@ class TestAxPos < Test::Unit::TestCase
   end
 
   def test_write_axis_pos
-    expected = '<c:axPos val="l" />'
+    expected = '<c:axPos val="l"/>'
     result = @chart.__send__('write_axis_pos', 'l')
     assert_equal(expected, result)
   end

data/test/chart/test_write_cross_ax.rb

@@ -8,7 +8,7 @@ class TestWriteCrossAx < Test::Unit::TestCase
   end
 
   def test_write_cross_axis
-    expected = '<c:crossAx val="82642816" />'
+    expected = '<c:crossAx val="82642816"/>'
     result = @chart.__send__('write_cross_axis', 82642816)
     assert_equal(expected, result)
   end

data/test/chart/test_write_crosses.rb

@@ -8,7 +8,7 @@ class TestWriteCrosses < Test::Unit::TestCase
   end
 
   def test_write_crosses
-    expected = '<c:crosses val="autoZero" />'
+    expected = '<c:crosses val="autoZero"/>'
     result = @chart.__send__('write_crosses', 'autoZero')
     assert_equal(expected, result)
   end

data/test/chart/test_write_d_lbls.rb

@@ -8,7 +8,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_value_only
-    expected = '<c:dLbls><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties, :value => 1)
     @chart.__send__(:write_d_lbls, labels)
@@ -18,7 +18,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_series_name_only
-    expected = '<c:dLbls><c:showSerName val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showSerName val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties, :series_name => 1)
     @chart.__send__(:write_d_lbls, labels)
@@ -28,7 +28,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_category_only
-    expected = '<c:dLbls><c:showCatName val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showCatName val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties, :category => 1)
     @chart.__send__(:write_d_lbls, labels)
@@ -38,7 +38,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_value_category_and_series
-    expected = '<c:dLbls><c:showVal val="1" /><c:showCatName val="1" /><c:showSerName val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showVal val="1"/><c:showCatName val="1"/><c:showSerName val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -54,7 +54,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_center
-    expected = '<c:dLbls><c:dLblPos val="ctr" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="ctr"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -69,7 +69,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_left
-    expected = '<c:dLbls><c:dLblPos val="l" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="l"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -84,7 +84,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_right
-    expected = '<c:dLbls><c:dLblPos val="r" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="r"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -99,7 +99,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_top
-    expected = '<c:dLbls><c:dLblPos val="t" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="t"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -114,7 +114,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_above
-    expected = '<c:dLbls><c:dLblPos val="t" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="t"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -129,7 +129,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_bottom
-    expected = '<c:dLbls><c:dLblPos val="b" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="b"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -144,7 +144,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_position_below
-    expected = '<c:dLbls><c:dLblPos val="b" /><c:showVal val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="b"/><c:showVal val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -159,7 +159,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie
-    expected = '<c:dLbls><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -174,7 +174,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_position_empty
-    expected = '<c:dLbls><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -190,7 +190,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_position_center
-    expected = '<c:dLbls><c:dLblPos val="ctr" /><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="ctr"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -206,7 +206,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_position_inside_end
-    expected = '<c:dLbls><c:dLblPos val="inEnd" /><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="inEnd"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -222,7 +222,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_position_outside_end
-    expected = '<c:dLbls><c:dLblPos val="outEnd" /><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="outEnd"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -238,7 +238,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_position_best_fit
-    expected = '<c:dLbls><c:dLblPos val="bestFit" /><c:showVal val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:dLblPos val="bestFit"/><c:showVal val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {
@@ -254,7 +254,7 @@ class TestWriteDLbls < Test::Unit::TestCase
   end
 
   def test_write_d_lbls_pie_percentage
-    expected = '<c:dLbls><c:showPercent val="1" /><c:showLeaderLines val="1" /></c:dLbls>'
+    expected = '<c:dLbls><c:showPercent val="1"/><c:showLeaderLines val="1"/></c:dLbls>'
 
     labels = @chart.__send__(:get_labels_properties,
                              {

data/test/chart/test_write_idx.rb

@@ -8,7 +8,7 @@ class TestWriteIdx < Test::Unit::TestCase
   end
 
   def test_write_idx
-    expected = '<c:idx val="0" />'
+    expected = '<c:idx val="0"/>'
     result = @chart.__send__('write_idx', 0)
     assert_equal(expected, result)
   end

data/test/chart/test_write_label_align.rb

@@ -8,7 +8,7 @@ class TestWriteLabelAlign < Test::Unit::TestCase
   end
 
   def test_write_label_align
-    expected = '<c:lblAlgn val="ctr" />'
+    expected = '<c:lblAlgn val="ctr"/>'
     result = @chart.__send__('write_label_align', 'ctr')
     assert_equal(expected, result)
   end

data/test/chart/test_write_label_offset.rb

@@ -8,7 +8,7 @@ class TestWriteLabelOffset < Test::Unit::TestCase
   end
 
   def test_write_label_offset
-    expected = '<c:lblOffset val="100" />'
+    expected = '<c:lblOffset val="100"/>'
     result = @chart.__send__('write_label_offset', 100)
     assert_equal(expected, result)
   end

data/test/chart/test_write_lang.rb

@@ -8,7 +8,7 @@ class TestWriteLang < Test::Unit::TestCase
   end
 
   def test_write_lang
-    expected = '<c:lang val="en-US" />'
+    expected = '<c:lang val="en-US"/>'
     result = @chart.__send__('write_lang')
     assert_equal(expected, result)
   end

data/test/chart/test_write_layout.rb

@@ -8,7 +8,7 @@ class TestWriteLayout < Test::Unit::TestCase
   end
 
   def test_write_idx
-    expected = '<c:layout />'
+    expected = '<c:layout/>'
     result = @chart.__send__('write_layout')
     assert_equal(expected, result)
   end

data/test/chart/test_write_legend.rb

@@ -8,7 +8,7 @@ class TestWriteLegend < Test::Unit::TestCase
   end
 
   def test_write_legend
-    expected = '<c:legend><c:legendPos val="r" /><c:layout /></c:legend>'
+    expected = '<c:legend><c:legendPos val="r"/><c:layout/></c:legend>'
     @chart.__send__('write_legend')
     result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)

data/test/chart/test_write_legend_pos.rb

@@ -8,7 +8,7 @@ class TestWriteLegendPos < Test::Unit::TestCase
   end
 
   def test_write_legend_pos
-    expected = '<c:legendPos val="r" />'
+    expected = '<c:legendPos val="r"/>'
     result = @chart.__send__('write_legend_pos', 'r')
     assert_equal(expected, result)
   end

data/test/chart/test_write_major_gridlines.rb

@@ -8,8 +8,8 @@ class TestWriteMajorGridlines < Test::Unit::TestCase
   end
 
   def test_write_major_gridlines
-    expected = '<c:majorGridlines />'
-    result = @chart.__send__('write_major_gridlines', {:visible => 1})
+    expected = '<c:majorGridlines/>'
+    result = @chart.__send__('write_major_gridlines', {:_visible => 1})
     assert_equal(expected, result)
   end
 end

data/test/chart/test_write_marker.rb

@@ -8,7 +8,7 @@ class TestWriteMarker < Test::Unit::TestCase
   end
 
   def test_write_marker
-    expected = '<c:marker><c:symbol val="none" /></c:marker>'
+    expected = '<c:marker><c:symbol val="none"/></c:marker>'
     @chart.instance_variable_set(:@default_marker, { :type => 'none'})
     @chart.__send__('write_marker')
     result = @chart.instance_variable_get(:@writer).string

data/test/chart/test_write_marker_size.rb

@@ -8,7 +8,7 @@ class TestWriteMarkerSize < Test::Unit::TestCase
   end
 
   def test_write_marker_size
-    expected = '<c:size val="3" />'
+    expected = '<c:size val="3"/>'
     result = @chart.__send__('write_marker_size', 3)
     assert_equal(expected, result)
   end

data/test/chart/test_write_marker_value.rb

@@ -8,7 +8,7 @@ class TestWriteMarkerValue < Test::Unit::TestCase
   end
 
   def test_write_marker_value
-    expected = '<c:marker val="1" />'
+    expected = '<c:marker val="1"/>'
     @chart.instance_variable_set(:@default_marker, 'none')
     result = @chart.__send__('write_marker_value')
     assert_equal(expected, result)

data/test/chart/test_write_num_cache.rb

@@ -8,7 +8,7 @@ class TestWriteNumCache < Test::Unit::TestCase
   end
 
   def test_write_num_cache
-    expected = '<c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="5" /><c:pt idx="0"><c:v>1</c:v></c:pt><c:pt idx="1"><c:v>2</c:v></c:pt><c:pt idx="2"><c:v>3</c:v></c:pt><c:pt idx="3"><c:v>4</c:v></c:pt><c:pt idx="4"><c:v>5</c:v></c:pt></c:numCache>'
+    expected = '<c:numCache><c:formatCode>General</c:formatCode><c:ptCount val="5"/><c:pt idx="0"><c:v>1</c:v></c:pt><c:pt idx="1"><c:v>2</c:v></c:pt><c:pt idx="2"><c:v>3</c:v></c:pt><c:pt idx="3"><c:v>4</c:v></c:pt><c:pt idx="4"><c:v>5</c:v></c:pt></c:numCache>'
     @chart.__send__('write_num_cache', [1, 2, 3, 4, 5])
     result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)

data/test/chart/test_write_number_format.rb

@@ -8,8 +8,46 @@ class TestWriteNumberFormat < Test::Unit::TestCase
   end
 
   def test_write_number_format
-    expected = '<c:numFmt formatCode="General" sourceLinked="1" />'
-    result = @chart.__send__('write_number_format')
+    expected = '<c:numFmt formatCode="General" sourceLinked="1"/>'
+    result = @chart.__send__('write_number_format',
+                             {
+                               :_num_format => 'General',
+                               :defaults    => { :num_format => 'General' }
+                             }
+                             )
+    assert_equal(expected, result)
+  end
+
+  def test_write_number_format02
+    expected = '<c:numFmt formatCode="#,##0.00" sourceLinked="0"/>'
+    result = @chart.__send__('write_number_format',
+                             {
+                               :_num_format => '#,##0.00',
+                               :_defaults   => { :num_format => 'General' }
+                             }
+                             )
+    assert_equal(expected, result)
+  end
+
+  def test_write_number_format03
+    expected = ''
+    result = @chart.__send__('write_cat_number_format',
+                             {
+                               :_num_format => 'General',
+                               :_defaults   => { :num_format => 'General' }
+                             }
+                             )
+    assert_equal(expected, result)
+  end
+
+  def test_write_number_format04
+    expected = '<c:numFmt formatCode="#,##0.00" sourceLinked="0"/>'
+    result = @chart.__send__('write_cat_number_format',
+                             {
+                               :_num_format => '#,##0.00',
+                               :_defaults   => { :num_format => 'General' }
+                             }
+                             )
     assert_equal(expected, result)
   end
 end

data/test/chart/test_write_order.rb

@@ -8,7 +8,7 @@ class TestWriteOrder < Test::Unit::TestCase
   end
 
   def test_write_order
-    expected = '<c:order val="0" />'
+    expected = '<c:order val="0"/>'
     result = @chart.__send__('write_order', 0)
     assert_equal(expected, result)
   end

data/test/chart/test_write_orientation.rb

@@ -8,7 +8,7 @@ class TestWriteOrientation < Test::Unit::TestCase
   end
 
   def test_write_orientation
-    expected = '<c:orientation val="minMax" />'
+    expected = '<c:orientation val="minMax"/>'
     result = @chart.__send__('write_orientation')
     assert_equal(expected, result)
   end

data/test/chart/test_write_page_margins.rb

@@ -8,7 +8,7 @@ class TestChartWritePageMargins < Test::Unit::TestCase
   end
 
   def test_write_page_margins
-    expected = '<c:pageMargins b="0.75" l="0.7" r="0.7" t="0.75" header="0.3" footer="0.3" />'
+    expected = '<c:pageMargins b="0.75" l="0.7" r="0.7" t="0.75" header="0.3" footer="0.3"/>'
     result = @chart.__send__('write_page_margins')
     assert_equal(expected, result)
   end

data/test/chart/test_write_page_setup.rb

@@ -8,7 +8,7 @@ class TestChartWritePageSetup < Test::Unit::TestCase
   end
 
   def test_write_page_setup
-    expected = '<c:pageSetup />'
+    expected = '<c:pageSetup/>'
     result = @chart.__send__('write_page_setup')
     assert_equal(expected, result)
   end

data/test/chart/test_write_plot_vis_only.rb

@@ -8,7 +8,7 @@ class TestWritePlotVisOnly < Test::Unit::TestCase
   end
 
   def test_write_plot_vis_only
-    expected = '<c:plotVisOnly val="1" />'
+    expected = '<c:plotVisOnly val="1"/>'
     result = @chart.__send__('write_plot_vis_only')
     assert_equal(expected, result)
   end

data/test/chart/test_write_pt_count.rb

@@ -8,7 +8,7 @@ class TestWritePtCount < Test::Unit::TestCase
   end
 
   def test_write_pt_count
-    expected = '<c:ptCount val="5" />'
+    expected = '<c:ptCount val="5"/>'
     @chart.__send__('write_pt_count', 5)
     result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)

data/test/chart/test_write_style.rb

@@ -8,7 +8,7 @@ class TestWriteStyle < Test::Unit::TestCase
   end
 
   def test_write_style_1
-    expected = '<c:style val="1" />'
+    expected = '<c:style val="1"/>'
     @chart.set_style(1)
     @chart.__send__('write_style')
     result = @chart.instance_variable_get(:@writer).string

data/test/chart/test_write_symbol.rb

@@ -8,7 +8,7 @@ class TestWriteSymbol < Test::Unit::TestCase
   end
 
   def test_write_symbol
-    expected = '<c:symbol val="none" />'
+    expected = '<c:symbol val="none"/>'
     @chart.__send__('write_symbol', 'none')
     result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)

data/test/chart/test_write_tick_lbl_pos.rb

@@ -8,7 +8,7 @@ class TestWriteTickLabelPos < Test::Unit::TestCase
   end
 
   def test_write_tick_label_pos
-    expected = '<c:tickLblPos val="nextTo" />'
+    expected = '<c:tickLblPos val="nextTo"/>'
     @chart.__send__('write_tick_label_pos', 'nextTo')
     result = @chart.instance_variable_get(:@writer).string
     assert_equal(expected, result)

data/test/drawing/test_write_a_graphic_frame_locks.rb

@@ -8,7 +8,7 @@ class TestWriteAGraphicFrameLocks < Test::Unit::TestCase
   end
 
   def test_write_a_graphic_frame_locks
-    expected = '<a:graphicFrameLocks noGrp="1" />'
+    expected = '<a:graphicFrameLocks noGrp="1"/>'
 
     @drawing.__send__(:write_a_graphic_frame_locks)
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_c_chart.rb

@@ -8,7 +8,7 @@ class TestWriteCChart < Test::Unit::TestCase
   end
 
   def test_write_c_chart
-    expected = '<c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId1" />'
+    expected = '<c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="rId1"/>'
 
     @drawing.__send__(:write_c_chart, 'rId1')
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_c_nv_graphic_frame_pr.rb

@@ -8,7 +8,7 @@ class TestWriteCNvGraphicFramePr < Test::Unit::TestCase
   end
 
   def test_write_c_nv_graphic_frame_pr_01
-    expected = '<xdr:cNvGraphicFramePr />'
+    expected = '<xdr:cNvGraphicFramePr/>'
 
     @drawing.instance_variable_set(:@embedded, 1)
     @drawing.__send__(:write_c_nv_graphic_frame_pr)
@@ -18,7 +18,7 @@ class TestWriteCNvGraphicFramePr < Test::Unit::TestCase
   end
 
   def test_write_c_nv_graphic_frame_pr_02
-    expected = '<xdr:cNvGraphicFramePr><a:graphicFrameLocks noGrp="1" /></xdr:cNvGraphicFramePr>'
+    expected = '<xdr:cNvGraphicFramePr><a:graphicFrameLocks noGrp="1"/></xdr:cNvGraphicFramePr>'
 
     @drawing.__send__(:write_c_nv_graphic_frame_pr)
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_c_nv_pr.rb

@@ -8,7 +8,7 @@ class TestWriteCNvPr < Test::Unit::TestCase
   end
 
   def test_write_c_nv_pr
-    expected = '<xdr:cNvPr id="2" name="Chart 1" />'
+    expected = '<xdr:cNvPr id="2" name="Chart 1"/>'
 
     @drawing.__send__(:write_c_nv_pr, 2, 'Chart 1')
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_ext.rb

@@ -8,7 +8,7 @@ class TestWriteExt < Test::Unit::TestCase
   end
 
   def test_write_ext
-    expected = '<xdr:ext cx="9308969" cy="6078325" />'
+    expected = '<xdr:ext cx="9308969" cy="6078325"/>'
 
     @drawing.__send__(:write_ext, 9308969, 6078325)
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_pos.rb

@@ -8,7 +8,7 @@ class TestWritePos < Test::Unit::TestCase
   end
 
   def test_write_pos
-    expected = '<xdr:pos x="0" y="0" />'
+    expected = '<xdr:pos x="0" y="0"/>'
 
     @drawing.__send__(:write_pos, 0, 0)
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_xfrm_extension.rb

@@ -8,7 +8,7 @@ class TestWriteXfrmExtension < Test::Unit::TestCase
   end
 
   def test_write_xfrm_extension
-    expected = '<a:ext cx="0" cy="0" />'
+    expected = '<a:ext cx="0" cy="0"/>'
 
     @drawing.__send__(:write_xfrm_extension)
     result = @drawing.instance_variable_get(:@writer).string

data/test/drawing/test_write_xfrm_offset.rb

@@ -8,7 +8,7 @@ class TestWriteXfrmOffset < Test::Unit::TestCase
   end
 
   def test_write_xfrm_offset
-    expected = '<a:off x="0" y="0" />'
+    expected = '<a:off x="0" y="0"/>'
 
     @drawing.__send__(:write_xfrm_offset)
     result = @drawing.instance_variable_get(:@writer).string

data/test/helper.rb

@@ -33,7 +33,7 @@ class Test::Unit::TestCase
   def expected_to_array(lines)
     array = []
     lines.each_line do |line|
-      str = line.chomp.sub(%r!/>$!, ' />').sub(/^\s+/, '')
+      str = line.chomp.sub(/^\s+/, '')
       array << str unless str == ''
     end
     array

data/test/package/content_types/test_write_default.rb

@@ -7,7 +7,7 @@ class TestWriteDefault < Test::Unit::TestCase
     @obj = Writexlsx::Package::ContentTypes.new
     @obj.__send__('write_default', 'xml', 'application/xml')
     result = @obj.xml_str
-    expected = '<Default Extension="xml" ContentType="application/xml" />'
+    expected = '<Default Extension="xml" ContentType="application/xml"/>'
     assert_equal(expected, result)
   end
 end