instance_values -> instance_values_for

6 files changed, 10 insertions, 10 deletions

diff --git a/test/drawing/tc_chart.rb b/test/drawing/tc_chart.rb
index 5aa2a809..302d13cd 100644
--- a/test/drawing/tc_chart.rb
+++ b/test/drawing/tc_chart.rb
@@ -104,7 +104,7 @@ class TestChart < Test::Unit::TestCase
 
   def test_d_lbls
     
-    assert_equal(nil, Axlsx.instance_values(@chart)[: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')
   end
diff --git a/test/drawing/tc_d_lbls.rb b/test/drawing/tc_d_lbls.rb
index cddfec77..dddde3a1 100644
--- a/test/drawing/tc_d_lbls.rb
+++ b/test/drawing/tc_d_lbls.rb
@@ -50,7 +50,7 @@ class TestDLbls < Test::Unit::TestCase
       @d_lbls.to_xml_string(str) 
       str << '</c:chartSpace>'
       doc = Nokogiri::XML(str)
-      Axlsx.instance_values(@d_lbls).each do |name, value|
+      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
diff --git a/test/drawing/tc_picture_locking.rb b/test/drawing/tc_picture_locking.rb
index 2766026f..c0a828aa 100644
--- a/test/drawing/tc_picture_locking.rb
+++ b/test/drawing/tc_picture_locking.rb
@@ -8,7 +8,7 @@ class TestPictureLocking < Test::Unit::TestCase
   end
 
   def test_initialiation
-    assert_equal(Axlsx.instance_values(@item).size, 1)
+    assert_equal(Axlsx.instance_values_for(@item).size, 1)
     assert_equal(@item.noChangeAspect, true)
   end
 
diff --git a/test/stylesheet/tc_styles.rb b/test/stylesheet/tc_styles.rb
index 1c04abd7..503068c0 100644
--- a/test/stylesheet/tc_styles.rb
+++ b/test/stylesheet/tc_styles.rb
@@ -136,11 +136,11 @@ class TestStyles < Test::Unit::TestCase
     original = @styles.fonts.first
     @styles.add_style :b => 1, :sz => 99
     created = @styles.fonts.last
-    original_attributes = Axlsx.instance_values(original)
+    original_attributes = Axlsx.instance_values_for(original)
     assert_equal(1, created.b)
     assert_equal(99, created.sz)
     copied = original_attributes.reject{ |key, value| %w(b sz).include? key }
-    instance_vals = Axlsx.instance_values(created)
+    instance_vals = Axlsx.instance_values_for(created)
     copied.each do |key, value|
       assert_equal(instance_vals[key], value)
     end
diff --git a/test/tc_package.rb b/test/tc_package.rb
index aef90315..b07f0d2f 100644
--- a/test/tc_package.rb
+++ b/test/tc_package.rb
@@ -97,12 +97,12 @@ class TestPackage < Test::Unit::TestCase
   end
 
   def test_core_accessor
-    assert_equal(@package.core, Axlsx.instance_values(@package)["core"])
+    assert_equal(@package.core, Axlsx.instance_values_for(@package)["core"])
     assert_raise(NoMethodError) {@package.core = nil }
   end
 
   def test_app_accessor
-    assert_equal(@package.app, Axlsx.instance_values(@package)["app"])
+    assert_equal(@package.app, Axlsx.instance_values_for(@package)["app"])
     assert_raise(NoMethodError) {@package.app = nil }
   end
 
@@ -114,8 +114,8 @@ class TestPackage < Test::Unit::TestCase
   end
 
   def test_default_objects_are_created
-    assert(Axlsx.instance_values(@package)["app"].is_a?(Axlsx::App), 'App object not created')
-    assert(Axlsx.instance_values(@package)["core"].is_a?(Axlsx::Core), 'Core object not created')
+    assert(Axlsx.instance_values_for(@package)["app"].is_a?(Axlsx::App), 'App object not created')
+    assert(Axlsx.instance_values_for(@package)["core"].is_a?(Axlsx::Core), 'Core object not created')
     assert(@package.workbook.is_a?(Axlsx::Workbook), 'Workbook object not created')
     assert(Axlsx::Package.new.workbook.worksheets.size == 0, 'Workbook should not have sheets by default')
   end
diff --git a/test/workbook/worksheet/tc_worksheet_hyperlink.rb b/test/workbook/worksheet/tc_worksheet_hyperlink.rb
index 50ccc390..88a40bc6 100644
--- a/test/workbook/worksheet/tc_worksheet_hyperlink.rb
+++ b/test/workbook/worksheet/tc_worksheet_hyperlink.rb
@@ -23,7 +23,7 @@ class TestWorksheetHyperlink < Test::Unit::TestCase
 
   def test_target
     
-    assert_equal(@options[:target], Axlsx.instance_values(@a)['target'])
+    assert_equal(@options[:target], Axlsx.instance_values_for(@a)['target'])
   end
 
   def test_display