caxlsx 3.0.4 → 3.2.0

data/test/workbook/worksheet/tc_date_time_converter.rb

@@ -1,124 +1,124 @@
-# -*- coding: utf-8 -*-
-require 'tc_helper.rb'
-
-class TestDateTimeConverter < Test::Unit::TestCase
-  def setup
-    @margin_of_error = 0.000_001
-    @extended_time_range = begin
-      Time.parse "1893-08-05"
-      Time.parse "9999-12-31T23:59:59Z"
-      true
-    rescue
-      false
-    end
-  end
-
-  def test_date_to_serial_1900
-    Axlsx::Workbook.date1904 = false
-    tests = if @extended_time_range
-              { # examples taken straight from the spec
-                "1893-08-05" => -2338.0,
-                "1900-01-01" => 2.0,
-                "1910-02-03" => 3687.0,
-                "2006-02-01" => 38749.0,
-                "9999-12-31" => 2958465.0
-              }
-            else
-              { # examples taken inside the possible values
-                "1970-01-01" => 25569.0, # Unix epoch
-                "1970-01-02" => 25570.0,
-                "2006-02-01" => 38749.0,
-                "2038-01-19" => 50424.0, # max date using signed timestamp in 32bit
-              }
-            end
-    tests.each do |date_string, expected|
-      serial = Axlsx::DateTimeConverter::date_to_serial Date.parse(date_string)
-      assert_equal expected, serial
-    end
-  end
-
-  def test_date_to_serial_1904
-    Axlsx::Workbook.date1904 = true
-    tests = if @extended_time_range
-              { # examples taken straight from the spec
-                "1893-08-05" => -3800.0,
-                "1904-01-01" => 0.0,
-                "1910-02-03" => 2225.0,
-                "2006-02-01" => 37287.0,
-                "9999-12-31" => 2957003.0
-              }
-            else
-              { # examples taken inside the possible values
-                "1970-01-01" => 24107.0, # Unix epoch
-                "1970-01-02" => 24108.0,
-                "2006-02-01" => 37287.0,
-                "2038-01-19" => 48962.0, # max date using signed timestamp in 32bit
-              }
-            end
-    tests.each do |date_string, expected|
-      serial = Axlsx::DateTimeConverter::date_to_serial Date.parse(date_string)
-      assert_equal expected, serial
-    end
-  end
-
-  def test_time_to_serial_1900
-    Axlsx::Workbook.date1904 = false
-    tests = if @extended_time_range
-             { # examples taken straight from the spec
-               "1893-08-05T00:00:01Z" => -2337.999989,
-               "1899-12-28T18:00:00Z" => -1.25,
-               "1910-02-03T10:05:54Z" => 3687.4207639,
-               "1900-01-01T12:00:00Z" => 2.5, # wrongly indicated as 1.5 in the spec!
-               "9999-12-31T23:59:59Z" => 2958465.9999884
-             }
-           else
-             { # examples taken inside the possible values
-               "1970-01-01T00:00:00Z" => 25569.0, # Unix epoch
-               "1970-01-01T12:00:00Z" => 25569.5,
-               "2000-01-01T00:00:00Z" => 36526.0,
-               "2038-01-19T03:14:07Z" => 50424.134803, # max signed timestamp in 32bit
-             }
-           end
-    tests.each do |time_string, expected|
-      serial = Axlsx::DateTimeConverter::time_to_serial Time.parse(time_string)
-      assert_in_delta expected, serial, @margin_of_error
-    end
-  end
-
-  def test_time_to_serial_1904
-    Axlsx::Workbook.date1904 = true
-      # ruby 1.8.7 cannot parse dates prior to epoch. see http://ruby-doc.org/core-1.8.7/Time.html
-
-    tests = if @extended_time_range
-             { # examples taken straight from the spec
-               "1893-08-05T00:00:01Z" => -3799.999989,
-               "1910-02-03T10:05:54Z" => 2225.4207639,
-               "1904-01-01T12:00:00Z" => 0.5000000,
-               "9999-12-31T23:59:59Z" => 2957003.9999884
-             }
-           else
-             { # examples taken inside the possible values
-               "1970-01-01T00:00:00Z" => 24107.0, # Unix epoch
-               "1970-01-01T12:00:00Z" => 24107.5,
-               "2000-01-01T00:00:00Z" => 35064.0,
-               "2038-01-19T03:14:07Z" => 48962.134803, # max signed timestamp in 32bit
-             }
-           end
-    tests.each do |time_string, expected|
-      serial = Axlsx::DateTimeConverter::time_to_serial Time.parse(time_string)
-      assert_in_delta expected, serial, @margin_of_error
-    end
-  end
-
-  def test_timezone
-
-    utc = Time.utc 2012 # January 1st, 2012 at 0:00 UTC
-    local = Time.parse "2012-01-01 09:00:00 +0900"
-
-    assert_equal local, utc
-    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400,  Axlsx::DateTimeConverter::time_to_serial(utc)
-    Axlsx::Workbook.date1904 = true
-    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400, Axlsx::DateTimeConverter::time_to_serial(utc)
-  end
-
-end
+# -*- coding: utf-8 -*-
+require 'tc_helper.rb'
+
+class TestDateTimeConverter < Test::Unit::TestCase
+  def setup
+    @margin_of_error = 0.000_001
+    @extended_time_range = begin
+      Time.parse "1893-08-05"
+      Time.parse "9999-12-31T23:59:59Z"
+      true
+    rescue
+      false
+    end
+  end
+
+  def test_date_to_serial_1900
+    Axlsx::Workbook.date1904 = false
+    tests = if @extended_time_range
+              { # examples taken straight from the spec
+                "1893-08-05" => -2338.0,
+                "1900-01-01" => 2.0,
+                "1910-02-03" => 3687.0,
+                "2006-02-01" => 38749.0,
+                "9999-12-31" => 2958465.0
+              }
+            else
+              { # examples taken inside the possible values
+                "1970-01-01" => 25569.0, # Unix epoch
+                "1970-01-02" => 25570.0,
+                "2006-02-01" => 38749.0,
+                "2038-01-19" => 50424.0, # max date using signed timestamp in 32bit
+              }
+            end
+    tests.each do |date_string, expected|
+      serial = Axlsx::DateTimeConverter::date_to_serial Date.parse(date_string)
+      assert_equal expected, serial
+    end
+  end
+
+  def test_date_to_serial_1904
+    Axlsx::Workbook.date1904 = true
+    tests = if @extended_time_range
+              { # examples taken straight from the spec
+                "1893-08-05" => -3800.0,
+                "1904-01-01" => 0.0,
+                "1910-02-03" => 2225.0,
+                "2006-02-01" => 37287.0,
+                "9999-12-31" => 2957003.0
+              }
+            else
+              { # examples taken inside the possible values
+                "1970-01-01" => 24107.0, # Unix epoch
+                "1970-01-02" => 24108.0,
+                "2006-02-01" => 37287.0,
+                "2038-01-19" => 48962.0, # max date using signed timestamp in 32bit
+              }
+            end
+    tests.each do |date_string, expected|
+      serial = Axlsx::DateTimeConverter::date_to_serial Date.parse(date_string)
+      assert_equal expected, serial
+    end
+  end
+
+  def test_time_to_serial_1900
+    Axlsx::Workbook.date1904 = false
+    tests = if @extended_time_range
+             { # examples taken straight from the spec
+               "1893-08-05T00:00:01Z" => -2337.999989,
+               "1899-12-28T18:00:00Z" => -1.25,
+               "1910-02-03T10:05:54Z" => 3687.4207639,
+               "1900-01-01T12:00:00Z" => 2.5, # wrongly indicated as 1.5 in the spec!
+               "9999-12-31T23:59:59Z" => 2958465.9999884
+             }
+           else
+             { # examples taken inside the possible values
+               "1970-01-01T00:00:00Z" => 25569.0, # Unix epoch
+               "1970-01-01T12:00:00Z" => 25569.5,
+               "2000-01-01T00:00:00Z" => 36526.0,
+               "2038-01-19T03:14:07Z" => 50424.134803, # max signed timestamp in 32bit
+             }
+           end
+    tests.each do |time_string, expected|
+      serial = Axlsx::DateTimeConverter::time_to_serial Time.parse(time_string)
+      assert_in_delta expected, serial, @margin_of_error
+    end
+  end
+
+  def test_time_to_serial_1904
+    Axlsx::Workbook.date1904 = true
+      # ruby 1.8.7 cannot parse dates prior to epoch. see http://ruby-doc.org/core-1.8.7/Time.html
+
+    tests = if @extended_time_range
+             { # examples taken straight from the spec
+               "1893-08-05T00:00:01Z" => -3799.999989,
+               "1910-02-03T10:05:54Z" => 2225.4207639,
+               "1904-01-01T12:00:00Z" => 0.5000000,
+               "9999-12-31T23:59:59Z" => 2957003.9999884
+             }
+           else
+             { # examples taken inside the possible values
+               "1970-01-01T00:00:00Z" => 24107.0, # Unix epoch
+               "1970-01-01T12:00:00Z" => 24107.5,
+               "2000-01-01T00:00:00Z" => 35064.0,
+               "2038-01-19T03:14:07Z" => 48962.134803, # max signed timestamp in 32bit
+             }
+           end
+    tests.each do |time_string, expected|
+      serial = Axlsx::DateTimeConverter::time_to_serial Time.parse(time_string)
+      assert_in_delta expected, serial, @margin_of_error
+    end
+  end
+
+  def test_timezone
+
+    utc = Time.utc 2012 # January 1st, 2012 at 0:00 UTC
+    local = Time.parse "2012-01-01 09:00:00 +0900"
+
+    assert_equal local, utc
+    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400,  Axlsx::DateTimeConverter::time_to_serial(utc)
+    Axlsx::Workbook.date1904 = true
+    assert_equal Axlsx::DateTimeConverter::time_to_serial(local) - local.utc_offset.to_f/86400, Axlsx::DateTimeConverter::time_to_serial(utc)
+  end
+
+end

