summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/drawing/tc_bar_series.rb2
-rw-r--r--test/drawing/tc_drawing.rb9
-rw-r--r--test/drawing/tc_line_series.rb2
-rw-r--r--test/drawing/tc_pie_3D_chart.rb2
-rw-r--r--test/drawing/tc_pie_series.rb2
-rw-r--r--test/drawing/tc_scatter_series.rb2
-rw-r--r--test/drawing/tc_series.rb2
-rw-r--r--test/workbook/tc_workbook.rb2
-rw-r--r--test/workbook/worksheet/table/tc_table.rb8
-rw-r--r--test/workbook/worksheet/tc_worksheet.rb17
10 files changed, 22 insertions, 26 deletions
diff --git a/test/drawing/tc_bar_series.rb b/test/drawing/tc_bar_series.rb
index 6b173155..483e561d 100644
--- a/test/drawing/tc_bar_series.rb
+++ b/test/drawing/tc_bar_series.rb
@@ -5,7 +5,7 @@ class TestBarSeries < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet :name=>"hmmm"
- @chart = @ws.drawing.add_chart Axlsx::Bar3DChart, :title => "fishery"
+ @chart = @ws.add_chart Axlsx::Bar3DChart, :title => "fishery"
@series = @chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :colors => ['FF0000', '00FF00', '0000FF'], :shape => :cone
end
diff --git a/test/drawing/tc_drawing.rb b/test/drawing/tc_drawing.rb
index 4d213d56..f347001f 100644
--- a/test/drawing/tc_drawing.rb
+++ b/test/drawing/tc_drawing.rb
@@ -9,8 +9,6 @@ class TestDrawing < Test::Unit::TestCase
def test_initialization
assert(@ws.workbook.drawings.empty?)
- assert_equal(@ws.drawing, @ws.workbook.drawings.last, "drawing is added to workbook")
- assert(@ws.drawing.anchors.is_a?(Axlsx::SimpleTypedList) && @ws.drawing.anchors.empty?, "anchor list is created and empty")
end
def test_add_chart
@@ -39,7 +37,6 @@ class TestDrawing < Test::Unit::TestCase
assert(image.is_a?(Axlsx::Pic))
end
def test_charts
- assert(@ws.drawing.charts.empty?)
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])
@@ -47,23 +44,26 @@ class TestDrawing < Test::Unit::TestCase
end
def test_pn
+ @ws.add_chart(Axlsx::Pie3DChart)
assert_equal(@ws.drawing.pn, "drawings/drawing1.xml")
end
def test_rels_pn
+ @ws.add_chart(Axlsx::Pie3DChart)
assert_equal(@ws.drawing.rels_pn, "drawings/_rels/drawing1.xml.rels")
end
def test_rId
+ @ws.add_chart(Axlsx::Pie3DChart)
assert_equal(@ws.drawing.rId, "rId1")
end
def test_index
+ @ws.add_chart(Axlsx::Pie3DChart)
assert_equal(@ws.drawing.index, @ws.workbook.drawings.index(@ws.drawing))
end
def test_relationships
- assert(@ws.drawing.relationships.empty?)
chart = @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")
chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"nancy", :start_at=>[1,5], :end_at=>[5,10])
@@ -72,6 +72,7 @@ class TestDrawing < Test::Unit::TestCase
def test_to_xml
schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
+ @ws.add_chart(Axlsx::Pie3DChart)
doc = Nokogiri::XML(@ws.drawing.to_xml_string)
errors = []
schema.validate(doc).each do |error|
diff --git a/test/drawing/tc_line_series.rb b/test/drawing/tc_line_series.rb
index 557ba251..cc62005b 100644
--- a/test/drawing/tc_line_series.rb
+++ b/test/drawing/tc_line_series.rb
@@ -5,7 +5,7 @@ class TestLineSeries < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet :name=>"hmmm"
- chart = @ws.drawing.add_chart Axlsx::Line3DChart, :title => "fishery"
+ chart = @ws.add_chart Axlsx::Line3DChart, :title => "fishery"
@series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob", :color => "#FF0000"
end
diff --git a/test/drawing/tc_pie_3D_chart.rb b/test/drawing/tc_pie_3D_chart.rb
index 5e671989..a941eacd 100644
--- a/test/drawing/tc_pie_3D_chart.rb
+++ b/test/drawing/tc_pie_3D_chart.rb
@@ -6,7 +6,7 @@ class TestPie3DChart < Test::Unit::TestCase
p = Axlsx::Package.new
ws = p.workbook.add_worksheet
@row = ws.add_row ["one", 1, Time.now]
- @chart = ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
+ @chart = ws.add_chart Axlsx::Pie3DChart, :title => "fishery"
end
def teardown
diff --git a/test/drawing/tc_pie_series.rb b/test/drawing/tc_pie_series.rb
index 2c8859c7..70abb602 100644
--- a/test/drawing/tc_pie_series.rb
+++ b/test/drawing/tc_pie_series.rb
@@ -5,7 +5,7 @@ class TestPieSeries < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet :name=>"hmmm"
- chart = @ws.drawing.add_chart Axlsx::Pie3DChart, :title => "fishery"
+ 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"]
end
diff --git a/test/drawing/tc_scatter_series.rb b/test/drawing/tc_scatter_series.rb
index e97abca7..b43ed171 100644
--- a/test/drawing/tc_scatter_series.rb
+++ b/test/drawing/tc_scatter_series.rb
@@ -5,7 +5,7 @@ class TestScatterSeries < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet :name=>"hmmm"
- @chart = @ws.drawing.add_chart Axlsx::ScatterChart, :title => "Scatter Chart"
+ @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'
end
diff --git a/test/drawing/tc_series.rb b/test/drawing/tc_series.rb
index 6b83015a..b32595a7 100644
--- a/test/drawing/tc_series.rb
+++ b/test/drawing/tc_series.rb
@@ -5,7 +5,7 @@ class TestSeries < Test::Unit::TestCase
def setup
p = Axlsx::Package.new
@ws = p.workbook.add_worksheet :name=>"hmmm"
- chart = @ws.drawing.add_chart Axlsx::Chart, :title => "fishery"
+ chart = @ws.add_chart Axlsx::Chart, :title => "fishery"
@series = chart.add_series :title=>"bob"
end
diff --git a/test/workbook/tc_workbook.rb b/test/workbook/tc_workbook.rb
index e6bb48a0..f6f38778 100644
--- a/test/workbook/tc_workbook.rb
+++ b/test/workbook/tc_workbook.rb
@@ -79,7 +79,7 @@ class TestWorkbook < Test::Unit::TestCase
sheet.auto_filter = "A1:B1"
end
doc = Nokogiri::XML(@wb.to_xml_string)
- assert_equal(doc.xpath('//xmlns:workbook/xmlns:definedNames/xmlns:definedName').inner_text, @wb.worksheets[0].abs_auto_filter)
+ assert_equal(doc.xpath('//xmlns:workbook/xmlns:definedNames/xmlns:definedName').inner_text, @wb.worksheets[0].auto_filter.defined_name)
end
diff --git a/test/workbook/worksheet/table/tc_table.rb b/test/workbook/worksheet/table/tc_table.rb
index c8e56fc3..7c87c69e 100644
--- a/test/workbook/worksheet/table/tc_table.rb
+++ b/test/workbook/worksheet/table/tc_table.rb
@@ -25,14 +25,6 @@ class TestTable < Test::Unit::TestCase
end
- def test_charts
- assert(@ws.drawing.charts.empty?)
- 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])
- assert_equal(@ws.drawing.charts.last, chart, "add chart is returned")
- end
-
def test_pn
@ws.add_table("A1:D5")
assert_equal(@ws.tables.first.pn, "tables/table1.xml")
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index df808025..3bb9908f 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -113,12 +113,12 @@ class TestWorksheet < Test::Unit::TestCase
def test_dimension
@ws.add_row [1, 2, 3]
@ws.add_row [4, 5, 6]
- assert_equal @ws.dimension, "A1:C2"
+ assert_equal @ws.dimension.sqref, "A1:C2"
end
def test_dimension_with_empty_row
@ws.add_row
- assert_equal "A1:AA200", @ws.dimension
+ assert_equal "A1:AA200", @ws.dimension.sqref
end
def test_referencing
@@ -148,7 +148,9 @@ class TestWorksheet < Test::Unit::TestCase
end
def test_drawing
- assert @ws.drawing.is_a? Axlsx::Drawing
+ assert @ws.drawing == nil
+ @ws.add_chart(Axlsx::Pie3DChart)
+ assert @ws.drawing.is_a?(Axlsx::Drawing)
end
def test_col_style
@@ -306,10 +308,11 @@ class TestWorksheet < Test::Unit::TestCase
assert_equal(doc.xpath('//xmlns:worksheet/xmlns:tableParts/xmlns:tablePart[@r:id="rId1"]').size, 1)
end
- def test_abs_auto_filter
+ def test_auto_filter
@ws.add_row [1, "two", 3]
@ws.auto_filter = "A1:C1"
- assert_equal(@ws.abs_auto_filter, "'Sheet1'!$A$1:$C$1")
+ assert_equal("A1:C1", @ws.auto_filter.range)
+ assert_equal(@ws.auto_filter.defined_name, "'Sheet1'!$A$1:$C$1")
end
def test_to_xml_string
@@ -415,9 +418,9 @@ class TestWorksheet < Test::Unit::TestCase
end
def test_auto_filter
- assert(@ws.auto_filter.nil?)
+ assert(@ws.auto_filter.range.nil?)
assert_raise(ArgumentError) { @ws.auto_filter = 123 }
@ws.auto_filter = "A1:D9"
- assert_equal(@ws.auto_filter, "A1:D9")
+ assert_equal(@ws.auto_filter.range, "A1:D9")
end
end
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-19 18:14:33 +0000