summaryrefslogtreecommitdiffhomepage
path: root/test/drawing
diff options
context:
space:
mode:
authorZsolt Kozaroczy <[email protected]>2023-04-12 16:55:10 +0200
committerGitHub <[email protected]>2023-04-12 16:55:10 +0200
commit4643fbded250a02191f0e652618ee23fcf26c8b6 (patch)
tree1b4fa5d8c85ed10c866b22e0cc7c480ffe7921de /test/drawing
parentbad5cac91b653848bffb4fb45326664f9d806ed2 (diff)
parentc4bd23bdb6b20763027370f7db13cef1ed7d6e75 (diff)
downloadcaxlsx-4643fbded250a02191f0e652618ee23fcf26c8b6.tar.gz
caxlsx-4643fbded250a02191f0e652618ee23fcf26c8b6.zip
Merge pull request #191 from tagliala/chore/add-rubocop
Add RuboCop (and fix simple whitespace, magic comment, trailing comma offenses)
Diffstat (limited to 'test/drawing')
-rw-r--r--test/drawing/tc_area_chart.rb2
-rw-r--r--test/drawing/tc_area_series.rb5
-rw-r--r--test/drawing/tc_axes.rb2
-rw-r--r--test/drawing/tc_axis.rb19
-rw-r--r--test/drawing/tc_bar_3D_chart.rb11
-rw-r--r--test/drawing/tc_bar_chart.rb11
-rw-r--r--test/drawing/tc_bar_series.rb7
-rw-r--r--test/drawing/tc_bubble_chart.rb5
-rw-r--r--test/drawing/tc_bubble_series.rb8
-rw-r--r--test/drawing/tc_cat_axis.rb2
-rw-r--r--test/drawing/tc_chart.rb13
-rw-r--r--test/drawing/tc_d_lbls.rb39
-rw-r--r--test/drawing/tc_data_source.rb8
-rw-r--r--test/drawing/tc_drawing.rb24
-rw-r--r--test/drawing/tc_hyperlink.rb14
-rw-r--r--test/drawing/tc_line_3d_chart.rb23
-rw-r--r--test/drawing/tc_line_chart.rb2
-rw-r--r--test/drawing/tc_line_series.rb5
-rw-r--r--test/drawing/tc_marker.rb17
-rw-r--r--test/drawing/tc_num_data.rb11
-rw-r--r--test/drawing/tc_num_val.rb7
-rw-r--r--test/drawing/tc_one_cell_anchor.rb8
-rw-r--r--test/drawing/tc_pic.rb14
-rw-r--r--test/drawing/tc_picture_locking.rb23
-rw-r--r--test/drawing/tc_pie_3D_chart.rb4
-rw-r--r--test/drawing/tc_pie_series.rb8
-rw-r--r--test/drawing/tc_scaling.rb18
-rw-r--r--test/drawing/tc_scatter_chart.rb6
-rw-r--r--test/drawing/tc_scatter_series.rb24
-rw-r--r--test/drawing/tc_ser_axis.rb3
-rw-r--r--test/drawing/tc_series.rb6
-rw-r--r--test/drawing/tc_str_data.rb2
-rw-r--r--test/drawing/tc_str_val.rb2
-rw-r--r--test/drawing/tc_two_cell_anchor.rb6
-rw-r--r--test/drawing/tc_val_axis.rb2
-rw-r--r--test/drawing/tc_view_3D.rb30
-rw-r--r--test/drawing/tc_vml_drawing.rb4
-rw-r--r--test/drawing/tc_vml_shape.rb4
38 files changed, 167 insertions, 232 deletions
diff --git a/test/drawing/tc_area_chart.rb b/test/drawing/tc_area_chart.rb
index b3013c12..fc928db9 100644
--- a/test/drawing/tc_area_chart.rb
+++ b/test/drawing/tc_area_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestAreaChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -35,5 +34,4 @@ class TestAreaChart < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_area_series.rb b/test/drawing/tc_area_series.rb
index 00229a39..250c6e13 100644
--- a/test/drawing/tc_area_series.rb
+++ b/test/drawing/tc_area_series.rb
@@ -1,13 +1,12 @@
require 'tc_helper.rb'
class TestAreaSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
chart = @ws.add_chart Axlsx::AreaChart, :title => "fishery"
@series = chart.add_series(
- :data => [0,1,2],
+ :data => [0, 1, 2],
:labels => ["zero", "one", "two"],
:title => "bob",
:color => "#FF0000",
diff --git a/test/drawing/tc_axes.rb b/test/drawing/tc_axes.rb
index e3c26936..eabf9a8d 100644
--- a/test/drawing/tc_axes.rb
+++ b/test/drawing/tc_axes.rb
@@ -5,4 +5,4 @@ class TestAxes < Test::Unit::TestCase
assert_raise(ArgumentError) { Axlsx::Axes.new(:val_axis => Axlsx::ValAxis, :cat_axis => Axlsx::CatAxis) }
assert_nothing_raised { Axlsx::Axes.new(:cat_axis => Axlsx::CatAxis, :val_axis => Axlsx::ValAxis) }
end
-end \ No newline at end of file
+end
diff --git a/test/drawing/tc_axis.rb b/test/drawing/tc_axis.rb
index 5a9fa5a3..0f7108eb 100644
--- a/test/drawing/tc_axis.rb
+++ b/test/drawing/tc_axis.rb
@@ -5,7 +5,6 @@ class TestAxis < Test::Unit::TestCase
@axis = Axlsx::Axis.new :gridlines => false, :title => 'Foo'
end
-
def test_initialization
assert_equal(@axis.ax_pos, :b, "axis position default incorrect")
assert_equal(@axis.tick_lbl_pos, :nextTo, "tick label position default incorrect")
@@ -18,15 +17,15 @@ class TestAxis < Test::Unit::TestCase
def test_color
@axis.color = "00FF00"
@axis.cross_axis = Axlsx::CatAxis.new
- str = '<?xml version="1.0" encoding="UTF-8"?>'
+ str = '<?xml version="1.0" encoding="UTF-8"?>'
str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '">'
- doc = Nokogiri::XML(@axis.to_xml_string(str))
+ doc = Nokogiri::XML(@axis.to_xml_string(str))
assert(doc.xpath("//a:srgbClr[@val='00FF00']"))
end
def test_cell_based_axis_title
p = Axlsx::Package.new
- p.workbook.add_worksheet(:name=>'foosheet') do |sheet|
+ p.workbook.add_worksheet(:name => 'foosheet') do |sheet|
sheet.add_row ['battle victories']
sheet.add_row ['bird', 1, 2, 1]
sheet.add_row ['cat', 7, 9, 10]
@@ -58,14 +57,14 @@ class TestAxis < Test::Unit::TestCase
def test_format_code
assert_raise(ArgumentError, "requires valid format code") { @axis.format_code = :high }
- assert_nothing_raised("accepts valid format code") { @axis.format_code = "00.##" }
+ assert_nothing_raised("accepts valid format code") { @axis.format_code = "00.##" }
end
- def create_chart_with_formatting(format_string=nil)
+ def create_chart_with_formatting(format_string = nil)
p = Axlsx::Package.new
p.workbook.add_worksheet(:name => "Formatting Test") do |sheet|
sheet.add_row(['test', 20])
- sheet.add_chart(Axlsx::Bar3DChart, :start_at => [0,5], :end_at => [10, 20], :title => "Test Formatting") do |chart|
+ sheet.add_chart(Axlsx::Bar3DChart, :start_at => [0, 5], :end_at => [10, 20], :title => "Test Formatting") do |chart|
chart.add_series :data => sheet["B1:B1"], :labels => sheet["A1:A1"]
chart.val_axis.format_code = format_string if format_string
doc = Nokogiri::XML(chart.to_xml_string)
@@ -97,12 +96,12 @@ class TestAxis < Test::Unit::TestCase
assert_raise(ArgumentError, "requires valid gridlines") { @axis.gridlines = 'alice' }
assert_nothing_raised("accepts valid crosses") { @axis.gridlines = false }
end
-
+
def test_to_xml_string
@axis.cross_axis = Axlsx::CatAxis.new
- str = '<?xml version="1.0" encoding="UTF-8"?>'
+ str = '<?xml version="1.0" encoding="UTF-8"?>'
str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '">'
- doc = Nokogiri::XML(@axis.to_xml_string(str))
+ doc = Nokogiri::XML(@axis.to_xml_string(str))
assert(doc.xpath('//a:noFill'))
assert(doc.xpath("//c:crosses[@val='#{@axis.crosses.to_s}']"))
assert(doc.xpath("//c:crossAx[@val='#{@axis.cross_axis.to_s}']"))
diff --git a/test/drawing/tc_bar_3D_chart.rb b/test/drawing/tc_bar_3D_chart.rb
index b7a1eca4..3c22e191 100644
--- a/test/drawing/tc_bar_3D_chart.rb
+++ b/test/drawing/tc_bar_3D_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestBar3DChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -26,11 +25,11 @@ class TestBar3DChart < Test::Unit::TestCase
assert(@chart.bar_dir == :col)
end
- def test_grouping
- assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
- assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
- assert(@chart.grouping == :standard)
- end
+ def test_grouping
+ assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+ assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
+ assert(@chart.grouping == :standard)
+ end
def test_gap_width
assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = -1 }
diff --git a/test/drawing/tc_bar_chart.rb b/test/drawing/tc_bar_chart.rb
index c8bdc8d0..5106d266 100644
--- a/test/drawing/tc_bar_chart.rb
+++ b/test/drawing/tc_bar_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestBarChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -26,11 +25,11 @@ class TestBarChart < Test::Unit::TestCase
assert(@chart.bar_dir == :col)
end
- def test_grouping
- assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
- assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
- assert(@chart.grouping == :standard)
- end
+ def test_grouping
+ assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+ assert_nothing_raised("allow valid grouping") { @chart.grouping = :standard }
+ assert(@chart.grouping == :standard)
+ end
def test_gap_width
assert_raise(ArgumentError, "require valid gap width") { @chart.gap_width = -1 }
diff --git a/test/drawing/tc_bar_series.rb b/test/drawing/tc_bar_series.rb
index f076fae0..39d39b96 100644
--- a/test/drawing/tc_bar_series.rb
+++ b/test/drawing/tc_bar_series.rb
@@ -1,10 +1,9 @@
require 'tc_helper.rb'
class TestBarSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
@chart = @ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
@series = @chart.add_series(
data: [0, 1, 2],
@@ -38,8 +37,8 @@ class TestBarSeries < Test::Unit::TestCase
def test_to_xml_string
doc = Nokogiri::XML(@chart.to_xml_string)
@series.colors.each_with_index do |color, index|
- assert_equal(doc.xpath("//c:dPt/c:idx[@val='#{index}']").size,1)
- assert_equal(doc.xpath("//c:dPt/c:spPr/a:solidFill/a:srgbClr[@val='#{@series.colors[index]}']").size,1)
+ assert_equal(doc.xpath("//c:dPt/c:idx[@val='#{index}']").size, 1)
+ assert_equal(doc.xpath("//c:dPt/c:spPr/a:solidFill/a:srgbClr[@val='#{@series.colors[index]}']").size, 1)
end
assert_equal(doc.xpath('//c:spPr[not(ancestor::c:dPt)]/a:solidFill/a:srgbClr').first.get_attribute('val'), '5A5A5A', 'series color has been applied')
end
diff --git a/test/drawing/tc_bubble_chart.rb b/test/drawing/tc_bubble_chart.rb
index 7adad218..02745f92 100644
--- a/test/drawing/tc_bubble_chart.rb
+++ b/test/drawing/tc_bubble_chart.rb
@@ -5,10 +5,10 @@ class TestBubbleChart < Test::Unit::TestCase
@p = Axlsx::Package.new
@chart = nil
@p.workbook.add_worksheet do |sheet|
- sheet.add_row ["First", 1, 5, 7, 9]
+ sheet.add_row ["First", 1, 5, 7, 9]
sheet.add_row ["", 1, 25, 49, 81]
sheet.add_row ["", 1, 42, 60, 75]
- sheet.add_row ["Second", 5, 2, 14, 9]
+ sheet.add_row ["Second", 5, 2, 14, 9]
sheet.add_row ["", 5, 10, 15, 20]
sheet.add_row ["", 5, 28, 92, 13]
sheet.add_chart(Axlsx::BubbleChart, :title => "example: Bubble Chart") do |chart|
@@ -40,5 +40,4 @@ class TestBubbleChart < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_bubble_series.rb b/test/drawing/tc_bubble_series.rb
index e601912f..af051d11 100644
--- a/test/drawing/tc_bubble_series.rb
+++ b/test/drawing/tc_bubble_series.rb
@@ -1,12 +1,11 @@
require 'tc_helper.rb'
class TestBubbleSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
@chart = @ws.add_chart Axlsx::BubbleChart, :title => "Bubble Chart"
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :bubbleSize=>[1,5,7], :title=>"GDP", :color => 'FF0000'
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :bubbleSize => [1, 5, 7], :title => "GDP", :color => 'FF0000'
end
def test_initialize
@@ -15,7 +14,6 @@ class TestBubbleSeries < Test::Unit::TestCase
def test_to_xml_string
doc = Nokogiri::XML(@chart.to_xml_string)
- assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,2)
+ assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size, 2)
end
-
end
diff --git a/test/drawing/tc_cat_axis.rb b/test/drawing/tc_cat_axis.rb
index ac690336..79c0f8db 100644
--- a/test/drawing/tc_cat_axis.rb
+++ b/test/drawing/tc_cat_axis.rb
@@ -4,6 +4,7 @@ class TestCatAxis < Test::Unit::TestCase
def setup
@axis = Axlsx::CatAxis.new
end
+
def teardown
end
@@ -27,5 +28,4 @@ class TestCatAxis < Test::Unit::TestCase
assert_raise(ArgumentError, "requires valid label offset") { @axis.lbl_offset = 'foo' }
assert_nothing_raised("accepts valid label offset") { @axis.lbl_offset = "20" }
end
-
end
diff --git a/test/drawing/tc_chart.rb b/test/drawing/tc_chart.rb
index 65d7877c..4f60db17 100644
--- a/test/drawing/tc_chart.rb
+++ b/test/drawing/tc_chart.rb
@@ -3,7 +3,6 @@ $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../"
require 'tc_helper.rb'
class TestChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -15,7 +14,7 @@ class TestChart < Test::Unit::TestCase
end
def test_initialization
- assert_equal(@p.workbook.charts.last,@chart, "the chart is in the workbook")
+ assert_equal(@p.workbook.charts.last, @chart, "the chart is in the workbook")
assert_equal(@chart.title.text, "fishery", "the title option has been applied")
assert((@chart.series.is_a?(Axlsx::SimpleTypedList) && @chart.series.empty?), "The series is initialized and empty")
end
@@ -46,7 +45,6 @@ class TestChart < Test::Unit::TestCase
assert_raise(ArgumentError) { @chart.bg_color = 2 }
assert_nothing_raised { @chart.bg_color = "FFFFFF" }
assert_equal(@chart.bg_color, "FFFFFF")
-
end
def test_title_size
@@ -77,10 +75,9 @@ class TestChart < Test::Unit::TestCase
@chart.start_at @row.cells.first
assert_equal(@chart.graphic_frame.anchor.from.col, 0)
assert_equal(@chart.graphic_frame.anchor.from.row, 0)
- @chart.start_at [5,6]
+ @chart.start_at [5, 6]
assert_equal(@chart.graphic_frame.anchor.from.col, 5)
assert_equal(@chart.graphic_frame.anchor.from.row, 6)
-
end
def test_end_at
@@ -90,14 +87,13 @@ class TestChart < Test::Unit::TestCase
@chart.end_at @row.cells.last
assert_equal(@chart.graphic_frame.anchor.to.col, 2)
assert_equal(@chart.graphic_frame.anchor.to.row, 0)
- @chart.end_at [10,11]
+ @chart.end_at [10, 11]
assert_equal(@chart.graphic_frame.anchor.to.col, 10)
assert_equal(@chart.graphic_frame.anchor.to.row, 11)
-
end
def test_add_series
- s = @chart.add_series :data=>[0,1,2,3], :labels => ["one", 1, "anything"], :title=>"bob"
+ s = @chart.add_series :data => [0, 1, 2, 3], :labels => ["one", 1, "anything"], :title => "bob"
assert_equal(@chart.series.last, s, "series has been added to chart series collection")
assert_equal(s.title.text, "bob", "series title has been applied")
end
@@ -107,7 +103,6 @@ class TestChart < Test::Unit::TestCase
end
def test_d_lbls
-
assert_equal(nil, Axlsx.instance_values_for(@chart)[:d_lbls])
@chart.d_lbls.d_lbl_pos = :t
assert(@chart.d_lbls.is_a?(Axlsx::DLbls), 'DLbls instantiated on access')
diff --git a/test/drawing/tc_d_lbls.rb b/test/drawing/tc_d_lbls.rb
index dddde3a1..a8647f9c 100644
--- a/test/drawing/tc_d_lbls.rb
+++ b/test/drawing/tc_d_lbls.rb
@@ -1,16 +1,15 @@
require 'tc_helper'
class TestDLbls < Test::Unit::TestCase
-
def setup
@d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart)
- @boolean_attributes =[:show_legend_key,
- :show_val,
- :show_cat_name,
- :show_ser_name,
- :show_percent,
- :show_bubble_size,
- :show_leader_lines]
+ @boolean_attributes = [:show_legend_key,
+ :show_val,
+ :show_cat_name,
+ :show_ser_name,
+ :show_percent,
+ :show_bubble_size,
+ :show_leader_lines]
end
def test_initialization
@@ -21,16 +20,16 @@ class TestDLbls < Test::Unit::TestCase
end
def test_initialization_with_optoins
-
- options_hash = Hash[*[@boolean_attributes.map { |name| [name, true] }] ]
+ options_hash = Hash[*[@boolean_attributes.map { |name| [name, true] }]]
+
+ d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart, options_hash.merge({ :d_lbl_pos => :t }))
- d_lbls = Axlsx::DLbls.new(Axlsx::Pie3DChart, options_hash.merge( { :d_lbl_pos => :t }))
-
@boolean_attributes.each do |attr|
assert_equal(true, d_lbls.send(attr), "boolean attributes set by options")
end
assert_equal(:t, d_lbls.d_lbl_pos, "d_lbl_pos set by options")
end
+
def test_d_lbl_pos
assert_raise(ArgumentError, 'invlaid label positions are rejected') { @d_lbls.d_lbl_pos = :upside_down }
assert_nothing_raised('accepts valid label position') { @d_lbls.d_lbl_pos = :ctr }
@@ -45,13 +44,13 @@ class TestDLbls < Test::Unit::TestCase
end
def test_to_xml_string
- str = '<?xml version="1.0" encoding="UTF-8"?>'
- str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '" xmlns:r="' << Axlsx::XML_NS_R << '">'
- @d_lbls.to_xml_string(str)
- str << '</c:chartSpace>'
- doc = Nokogiri::XML(str)
- Axlsx.instance_values_for(@d_lbls).each do |name, value|
- assert(doc.xpath("//c:#{Axlsx::camel(name, false)}[@val='#{value}']"), "#{name} is properly serialized")
- end
+ str = '<?xml version="1.0" encoding="UTF-8"?>'
+ str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '" xmlns:r="' << Axlsx::XML_NS_R << '">'
+ @d_lbls.to_xml_string(str)
+ str << '</c:chartSpace>'
+ doc = Nokogiri::XML(str)
+ Axlsx.instance_values_for(@d_lbls).each do |name, value|
+ assert(doc.xpath("//c:#{Axlsx::camel(name, false)}[@val='#{value}']"), "#{name} is properly serialized")
+ end
end
end
diff --git a/test/drawing/tc_data_source.rb b/test/drawing/tc_data_source.rb
index e9bed095..b635d56e 100644
--- a/test/drawing/tc_data_source.rb
+++ b/test/drawing/tc_data_source.rb
@@ -1,7 +1,6 @@
- require 'tc_helper.rb'
-
- class TestNumDataSource < Test::Unit::TestCase
+require 'tc_helper.rb'
+class TestNumDataSource < Test::Unit::TestCase
def setup
@data_source = Axlsx::NumDataSource.new :data => ["1", "2", "3"]
end
@@ -19,5 +18,4 @@
doc = Nokogiri::XML(str)
assert_equal(doc.xpath("//c:val").size, 1)
end
-
- end
+end
diff --git a/test/drawing/tc_drawing.rb b/test/drawing/tc_drawing.rb
index 05ffee98..282a03da 100644
--- a/test/drawing/tc_drawing.rb
+++ b/test/drawing/tc_drawing.rb
@@ -4,7 +4,6 @@ class TestDrawing < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet
-
end
def test_initialization
@@ -12,34 +11,36 @@ class TestDrawing < Test::Unit::TestCase
end
def test_add_chart
- chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
+ chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
assert(chart.is_a?(Axlsx::Pie3DChart), "must create a chart")
assert_equal(@ws.workbook.charts.last, chart, "must be added to workbook charts collection")
assert_equal(@ws.drawing.anchors.last.object.chart, chart, "an anchor has been created and holds a reference to this chart")
anchor = @ws.drawing.anchors.last
- assert_equal([anchor.from.row, anchor.from.col], [0,0], "options for start at are applied")
- assert_equal([anchor.to.row, anchor.to.col], [1,1], "options for start at are applied")
+ assert_equal([anchor.from.row, anchor.from.col], [0, 0], "options for start at are applied")
+ assert_equal([anchor.to.row, anchor.to.col], [1, 1], "options for start at are applied")
assert_equal(chart.title.text, "bob", "option for title is applied")
end
def test_add_image
src = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
- image = @ws.add_image(:image_src => src, :start_at=>[0,0], :width=>600, :height=>400)
+ image = @ws.add_image(:image_src => src, :start_at => [0, 0], :width => 600, :height => 400)
assert(@ws.drawing.anchors.last.is_a?(Axlsx::OneCellAnchor))
assert(image.is_a?(Axlsx::Pic))
assert_equal(600, image.width)
assert_equal(400, image.height)
end
+
def test_add_two_cell_anchor_image
- src = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
- image = @ws.add_image(:image_src => src, :start_at=>[0,0], :end_at => [15,0])
+ src = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
+ image = @ws.add_image(:image_src => src, :start_at => [0, 0], :end_at => [15, 0])
assert(@ws.drawing.anchors.last.is_a?(Axlsx::TwoCellAnchor))
assert(image.is_a?(Axlsx::Pic))
end
+
def test_charts
- chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
+ chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
- chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
+ chart = @ws.add_chart(Axlsx::Pie3DChart, :title => "nancy", :start_at => [1, 5], :end_at => [5, 10])
assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
end
@@ -59,9 +60,9 @@ class TestDrawing < Test::Unit::TestCase
end
def test_relationships
- @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])
+ @ws.add_chart(Axlsx::Pie3DChart, :title => "bob", :start_at => [0, 0], :end_at => [1, 1])
assert_equal(@ws.drawing.relationships.size, 1, "adding a chart adds a relationship")
- @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
+ @ws.add_chart(Axlsx::Pie3DChart, :title => "nancy", :start_at => [1, 5], :end_at => [5, 10])
assert_equal(@ws.drawing.relationships.size, 2, "adding a chart adds a relationship")
end
@@ -76,5 +77,4 @@ class TestDrawing < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_hyperlink.rb b/test/drawing/tc_hyperlink.rb
index 3a95886a..f9deb5b8 100644
--- a/test/drawing/tc_hyperlink.rb
+++ b/test/drawing/tc_hyperlink.rb
@@ -1,11 +1,10 @@
require 'tc_helper.rb'
class TestHyperlink < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
- @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
+ @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
@image = ws.add_image :image_src => @test_img, :hyperlink => "http://axlsx.blogspot.com"
@hyperlink = @image.hyperlink
end
@@ -13,7 +12,6 @@ class TestHyperlink < Test::Unit::TestCase
def teardown
end
-
def test_href
assert_nothing_raised { @hyperlink.href = "http://axlsx.blogspot.com" }
assert_equal(@hyperlink.href, "http://axlsx.blogspot.com")
@@ -41,20 +39,20 @@ class TestHyperlink < Test::Unit::TestCase
def test_endSnd
assert_nothing_raised { @hyperlink.endSnd = "true" }
- assert_raise(ArgumentError) {@hyperlink.endSnd = "bob"}
+ assert_raise(ArgumentError) { @hyperlink.endSnd = "bob" }
assert_equal(@hyperlink.endSnd, "true")
end
def test_highlightClick
assert_nothing_raised { @hyperlink.highlightClick = false }
- assert_raise(ArgumentError) {@hyperlink.highlightClick = "bob"}
- assert_equal(@hyperlink.highlightClick, false )
+ assert_raise(ArgumentError) { @hyperlink.highlightClick = "bob" }
+ assert_equal(@hyperlink.highlightClick, false)
end
def test_history
assert_nothing_raised { @hyperlink.history = false }
- assert_raise(ArgumentError) {@hyperlink.history = "bob"}
- assert_equal(@hyperlink.history, false )
+ assert_raise(ArgumentError) { @hyperlink.history = "bob" }
+ assert_equal(@hyperlink.history, false)
end
def test_to_xml_string
diff --git a/test/drawing/tc_line_3d_chart.rb b/test/drawing/tc_line_3d_chart.rb
index b419e00a..c91e9216 100644
--- a/test/drawing/tc_line_3d_chart.rb
+++ b/test/drawing/tc_line_3d_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestLine3DChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -20,18 +19,17 @@ class TestLine3DChart < Test::Unit::TestCase
assert(@chart.serAxis.is_a?(Axlsx::SerAxis), "value access not created")
end
- def test_grouping
- assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
- assert_nothing_raised("allow valid grouping") { @chart.grouping = :stacked }
- assert(@chart.grouping == :stacked)
- end
-
- def test_gapDepth
- assert_raise(ArgumentError, "require valid gapDepth") { @chart.gapDepth = 200 }
- assert_nothing_raised("allow valid gapDepth") { @chart.gapDepth = "200%" }
- assert(@chart.gapDepth == "200%")
- end
+ def test_grouping
+ assert_raise(ArgumentError, "require valid grouping") { @chart.grouping = :inverted }
+ assert_nothing_raised("allow valid grouping") { @chart.grouping = :stacked }
+ assert(@chart.grouping == :stacked)
+ end
+ def test_gapDepth
+ assert_raise(ArgumentError, "require valid gapDepth") { @chart.gapDepth = 200 }
+ assert_nothing_raised("allow valid gapDepth") { @chart.gapDepth = "200%" }
+ assert(@chart.gapDepth == "200%")
+ end
def test_to_xml
schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
@@ -43,5 +41,4 @@ class TestLine3DChart < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_line_chart.rb b/test/drawing/tc_line_chart.rb
index 0783edae..113ef844 100644
--- a/test/drawing/tc_line_chart.rb
+++ b/test/drawing/tc_line_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestLineChart < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
@@ -35,5 +34,4 @@ class TestLineChart < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_line_series.rb b/test/drawing/tc_line_series.rb
index d939096f..80643c4e 100644
--- a/test/drawing/tc_line_series.rb
+++ b/test/drawing/tc_line_series.rb
@@ -1,13 +1,12 @@
require 'tc_helper.rb'
class TestLineSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
chart = @ws.add_chart Axlsx::Line3DChart, :title => "fishery"
@series = chart.add_series(
- :data => [0,1,2],
+ :data => [0, 1, 2],
:labels => ["zero", "one", "two"],
:title => "bob",
:color => "#FF0000",
diff --git a/test/drawing/tc_marker.rb b/test/drawing/tc_marker.rb
index 05137ae7..ccfb76fe 100644
--- a/test/drawing/tc_marker.rb
+++ b/test/drawing/tc_marker.rb
@@ -16,23 +16,23 @@ class TestMarker < Test::Unit::TestCase
end
def test_col
- assert_raise(ArgumentError) { @marker.col = -1}
- assert_nothing_raised {@marker.col = 10}
+ assert_raise(ArgumentError) { @marker.col = -1 }
+ assert_nothing_raised { @marker.col = 10 }
end
def test_colOff
- assert_raise(ArgumentError) { @marker.colOff = "1"}
- assert_nothing_raised {@marker.colOff = -10}
+ assert_raise(ArgumentError) { @marker.colOff = "1" }
+ assert_nothing_raised { @marker.colOff = -10 }
end
def test_row
- assert_raise(ArgumentError) { @marker.row = -1}
- assert_nothing_raised {@marker.row = 10}
+ assert_raise(ArgumentError) { @marker.row = -1 }
+ assert_nothing_raised { @marker.row = 10 }
end
def test_rowOff
- assert_raise(ArgumentError) { @marker.rowOff = "1"}
- assert_nothing_raised {@marker.rowOff = -10}
+ assert_raise(ArgumentError) { @marker.rowOff = "1" }
+ assert_nothing_raised { @marker.rowOff = -10 }
end
def test_coord
@@ -40,5 +40,4 @@ class TestMarker < Test::Unit::TestCase
assert_equal(@marker.col, 5)
assert_equal(@marker.row, 10)
end
-
end
diff --git a/test/drawing/tc_num_data.rb b/test/drawing/tc_num_data.rb
index 2549af4d..7e7e12e3 100644
--- a/test/drawing/tc_num_data.rb
+++ b/test/drawing/tc_num_data.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestNumData < Test::Unit::TestCase
-
def setup
@num_data = Axlsx::NumData.new :data => [1, 2, 3]
end
@@ -9,14 +8,13 @@ class TestNumData < Test::Unit::TestCase
def test_initialize
assert_equal(@num_data.format_code, "General")
end
-
+
def test_formula_based_cell
-
end
-
+
def test_format_code
- assert_raise(ArgumentError) {@num_data.format_code = 7}
- assert_nothing_raised {@num_data.format_code = 'foo_bar'}
+ assert_raise(ArgumentError) { @num_data.format_code = 7 }
+ assert_nothing_raised { @num_data.format_code = 'foo_bar' }
end
def test_to_xml_string
@@ -27,5 +25,4 @@ class TestNumData < Test::Unit::TestCase
assert_equal(doc.xpath("//c:numLit/c:ptCount[@val=3]").size, 1)
assert_equal(doc.xpath("//c:numLit/c:pt/c:v[text()='1']").size, 1)
end
-
end
diff --git a/test/drawing/tc_num_val.rb b/test/drawing/tc_num_val.rb
index ef27deb9..2123ea92 100644
--- a/test/drawing/tc_num_val.rb
+++ b/test/drawing/tc_num_val.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestNumVal < Test::Unit::TestCase
-
def setup
@num_val = Axlsx::NumVal.new :v => 1
end
@@ -12,8 +11,8 @@ class TestNumVal < Test::Unit::TestCase
end
def test_format_code
- assert_raise(ArgumentError) {@num_val.format_code = 7}
- assert_nothing_raised {@num_val.format_code = 'foo_bar'}
+ assert_raise(ArgumentError) { @num_val.format_code = 7 }
+ assert_nothing_raised { @num_val.format_code = 'foo_bar' }
end
def test_to_xml_string
@@ -23,7 +22,5 @@ class TestNumVal < Test::Unit::TestCase
doc = Nokogiri::XML(str)
# lets see if this works?
assert_equal(doc.xpath("//c:pt/c:v[text()='1']").size, 1)
-
end
-
end
diff --git a/test/drawing/tc_one_cell_anchor.rb b/test/drawing/tc_one_cell_anchor.rb
index 3c1db55f..1b18f12e 100644
--- a/test/drawing/tc_one_cell_anchor.rb
+++ b/test/drawing/tc_one_cell_anchor.rb
@@ -1,11 +1,10 @@
require 'tc_helper.rb'
class TestOneCellAnchor < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
@ws = @p.workbook.add_worksheet
- @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
+ @test_img = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
@image = @ws.add_image :image_src => @test_img
@anchor = @image.anchor
end
@@ -51,8 +50,8 @@ class TestOneCellAnchor < Test::Unit::TestCase
end
def test_options
- assert_raise(ArgumentError, 'invalid start_at') { @ws.add_image :image_src=>@test_img, :start_at=>[1] }
- i = @ws.add_image :image_src=>@test_img, :start_at => [1,2], :width=>100, :height=>200, :name=>"someimage", :descr=>"a neat image"
+ assert_raise(ArgumentError, 'invalid start_at') { @ws.add_image :image_src => @test_img, :start_at => [1] }
+ i = @ws.add_image :image_src => @test_img, :start_at => [1, 2], :width => 100, :height => 200, :name => "someimage", :descr => "a neat image"
assert_equal("a neat image", i.descr)
assert_equal("someimage", i.name)
@@ -62,5 +61,4 @@ class TestOneCellAnchor < Test::Unit::TestCase
assert_equal(2, i.anchor.from.row)
assert_equal(@test_img, i.image_src)
end
-
end
diff --git a/test/drawing/tc_pic.rb b/test/drawing/tc_pic.rb
index 8c2088d4..56042de5 100644
--- a/test/drawing/tc_pic.rb
+++ b/test/drawing/tc_pic.rb
@@ -1,14 +1,13 @@
require 'tc_helper.rb'
class TestPic < Test::Unit::TestCase
-
def setup
@p = Axlsx::Package.new
ws = @p.workbook.add_worksheet
- @test_img = @test_img_jpg = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
+ @test_img = @test_img_jpg = File.dirname(__FILE__) + "/../fixtures/image1.jpeg"
@test_img_png = File.dirname(__FILE__) + "/../fixtures/image1.png"
@test_img_gif = File.dirname(__FILE__) + "/../fixtures/image1.gif"
- @test_img_fake = File.dirname(__FILE__) + "/../fixtures/image1_fake.jpg"
+ @test_img_fake = File.dirname(__FILE__) + "/../fixtures/image1_fake.jpg"
@image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?", :opacity => 5
end
@@ -19,23 +18,22 @@ class TestPic < Test::Unit::TestCase
end
def test_anchor_swapping
- #swap from one cell to two cell when end_at is specified
+ # swap from one cell to two cell when end_at is specified
assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
start_at = @image.anchor.from
- @image.end_at 10,5
+ @image.end_at 10, 5
assert(@image.anchor.is_a?(Axlsx::TwoCellAnchor))
assert_equal(start_at.col, @image.anchor.from.col)
assert_equal(start_at.row, @image.anchor.from.row)
- assert_equal(10,@image.anchor.to.col)
+ assert_equal(10, @image.anchor.to.col)
assert_equal(5, @image.anchor.to.row)
- #swap from two cell to one cell when width or height are specified
+ # swap from two cell to one cell when width or height are specified
@image.width = 200
assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
assert_equal(start_at.col, @image.anchor.from.col)
assert_equal(start_at.row, @image.anchor.from.row)
assert_equal(200, @image.width)
-
end
def test_hyperlink
diff --git a/test/drawing/tc_picture_locking.rb b/test/drawing/tc_picture_locking.rb
index c0a828aa..6e5de47b 100644
--- a/test/drawing/tc_picture_locking.rb
+++ b/test/drawing/tc_picture_locking.rb
@@ -4,6 +4,7 @@ class TestPictureLocking < Test::Unit::TestCase
def setup
@item = Axlsx::PictureLocking.new
end
+
def teardown
end
@@ -15,58 +16,54 @@ class TestPictureLocking < Test::Unit::TestCase
def test_noGrp
assert_raise(ArgumentError) { @item.noGrp = -1 }
assert_nothing_raised { @item.noGrp = false }
- assert_equal(@item.noGrp, false )
+ assert_equal(@item.noGrp, false)
end
def test_noRot
assert_raise(ArgumentError) { @item.noRot = -1 }
assert_nothing_raised { @item.noRot = false }
- assert_equal(@item.noRot, false )
+ assert_equal(@item.noRot, false)
end
def test_noChangeAspect
assert_raise(ArgumentError) { @item.noChangeAspect = -1 }
assert_nothing_raised { @item.noChangeAspect = false }
- assert_equal(@item.noChangeAspect, false )
+ assert_equal(@item.noChangeAspect, false)
end
def test_noMove
assert_raise(ArgumentError) { @item.noMove = -1 }
assert_nothing_raised { @item.noMove = false }
- assert_equal(@item.noMove, false )
+ assert_equal(@item.noMove, false)
end
def test_noResize
assert_raise(ArgumentError) { @item.noResize = -1 }
assert_nothing_raised { @item.noResize = false }
- assert_equal(@item.noResize, false )
+ assert_equal(@item.noResize, false)
end
def test_noEditPoints
assert_raise(ArgumentError) { @item.noEditPoints = -1 }
assert_nothing_raised { @item.noEditPoints = false }
- assert_equal(@item.noEditPoints, false )
+ assert_equal(@item.noEditPoints, false)
end
def test_noAdjustHandles
assert_raise(ArgumentError) { @item.noAdjustHandles = -1 }
assert_nothing_raised { @item.noAdjustHandles = false }
- assert_equal(@item.noAdjustHandles, false )
+ assert_equal(@item.noAdjustHandles, false)
end
def test_noChangeArrowheads
assert_raise(ArgumentError) { @item.noChangeArrowheads = -1 }
assert_nothing_raised { @item.noChangeArrowheads = false }
- assert_equal(@item.noChangeArrowheads, false )
+ assert_equal(@item.noChangeArrowheads, false)
end
def test_noChangeShapeType
assert_raise(ArgumentError) { @item.noChangeShapeType = -1 }
assert_nothing_raised { @item.noChangeShapeType = false }
- assert_equal(@item.noChangeShapeType, false )
+ assert_equal(@item.noChangeShapeType, false)
end
-
-
-
-
end
diff --git a/test/drawing/tc_pie_3D_chart.rb b/test/drawing/tc_pie_3D_chart.rb
index a941eacd..f536f086 100644
--- a/test/drawing/tc_pie_3D_chart.rb
+++ b/test/drawing/tc_pie_3D_chart.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestPie3DChart < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
ws = p.workbook.add_worksheet
@@ -21,8 +20,7 @@ class TestPie3DChart < Test::Unit::TestCase
def test_to_xml
schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
doc = Nokogiri::XML(@chart.to_xml_string)
- errors = schema.validate(doc).map {|error| puts error.message; error }
+ errors = schema.validate(doc).map { |error| puts error.message; error }
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_pie_series.rb b/test/drawing/tc_pie_series.rb
index 18e4bbd0..c3f5bb3a 100644
--- a/test/drawing/tc_pie_series.rb
+++ b/test/drawing/tc_pie_series.rb
@@ -1,12 +1,11 @@
require 'tc_helper.rb'
class TestPieSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
chart = @ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
- @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :colors => ["FF0000", "00FF00", "0000FF"]
+ @series = chart.add_series :data => [0, 1, 2], :labels => ["zero", "one", "two"], :title => "bob", :colors => ["FF0000", "00FF00", "0000FF"]
end
def test_initialize
@@ -28,6 +27,5 @@ class TestPieSeries < Test::Unit::TestCase
doc = Nokogiri::XML(@series.to_xml_string)
assert(doc.xpath("//srgbClr[@val='#{@series.colors[0]}']"))
end
- #TODO test unique serialization parts
-
+ # TODO test unique serialization parts
end
diff --git a/test/drawing/tc_scaling.rb b/test/drawing/tc_scaling.rb
index 01e21a5d..8f92a024 100644
--- a/test/drawing/tc_scaling.rb
+++ b/test/drawing/tc_scaling.rb
@@ -13,24 +13,22 @@ class TestScaling < Test::Unit::TestCase
end
def test_logBase
- assert_raise(ArgumentError) { @scaling.logBase = 1}
- assert_nothing_raised {@scaling.logBase = 10}
+ assert_raise(ArgumentError) { @scaling.logBase = 1 }
+ assert_nothing_raised { @scaling.logBase = 10 }
end
def test_orientation
- assert_raise(ArgumentError) { @scaling.orientation = "1"}
- assert_nothing_raised {@scaling.orientation = :maxMin}
+ assert_raise(ArgumentError) { @scaling.orientation = "1" }
+ assert_nothing_raised { @scaling.orientation = :maxMin }
end
-
def test_max
- assert_raise(ArgumentError) { @scaling.max = 1}
- assert_nothing_raised {@scaling.max = 10.5}
+ assert_raise(ArgumentError) { @scaling.max = 1 }
+ assert_nothing_raised { @scaling.max = 10.5 }
end
def test_min
- assert_raise(ArgumentError) { @scaling.min = 1}
- assert_nothing_raised {@scaling.min = 10.5}
+ assert_raise(ArgumentError) { @scaling.min = 1 }
+ assert_nothing_raised { @scaling.min = 10.5 }
end
-
end
diff --git a/test/drawing/tc_scatter_chart.rb b/test/drawing/tc_scatter_chart.rb
index 15b1f0a0..359f7206 100644
--- a/test/drawing/tc_scatter_chart.rb
+++ b/test/drawing/tc_scatter_chart.rb
@@ -5,9 +5,9 @@ class TestScatterChart < Test::Unit::TestCase
@p = Axlsx::Package.new
@chart = nil
@p.workbook.add_worksheet do |sheet|
- sheet.add_row ["First", 1, 5, 7, 9]
+ sheet.add_row ["First", 1, 5, 7, 9]
sheet.add_row ["", 1, 25, 49, 81]
- sheet.add_row ["Second", 5, 2, 14, 9]
+ sheet.add_row ["Second", 5, 2, 14, 9]
sheet.add_row ["", 5, 10, 15, 20]
sheet.add_chart(Axlsx::ScatterChart, :title => "example 7: Scatter Chart") do |chart|
chart.start_at 0, 4
@@ -27,6 +27,7 @@ class TestScatterChart < Test::Unit::TestCase
assert(@chart.scatterStyle == :marker)
assert_raise(ArgumentError) { @chart.scatterStyle = :buckshot }
end
+
def test_initialization
assert_equal(@chart.scatterStyle, :lineMarker, "scatterStyle defualt incorrect")
assert_equal(@chart.series_type, Axlsx::ScatterSeries, "series type incorrect")
@@ -44,5 +45,4 @@ class TestScatterChart < Test::Unit::TestCase
end
assert(errors.empty?, "error free validation")
end
-
end
diff --git a/test/drawing/tc_scatter_series.rb b/test/drawing/tc_scatter_series.rb
index 3d1d294d..5ca126a2 100644
--- a/test/drawing/tc_scatter_series.rb
+++ b/test/drawing/tc_scatter_series.rb
@@ -1,12 +1,11 @@
require 'tc_helper.rb'
class TestScatterSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"exponents", :color => 'FF0000', :smooth => true
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "exponents", :color => 'FF0000', :smooth => true
end
def test_initialize
@@ -15,31 +14,31 @@ class TestScatterSeries < Test::Unit::TestCase
def test_smoothed_chart_default_smoothing
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart", :scatter_style => :smoothMarker
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"smoothed exponents"
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "smoothed exponents"
assert(@series.smooth, "series is smooth by default on smooth charts")
end
def test_unsmoothed_chart_default_smoothing
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart", :scatter_style => :line
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"unsmoothed exponents"
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "unsmoothed exponents"
assert([email protected], "series is not smooth by default on non-smooth charts")
end
def test_explicit_smoothing
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "Unsmooth Chart, Smooth Series", :scatter_style => :line
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"smoothed exponents", :smooth => true
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "smoothed exponents", :smooth => true
assert(@series.smooth, "series is smooth when overriding chart default")
end
def test_explicit_unsmoothing
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "Smooth Chart, Unsmooth Series", :scatter_style => :smoothMarker
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"unsmoothed exponents", :smooth => false
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "unsmoothed exponents", :smooth => false
assert([email protected], "series is not smooth when overriding chart default")
end
def test_ln_width
@chart = @ws.add_chart Axlsx::ScatterChart, :title => "ln width", :scatter_style => :line
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :title=>"ln_width"
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :title => "ln_width"
@series.ln_width = 12700
assert_equal(@series.ln_width, 12700, 'line width assigment is allowed')
end
@@ -49,26 +48,25 @@ class TestScatterSeries < Test::Unit::TestCase
@series.ln_width = 12700
doc = Nokogiri::XML(@chart.to_xml_string)
assert_equal(12700, @series.ln_width)
- assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size,4)
+ assert_equal(doc.xpath("//a:srgbClr[@val='#{@series.color}']").size, 4)
assert_equal(doc.xpath("//a:ln[@w='#{@series.ln_width}']").length, 1)
end
def test_false_show_marker
@chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Smooth Chart', :scatter_style => :smoothMarker
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9]
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9]
assert(@series.show_marker, 'markers are enabled for marker-related styles')
end
def test_true_show_marker
@chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Line chart', :scatter_style => :line
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9]
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9]
assert([email protected]_marker, 'markers are disabled for markerless scatter styles')
end
def test_marker_symbol
@chart = @ws.add_chart Axlsx::ScatterChart, :title => 'Line chart', :scatter_style => :line
- @series = @chart.add_series :xData=>[1,2,4], :yData=>[1,3,9], :marker_symbol => :diamond
+ @series = @chart.add_series :xData => [1, 2, 4], :yData => [1, 3, 9], :marker_symbol => :diamond
assert_equal(@series.marker_symbol, :diamond, 'series could have own custom marker symbol')
end
-
end
diff --git a/test/drawing/tc_ser_axis.rb b/test/drawing/tc_ser_axis.rb
index 7febafce..4b498a12 100644
--- a/test/drawing/tc_ser_axis.rb
+++ b/test/drawing/tc_ser_axis.rb
@@ -14,18 +14,15 @@ class TestSerAxis < Test::Unit::TestCase
assert_equal(a.tick_mark_skip, 7)
end
-
def test_tick_lbl_skip
assert_raise(ArgumentError, "requires valid tick_lbl_skip") { @axis.tick_lbl_skip = -1 }
assert_nothing_raised("accepts valid tick_lbl_skip") { @axis.tick_lbl_skip = 1 }
assert_equal(@axis.tick_lbl_skip, 1)
end
-
def test_tick_mark_skip
assert_raise(ArgumentError, "requires valid tick_mark_skip") { @axis.tick_mark_skip = :my_eyes }
assert_nothing_raised("accepts valid tick_mark_skip") { @axis.tick_mark_skip = 2 }
assert_equal(@axis.tick_mark_skip, 2)
end
-
end
diff --git a/test/drawing/tc_series.rb b/test/drawing/tc_series.rb
index b32595a7..80f4b7cb 100644
--- a/test/drawing/tc_series.rb
+++ b/test/drawing/tc_series.rb
@@ -1,12 +1,11 @@
require 'tc_helper.rb'
class TestSeries < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
- @ws = p.workbook.add_worksheet :name=>"hmmm"
+ @ws = p.workbook.add_worksheet :name => "hmmm"
chart = @ws.add_chart Axlsx::Chart, :title => "fishery"
- @series = chart.add_series :title=>"bob"
+ @series = chart.add_series :title => "bob"
end
def test_initialize
@@ -19,5 +18,4 @@ class TestSeries < Test::Unit::TestCase
@series.order = 2
assert_equal(@series.order, 2)
end
-
end
diff --git a/test/drawing/tc_str_data.rb b/test/drawing/tc_str_data.rb
index a116965b..f964a7b3 100644
--- a/test/drawing/tc_str_data.rb
+++ b/test/drawing/tc_str_data.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestStrData < Test::Unit::TestCase
-
def setup
@str_data = Axlsx::StrData.new :data => ["1", "2", "3"]
end
@@ -14,5 +13,4 @@ class TestStrData < Test::Unit::TestCase
assert_equal(doc.xpath("//c:strLit/c:ptCount[@val=3]").size, 1)
assert_equal(doc.xpath("//c:strLit/c:pt/c:v[text()='1']").size, 1)
end
-
end
diff --git a/test/drawing/tc_str_val.rb b/test/drawing/tc_str_val.rb
index e4547f62..03b0b32a 100644
--- a/test/drawing/tc_str_val.rb
+++ b/test/drawing/tc_str_val.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestStrVal < Test::Unit::TestCase
-
def setup
@str_val = Axlsx::StrVal.new :v => "1"
@str_val_with_special_characters = Axlsx::StrVal.new :v => "a & b <c>"
@@ -26,5 +25,4 @@ class TestStrVal < Test::Unit::TestCase
doc = Nokogiri::XML(str)
assert_equal(doc.xpath("//c:pt/c:v[text()='a & b <c>']").size, 1)
end
-
end
diff --git a/test/drawing/tc_two_cell_anchor.rb b/test/drawing/tc_two_cell_anchor.rb
index db84521d..f2067c23 100644
--- a/test/drawing/tc_two_cell_anchor.rb
+++ b/test/drawing/tc_two_cell_anchor.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestTwoCellAnchor < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet
@@ -22,8 +21,8 @@ class TestTwoCellAnchor < Test::Unit::TestCase
end
def test_options
- assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at=>"1" }
- assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, :start_at=>[1,2], :end_at => ["a", 4] }
+ assert_raise(ArgumentError, 'invalid start_at') { @ws.add_chart Axlsx::Chart, :start_at => "1" }
+ assert_raise(ArgumentError, 'invalid end_at') { @ws.add_chart Axlsx::Chart, :start_at => [1, 2], :end_at => ["a", 4] }
# this is actually raised in the graphic frame
assert_raise(ArgumentError, 'invalid Chart') { @ws.add_chart Axlsx::TwoCellAnchor }
a = @ws.add_chart Axlsx::Chart, :start_at => [15, 35], :end_at => [90, 45]
@@ -32,5 +31,4 @@ class TestTwoCellAnchor < Test::Unit::TestCase
assert_equal(a.graphic_frame.anchor.to.col, 90)
assert_equal(a.graphic_frame.anchor.to.row, 45)
end
-
end
diff --git a/test/drawing/tc_val_axis.rb b/test/drawing/tc_val_axis.rb
index aa1cb23a..a607ddb1 100644
--- a/test/drawing/tc_val_axis.rb
+++ b/test/drawing/tc_val_axis.rb
@@ -4,6 +4,7 @@ class TestValAxis < Test::Unit::TestCase
def setup
@axis = Axlsx::ValAxis.new
end
+
def teardown
end
@@ -20,5 +21,4 @@ class TestValAxis < Test::Unit::TestCase
assert_raise(ArgumentError, "requires valid crossBetween") { @axis.cross_between = :my_eyes }
assert_nothing_raised("accepts valid crossBetween") { @axis.cross_between = :midCat }
end
-
end
diff --git a/test/drawing/tc_view_3D.rb b/test/drawing/tc_view_3D.rb
index 5f6809ef..43116023 100644
--- a/test/drawing/tc_view_3D.rb
+++ b/test/drawing/tc_view_3D.rb
@@ -2,7 +2,7 @@ require 'tc_helper.rb'
class TestView3D < Test::Unit::TestCase
def setup
- @view = Axlsx::View3D.new
+ @view = Axlsx::View3D.new
end
def teardown
@@ -19,36 +19,32 @@ class TestView3D < Test::Unit::TestCase
end
def test_rot_x
- assert_raise(ArgumentError) {@view.rot_x = "bob"}
- assert_nothing_raised {@view.rot_x = -90}
+ assert_raise(ArgumentError) { @view.rot_x = "bob" }
+ assert_nothing_raised { @view.rot_x = -90 }
end
def test_rot_y
- assert_raise(ArgumentError) {@view.rot_y = "bob"}
- assert_nothing_raised {@view.rot_y = 90}
+ assert_raise(ArgumentError) { @view.rot_y = "bob" }
+ assert_nothing_raised { @view.rot_y = 90 }
end
def test_h_percent
- assert_raise(ArgumentError) {@view.h_percent = "bob"}
- assert_nothing_raised {@view.h_percent = "500%"}
+ assert_raise(ArgumentError) { @view.h_percent = "bob" }
+ assert_nothing_raised { @view.h_percent = "500%" }
end
def test_depth_percent
- assert_raise(ArgumentError) {@view.depth_percent = "bob"}
- assert_nothing_raised {@view.depth_percent = "20%"}
+ assert_raise(ArgumentError) { @view.depth_percent = "bob" }
+ assert_nothing_raised { @view.depth_percent = "20%" }
end
-
def test_rAngAx
- assert_raise(ArgumentError) {@view.rAngAx = "bob"}
- assert_nothing_raised {@view.rAngAx = true}
+ assert_raise(ArgumentError) { @view.rAngAx = "bob" }
+ assert_nothing_raised { @view.rAngAx = true }
end
def test_perspective
- assert_raise(ArgumentError) {@view.perspective = "bob"}
- assert_nothing_raised {@view.perspective = 30}
+ assert_raise(ArgumentError) { @view.perspective = "bob" }
+ assert_nothing_raised { @view.perspective = 30 }
end
-
-
-
end
diff --git a/test/drawing/tc_vml_drawing.rb b/test/drawing/tc_vml_drawing.rb
index ac95a2f3..debba561 100644
--- a/test/drawing/tc_vml_drawing.rb
+++ b/test/drawing/tc_vml_drawing.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestVmlDrawing < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
wb = p.workbook
@@ -19,7 +18,6 @@ class TestVmlDrawing < Test::Unit::TestCase
str = @vml_drawing.to_xml_string()
doc = Nokogiri::XML(str)
assert_equal(doc.xpath("//v:shape").size, 2)
- assert(doc.xpath("//o:idmap[@o:data='#{@ws.index+1}']"))
+ assert(doc.xpath("//o:idmap[@o:data='#{@ws.index + 1}']"))
end
-
end
diff --git a/test/drawing/tc_vml_shape.rb b/test/drawing/tc_vml_shape.rb
index 94ad6e9f..b8344a92 100644
--- a/test/drawing/tc_vml_shape.rb
+++ b/test/drawing/tc_vml_shape.rb
@@ -1,7 +1,6 @@
require 'tc_helper.rb'
class TestVmlShape < Test::Unit::TestCase
-
def setup
p = Axlsx::Package.new
wb = p.workbook
@@ -84,12 +83,14 @@ class TestVmlShape < Test::Unit::TestCase
assert(shape.top_row == 3)
assert_raise(ArgumentError) { shape.top_row = [] }
end
+
def test_visible
shape = @comments.first.vml_shape
shape.visible = false
assert(shape.visible == false)
assert_raise(ArgumentError) { shape.visible = 'foo' }
end
+
def test_to_xml_string
str = @comments.vml_drawing.to_xml_string()
doc = Nokogiri::XML(str)
@@ -102,5 +103,4 @@ class TestVmlShape < Test::Unit::TestCase
assert(doc.xpath("//v:shape/x:ClientData/x:Anchor[text()='#{shape.left_column}, #{shape.left_offset}, #{shape.top_row}, #{shape.top_offset}, #{shape.right_column}, #{shape.right_offset}, #{shape.bottom_row}, #{shape.bottom_offset}']").size == 1)
end
end
-
end