data/test/workbook/worksheet/tc_header_footer.rb

@@ -1,151 +1,151 @@
-require 'tc_helper'
-
-class TestHeaderFooter < Test::Unit::TestCase
-
-  def setup
-    @p = Axlsx::Package.new
-    ws = @p.workbook.add_worksheet :name => 'test'
-    @hf = ws.header_footer
-  end
-
-  def test_initialize
-    assert_equal(nil, @hf.odd_header)
-    assert_equal(nil, @hf.odd_footer)
-
-    assert_equal(nil, @hf.even_header)
-    assert_equal(nil, @hf.even_footer)
-
-    assert_equal(nil, @hf.first_header)
-    assert_equal(nil, @hf.first_footer)
-
-    assert_equal(nil, @hf.different_first)
-    assert_equal(nil, @hf.different_odd_even)
-  end
-
-  def test_initialize_with_options
-    header_footer = {
-      :odd_header => 'oh',
-      :odd_footer => 'of',
-
-      :even_header => 'eh',
-      :even_footer => 'ef',
-
-      :first_header => 'fh',
-      :first_footer => 'ff',
-
-      :different_first => true,
-      :different_odd_even => true
-    }
-    optioned = @p.workbook.add_worksheet(:name => 'optioned', :header_footer => header_footer).header_footer
-
-    assert_equal('oh', optioned.odd_header)
-    assert_equal('of', optioned.odd_footer)
-
-    assert_equal('eh', optioned.even_header)
-    assert_equal('ef', optioned.even_footer)
-
-    assert_equal('fh', optioned.first_header)
-    assert_equal('ff', optioned.first_footer)
-
-    assert_equal(true, optioned.different_first)
-    assert_equal(true, optioned.different_odd_even)
-  end
-
-  def test_string_attributes
-    %w(odd_header odd_footer even_header even_footer first_header first_footer).each do |attr|
-      assert_raise(ArgumentError, 'only strings allowed in string attributes') { @hf.send("#{attr}=", 1) }
-      assert_nothing_raised { @hf.send("#{attr}=", 'test_string') }
-    end
-  end
-
-  def test_boolean_attributes
-   %w(different_first different_odd_even).each do |attr|
-      assert_raise(ArgumentError, 'only booleanish allowed in string attributes') { @hf.send("#{attr}=", 'foo') }
-      assert_nothing_raised { @hf.send("#{attr}=", 1) }
-    end
-  end
-
-  def test_set_all_values
-    @hf.set(
-      :odd_header => 'oh',
-      :odd_footer => 'of',
-
-      :even_header => 'eh',
-      :even_footer => 'ef',
-
-      :first_header => 'fh',
-      :first_footer => 'ff',
-
-      :different_first => true,
-      :different_odd_even => true
-    )
-
-    assert_equal('oh', @hf.odd_header)
-    assert_equal('of', @hf.odd_footer)
-
-    assert_equal('eh', @hf.even_header)
-    assert_equal('ef', @hf.even_footer)
-
-    assert_equal('fh', @hf.first_header)
-    assert_equal('ff', @hf.first_footer)
-
-    assert_equal(true, @hf.different_first)
-    assert_equal(true, @hf.different_odd_even)
-  end
-
-  def test_to_xml_all_values
-    @hf.set(
-      :odd_header => 'oh',
-      :odd_footer => 'of',
-
-      :even_header => 'eh',
-      :even_footer => 'ef',
-
-      :first_header => 'fh',
-      :first_footer => 'ff',
-
-      :different_first => true,
-      :different_odd_even => true
-    )
-
-    doc = Nokogiri::XML.parse(@hf.to_xml_string)
-    assert_equal(1, doc.xpath(".//headerFooter[@differentFirst=1][@differentOddEven=1]").size)
-
-    assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
-    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
-    assert_equal(1, doc.xpath(".//headerFooter/oddFooter").size)
-    assert_equal('of', doc.xpath(".//headerFooter/oddFooter").text)
-
-    assert_equal(1, doc.xpath(".//headerFooter/evenHeader").size)
-    assert_equal('eh', doc.xpath(".//headerFooter/evenHeader").text)
-    assert_equal(1, doc.xpath(".//headerFooter/evenFooter").size)
-    assert_equal('ef', doc.xpath(".//headerFooter/evenFooter").text)
-
-    assert_equal(1, doc.xpath(".//headerFooter/firstHeader").size)
-    assert_equal('fh', doc.xpath(".//headerFooter/firstHeader").text)
-    assert_equal(1, doc.xpath(".//headerFooter/firstFooter").size)
-    assert_equal('ff', doc.xpath(".//headerFooter/firstFooter").text)
-  end
-
-  def test_to_xml_some_values
-    @hf.set(
-      :odd_header => 'oh',
-      :different_odd_even => false
-    )
-
-    doc = Nokogiri::XML.parse(@hf.to_xml_string)
-    assert_equal(1, doc.xpath(".//headerFooter[@differentOddEven=0]").size)
-    assert_equal(0, doc.xpath(".//headerFooter[@differentFirst]").size)
-
-    assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
-    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
-    assert_equal(0, doc.xpath(".//headerFooter/oddFooter").size)
-
-    assert_equal(0, doc.xpath(".//headerFooter/evenHeader").size)
-    assert_equal(0, doc.xpath(".//headerFooter/evenFooter").size)
-
-    assert_equal(0, doc.xpath(".//headerFooter/firstHeader").size)
-    assert_equal(0, doc.xpath(".//headerFooter/firstFooter").size)
-  end
-end
-
+require 'tc_helper'
+
+class TestHeaderFooter < Test::Unit::TestCase
+
+  def setup
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet :name => 'test'
+    @hf = ws.header_footer
+  end
+
+  def test_initialize
+    assert_equal(nil, @hf.odd_header)
+    assert_equal(nil, @hf.odd_footer)
+
+    assert_equal(nil, @hf.even_header)
+    assert_equal(nil, @hf.even_footer)
+
+    assert_equal(nil, @hf.first_header)
+    assert_equal(nil, @hf.first_footer)
+
+    assert_equal(nil, @hf.different_first)
+    assert_equal(nil, @hf.different_odd_even)
+  end
+
+  def test_initialize_with_options
+    header_footer = {
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    }
+    optioned = @p.workbook.add_worksheet(:name => 'optioned', :header_footer => header_footer).header_footer
+
+    assert_equal('oh', optioned.odd_header)
+    assert_equal('of', optioned.odd_footer)
+
+    assert_equal('eh', optioned.even_header)
+    assert_equal('ef', optioned.even_footer)
+
+    assert_equal('fh', optioned.first_header)
+    assert_equal('ff', optioned.first_footer)
+
+    assert_equal(true, optioned.different_first)
+    assert_equal(true, optioned.different_odd_even)
+  end
+
+  def test_string_attributes
+    %w(odd_header odd_footer even_header even_footer first_header first_footer).each do |attr|
+      assert_raise(ArgumentError, 'only strings allowed in string attributes') { @hf.send("#{attr}=", 1) }
+      assert_nothing_raised { @hf.send("#{attr}=", 'test_string') }
+    end
+  end
+
+  def test_boolean_attributes
+   %w(different_first different_odd_even).each do |attr|
+      assert_raise(ArgumentError, 'only booleanish allowed in string attributes') { @hf.send("#{attr}=", 'foo') }
+      assert_nothing_raised { @hf.send("#{attr}=", 1) }
+    end
+  end
+
+  def test_set_all_values
+    @hf.set(
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    )
+
+    assert_equal('oh', @hf.odd_header)
+    assert_equal('of', @hf.odd_footer)
+
+    assert_equal('eh', @hf.even_header)
+    assert_equal('ef', @hf.even_footer)
+
+    assert_equal('fh', @hf.first_header)
+    assert_equal('ff', @hf.first_footer)
+
+    assert_equal(true, @hf.different_first)
+    assert_equal(true, @hf.different_odd_even)
+  end
+
+  def test_to_xml_all_values
+    @hf.set(
+      :odd_header => 'oh',
+      :odd_footer => 'of',
+
+      :even_header => 'eh',
+      :even_footer => 'ef',
+
+      :first_header => 'fh',
+      :first_footer => 'ff',
+
+      :different_first => true,
+      :different_odd_even => true
+    )
+
+    doc = Nokogiri::XML.parse(@hf.to_xml_string)
+    assert_equal(1, doc.xpath(".//headerFooter[@differentFirst=1][@differentOddEven=1]").size)
+
+    assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
+    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/oddFooter").size)
+    assert_equal('of', doc.xpath(".//headerFooter/oddFooter").text)
+
+    assert_equal(1, doc.xpath(".//headerFooter/evenHeader").size)
+    assert_equal('eh', doc.xpath(".//headerFooter/evenHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/evenFooter").size)
+    assert_equal('ef', doc.xpath(".//headerFooter/evenFooter").text)
+
+    assert_equal(1, doc.xpath(".//headerFooter/firstHeader").size)
+    assert_equal('fh', doc.xpath(".//headerFooter/firstHeader").text)
+    assert_equal(1, doc.xpath(".//headerFooter/firstFooter").size)
+    assert_equal('ff', doc.xpath(".//headerFooter/firstFooter").text)
+  end
+
+  def test_to_xml_some_values
+    @hf.set(
+      :odd_header => 'oh',
+      :different_odd_even => false
+    )
+
+    doc = Nokogiri::XML.parse(@hf.to_xml_string)
+    assert_equal(1, doc.xpath(".//headerFooter[@differentOddEven=0]").size)
+    assert_equal(0, doc.xpath(".//headerFooter[@differentFirst]").size)
+
+    assert_equal(1, doc.xpath(".//headerFooter/oddHeader").size)
+    assert_equal('oh', doc.xpath(".//headerFooter/oddHeader").text)
+    assert_equal(0, doc.xpath(".//headerFooter/oddFooter").size)
+
+    assert_equal(0, doc.xpath(".//headerFooter/evenHeader").size)
+    assert_equal(0, doc.xpath(".//headerFooter/evenFooter").size)
+
+    assert_equal(0, doc.xpath(".//headerFooter/firstHeader").size)
+    assert_equal(0, doc.xpath(".//headerFooter/firstFooter").size)
+  end
+end
+

