test/workbook/worksheet/tc_row.rb in axlsx-1.0.18 vs test/workbook/worksheet/tc_row.rb in axlsx-1.1.0

@@ -1,16 +1,15 @@
-require 'test/unit'
-require 'axlsx.rb'
+require 'tc_helper.rb'
 
 class TestRow < Test::Unit::TestCase
 
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet :name=>"hmmm"
     @row = @ws.add_row
   end
-  
+
   def test_initialize
     assert(@row.cells.empty?, "no cells by default")
     assert_equal(@row.worksheet, @ws, "has a reference to the worksheet")
     assert_nil(@row.height, "height defaults to nil")
     assert(!@row.custom_height?, "no custom height by default")
@@ -23,13 +22,26 @@
   end
 
   def test_style
     r = @ws.add_row([1,2,3,4,5])
     r.style=1
-    r.cells.each { |c| assert_equal(c.style,1) }    
+    r.cells.each { |c| assert_equal(c.style,1) }
   end
 
+  def test_nil_cells
+    row = @ws.add_row([nil,1,2,nil,4,5,nil])
+    r_s_xml = Nokogiri::XML(row.to_xml_string(0, ''))
+    assert_equal(r_s_xml.xpath(".//row/c").size, 4)
+  end
+  
+  def test_nil_cell_r
+    row = @ws.add_row([nil,1,2,nil,4,5,nil])
+    r_s_xml = Nokogiri::XML(row.to_xml_string(0, ''))
+    assert_equal(r_s_xml.xpath(".//row/c").first['r'], 'B1')
+    assert_equal(r_s_xml.xpath(".//row/c").last['r'], 'F1')
+  end
+
   def test_index
     assert_equal(@row.index, @row.worksheet.rows.index(@row))
   end
 
   def test_add_cell
@@ -52,21 +64,23 @@
     assert_nothing_raised { @row.height = 15 }
     assert_equal(15, @row.height)
   end
 
   def test_to_xml_without_custom_height
-    xml = Nokogiri::XML::Builder.new
-    @row.to_xml(xml)
-    doc = Nokogiri::XML.parse(xml.to_xml)
+    doc = Nokogiri::XML.parse(@row.to_xml_string(0))
     assert_equal(0, doc.xpath(".//row[@ht]").size)
     assert_equal(0, doc.xpath(".//row[@customHeight]").size)
   end
 
-  def test_to_xml_with_custom_height
+  def test_to_xml_string
+    r_s_xml = Nokogiri::XML(@row.to_xml_string(0, ''))
+    assert_equal(r_s_xml.xpath(".//row[@r=1]").size, 1)
+  end
+
+  def test_to_xml_string_with_custom_height
+    @row.add_cell 1
     @row.height = 20
-    xml = Nokogiri::XML::Builder.new
-    @row.to_xml(xml)
-    doc = Nokogiri::XML.parse(xml.to_xml)
-    assert_equal(1, doc.xpath(".//row[@ht=20][@customHeight=1]").size)
+    r_s_xml = Nokogiri::XML(@row.to_xml_string(0, ''))
+    assert_equal(r_s_xml.xpath(".//row[@r=1][@ht=20][@customHeight=1]").size, 1)
   end
 
 end