1 files changed, 25 insertions, 15 deletions

diff --git a/test/workbook/worksheet/tc_page_setup.rb b/test/workbook/worksheet/tc_page_setup.rb
index 6dca8b0a..85b0013a 100644
--- a/test/workbook/worksheet/tc_page_setup.rb
+++ b/test/workbook/worksheet/tc_page_setup.rb
@@ -8,12 +8,12 @@ class TestPageSetup < Test::Unit::TestCase
   end
 
   def test_initialize
-    assert_equal(nil, @ps.fit_to_height)
-    assert_equal(nil, @ps.fit_to_width)
-    assert_equal(nil, @ps.orientation)
-    assert_equal(nil, @ps.paper_height)
-    assert_equal(nil, @ps.paper_width)
-    assert_equal(nil, @ps.scale)
+    assert_nil(@ps.fit_to_height)
+    assert_nil(@ps.fit_to_width)
+    assert_nil(@ps.orientation)
+    assert_nil(@ps.paper_height)
+    assert_nil(@ps.paper_width)
+    assert_nil(@ps.scale)
   end
 
   def test_initialize_with_options
@@ -25,6 +25,7 @@ class TestPageSetup < Test::Unit::TestCase
                    :scale => 50 }
 
     optioned = @p.workbook.add_worksheet(:name => 'optioned', :page_setup => page_setup).page_setup
+
     assert_equal(1, optioned.fit_to_height)
     assert_equal(2, optioned.fit_to_width)
     assert_equal(:landscape, optioned.orientation)
@@ -35,6 +36,7 @@ class TestPageSetup < Test::Unit::TestCase
 
   def test_set_all_values
     @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
+
     assert_equal(1, @ps.fit_to_height)
     assert_equal(2, @ps.fit_to_width)
     assert_equal(:landscape, @ps.orientation)
@@ -50,40 +52,45 @@ class TestPageSetup < Test::Unit::TestCase
 
   def test_set_some_values
     @ps.set(:fit_to_width => 2, :orientation => :portrait)
+
     assert_equal(2, @ps.fit_to_width)
     assert_equal(:portrait, @ps.orientation)
-    assert_equal(nil, @ps.fit_to_height)
-    assert_equal(nil, @ps.paper_height)
-    assert_equal(nil, @ps.paper_width)
-    assert_equal(nil, @ps.scale)
+    assert_nil(@ps.fit_to_height)
+    assert_nil(@ps.paper_height)
+    assert_nil(@ps.paper_width)
+    assert_nil(@ps.scale)
   end
 
   def test_default_fit_to_page?
     assert(@ps.fit_to_width.nil? && @ps.fit_to_height.nil?)
-    assert(@ps.fit_to_page? == false)
+    refute_predicate(@ps, :fit_to_page?)
   end
 
   def test_with_height_fit_to_page?
     assert(@ps.fit_to_width.nil? && @ps.fit_to_height.nil?)
     @ps.set(:fit_to_height => 1)
-    assert(@ps.fit_to_page?)
+
+    assert_predicate(@ps, :fit_to_page?)
   end
 
   def test_with_width_fit_to_page?
     assert(@ps.fit_to_width.nil? && @ps.fit_to_height.nil?)
     @ps.set(:fit_to_width => 1)
-    assert(@ps.fit_to_page?)
+
+    assert_predicate(@ps, :fit_to_page?)
   end
 
   def test_to_xml_all_values
     @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
     doc = Nokogiri::XML.parse(@ps.to_xml_string)
+
     assert_equal(1, doc.xpath(".//pageSetup[@fitToHeight='1'][@fitToWidth='2'][@orientation='landscape'][@paperHeight='297mm'][@paperWidth='210mm'][@scale='50']").size)
   end
 
   def test_to_xml_some_values
     @ps.set(:orientation => :portrait)
     doc = Nokogiri::XML.parse(@ps.to_xml_string)
+
     assert_equal(1, doc.xpath(".//pageSetup[@orientation='portrait']").size)
     assert_equal(0, doc.xpath(".//pageSetup[@fitToHeight]").size)
     assert_equal(0, doc.xpath(".//pageSetup[@fitToWidth]").size)
@@ -130,11 +137,14 @@ class TestPageSetup < Test::Unit::TestCase
 
   def test_fit_to
     fits = @ps.fit_to(:width => 1)
+
     assert_equal([1, 999], fits)
     fits = @ps.fit_to :height => 1
-    assert_equal(fits, [999, 1])
+
+    assert_equal([999, 1], fits)
     fits = @ps.fit_to :height => 7, :width => 2
-    assert_equal(fits, [2, 7])
+
+    assert_equal([2, 7], fits)
     assert_raise(ArgumentError) { puts @ps.fit_to(:width => true) }
   end
 end