data/test/workbook/worksheet/tc_icon_set.rb

@@ -1,45 +1,45 @@
-require 'tc_helper.rb'
-
-class TestIconSet < Test::Unit::TestCase
-  def setup
-    @icon_set = Axlsx::IconSet.new
-  end
-
-  def test_defaults
-    assert_equal @icon_set.iconSet, "3TrafficLights1"
-    assert_equal @icon_set.percent, true
-    assert_equal @icon_set.reverse, false
-    assert_equal @icon_set.showValue, true
-  end
-
-  def test_icon_set
-    assert_raise(ArgumentError) { @icon_set.iconSet = "invalid_value" }
-    assert_nothing_raised { @icon_set.iconSet = "5Rating"}
-    assert_equal(@icon_set.iconSet, "5Rating")
-  end
-
-  def test_percent
-    assert_raise(ArgumentError) { @icon_set.percent = :invalid_type }
-    assert_nothing_raised { @icon_set.percent =  false}
-    assert_equal(@icon_set.percent, false)
-  end
-
-  def test_showValue
-    assert_raise(ArgumentError) { @icon_set.showValue = :invalid_type }
-    assert_nothing_raised { @icon_set.showValue =  false}
-    assert_equal(@icon_set.showValue, false)
-  end
-
-  def test_reverse
-    assert_raise(ArgumentError) { @icon_set.reverse = :invalid_type }
-    assert_nothing_raised { @icon_set.reverse =  false}
-    assert_equal(@icon_set.reverse, false)
-  end
-
-  def test_to_xml_string
-    doc = Nokogiri::XML.parse(@icon_set.to_xml_string)
-    assert_equal(doc.xpath(".//iconSet[@iconSet='3TrafficLights1'][@percent=1][@reverse=0][@showValue=1]").size, 1)
-    assert_equal(doc.xpath(".//iconSet//cfvo").size, 3)
-  end
-
-end
+require 'tc_helper.rb'
+
+class TestIconSet < Test::Unit::TestCase
+  def setup
+    @icon_set = Axlsx::IconSet.new
+  end
+
+  def test_defaults
+    assert_equal @icon_set.iconSet, "3TrafficLights1"
+    assert_equal @icon_set.percent, true
+    assert_equal @icon_set.reverse, false
+    assert_equal @icon_set.showValue, true
+  end
+
+  def test_icon_set
+    assert_raise(ArgumentError) { @icon_set.iconSet = "invalid_value" }
+    assert_nothing_raised { @icon_set.iconSet = "5Rating"}
+    assert_equal(@icon_set.iconSet, "5Rating")
+  end
+
+  def test_percent
+    assert_raise(ArgumentError) { @icon_set.percent = :invalid_type }
+    assert_nothing_raised { @icon_set.percent =  false}
+    assert_equal(@icon_set.percent, false)
+  end
+
+  def test_showValue
+    assert_raise(ArgumentError) { @icon_set.showValue = :invalid_type }
+    assert_nothing_raised { @icon_set.showValue =  false}
+    assert_equal(@icon_set.showValue, false)
+  end
+
+  def test_reverse
+    assert_raise(ArgumentError) { @icon_set.reverse = :invalid_type }
+    assert_nothing_raised { @icon_set.reverse =  false}
+    assert_equal(@icon_set.reverse, false)
+  end
+
+  def test_to_xml_string
+    doc = Nokogiri::XML.parse(@icon_set.to_xml_string)
+    assert_equal(doc.xpath(".//iconSet[@iconSet='3TrafficLights1'][@percent=1][@reverse=0][@showValue=1]").size, 1)
+    assert_equal(doc.xpath(".//iconSet//cfvo").size, 3)
+  end
+
+end