Merge branch 'master' of git://github.com/randym/axlsx

2 files changed, 20 insertions, 6 deletions

diff --git a/test/workbook/worksheet/tc_date_time_converter.rb b/test/workbook/worksheet/tc_date_time_converter.rb
index adeae92b..09c1c507 100644
--- a/test/workbook/worksheet/tc_date_time_converter.rb
+++ b/test/workbook/worksheet/tc_date_time_converter.rb
@@ -111,12 +111,18 @@ class TestDateTimeConverter < Test::Unit::TestCase
   end
 
   def test_timezone
+
     utc = Time.utc 2012 # January 1st, 2012 at 0:00 UTC
-    local = begin
-      Time.new 2012, 1, 1, 1, 0, 0, 3600 # January 1st, 2012 at 1:00 GMT+1
-    rescue ArgumentError
-      Time.parse "2012-01-01 01:00:00 +0100"
-    end
+
+    # JRuby makes no assumption on time zone. randym
+    #local = begin
+    #  Time.new 2012, 1, 1, 1, 0, 0, 3600 # January 1st, 2012 at 1:00 GMT+1
+    #rescue ArgumentError
+    #  Time.parse "2012-01-01 01:00:00 +0100"
+    #end
+
+    local = Time.parse "2012-01-01 01:00:00 +0100"
+
     assert_equal local, utc
     assert_equal Axlsx::DateTimeConverter::time_to_serial(local), Axlsx::DateTimeConverter::time_to_serial(utc)
     Axlsx::Workbook.date1904 = true
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 499df864..320561b3 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -207,8 +207,10 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_merge_cells
     @ws.add_row [1, "two"]
     @ws.merge_cells "A1:D1"
+    @ws.merge_cells "E1:F1"
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="A1:D1"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
   def test_to_xml_string_page_margins
@@ -252,8 +254,14 @@ class TestWorksheet < Test::Unit::TestCase
     assert(errors.empty?, "error free validation")
   end
 
-  def test_valid_with_page_margins
+  # Make sure the XML for all optional elements (like pageMargins, autoFilter, ...)
+  # is generated in correct order.
+  def test_valid_with_optional_elements
     @ws.page_margins.set :left => 9
+    @ws.auto_filter = "A1:C3"
+    @ws.merge_cells "A4:A5"
+    @ws.add_chart Axlsx::Pie3DChart
+    @ws.add_table "E1:F3"
     schema = Nokogiri::XML::Schema(File.open(Axlsx::SML_XSD))
     doc = Nokogiri::XML(@ws.to_xml_string)
     errors = []