1 files changed, 24 insertions, 24 deletions

diff --git a/test/workbook/worksheet/tc_sheet_view.rb b/test/workbook/worksheet/tc_sheet_view.rb
index 0f0986cf..1098f42a 100644
--- a/test/workbook/worksheet/tc_sheet_view.rb
+++ b/test/workbook/worksheet/tc_sheet_view.rb
@@ -1,5 +1,4 @@
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../"
-require 'tc_helper.rb'
+require 'tc_helper'
 
 class TestSheetView < Test::Unit::TestCase
   def setup
@@ -29,7 +28,7 @@ class TestSheetView < Test::Unit::TestCase
     end
 
     @nil_options.each do |key, value|
-      assert_equal(nil, sv.send(key.to_sym), "initialized default #{key} should be nil")
+      assert_nil(sv.send(key.to_sym), "initialized default #{key} should be nil")
       assert_equal(value, @sv.send(key.to_sym), "initialized options #{key} should be #{value}")
     end
 
@@ -47,14 +46,14 @@ class TestSheetView < Test::Unit::TestCase
   def test_boolean_attribute_validation
     @boolean_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be boolean") { @sv.send("#{key}=".to_sym, 'A') }
-      assert_nothing_raised { @sv.send("#{key}=".to_sym, true) }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
     end
   end
 
   def test_string_attribute_validation
     @string_options.each do |key, value|
       assert_raise(ArgumentError, "#{key} must be string") { @sv.send("#{key}=".to_sym, :symbol) }
-      assert_nothing_raised { @sv.send("#{key}=".to_sym, "foo") }
+      assert_nothing_raised { @sv.send("#{key}=".to_sym, value) }
     end
   end
 
@@ -75,115 +74,115 @@ class TestSheetView < Test::Unit::TestCase
   def test_color_id
     assert_raise(ArgumentError) { @sv.color_id = "10" }
     assert_nothing_raised { @sv.color_id = 2 }
-    assert_equal(@sv.color_id, 2)
+    assert_equal(2, @sv.color_id)
   end
 
   def test_default_grid_color
     assert_raise(ArgumentError) { @sv.default_grid_color = "foo" }
     assert_nothing_raised { @sv.default_grid_color = false }
-    assert_equal(@sv.default_grid_color, false)
+    refute(@sv.default_grid_color)
   end
 
   def test_right_to_left
     assert_raise(ArgumentError) { @sv.right_to_left = "foo´" }
     assert_nothing_raised { @sv.right_to_left = true }
-    assert_equal(@sv.right_to_left, true)
+    assert(@sv.right_to_left)
   end
 
   def test_show_formulas
     assert_raise(ArgumentError) { @sv.show_formulas = 'foo' }
     assert_nothing_raised { @sv.show_formulas = false }
-    assert_equal(@sv.show_formulas, false)
+    refute(@sv.show_formulas)
   end
 
   def test_show_grid_lines
     assert_raise(ArgumentError) { @sv.show_grid_lines = "foo" }
     assert_nothing_raised { @sv.show_grid_lines = false }
-    assert_equal(@sv.show_grid_lines, false)
+    refute(@sv.show_grid_lines)
   end
 
   def test_show_outline_symbols
     assert_raise(ArgumentError) { @sv.show_outline_symbols = 'foo' }
     assert_nothing_raised { @sv.show_outline_symbols = false }
-    assert_equal(@sv.show_outline_symbols, false)
+    refute(@sv.show_outline_symbols)
   end
 
   def test_show_row_col_headers
     assert_raise(ArgumentError) { @sv.show_row_col_headers = "foo" }
     assert_nothing_raised { @sv.show_row_col_headers = false }
-    assert_equal(@sv.show_row_col_headers, false)
+    refute(@sv.show_row_col_headers)
   end
 
   def test_show_ruler
     assert_raise(ArgumentError) { @sv.show_ruler = 'foo' }
     assert_nothing_raised { @sv.show_ruler = false }
-    assert_equal(@sv.show_ruler, false)
+    refute(@sv.show_ruler)
   end
 
   def test_show_white_space
     assert_raise(ArgumentError) { @sv.show_white_space = 'foo' }
     assert_nothing_raised { @sv.show_white_space = false }
-    assert_equal(@sv.show_white_space, false)
+    refute(@sv.show_white_space)
   end
 
   def test_show_zeros
     assert_raise(ArgumentError) { @sv.show_zeros = "foo" }
     assert_nothing_raised { @sv.show_zeros = false }
-    assert_equal(@sv.show_zeros, false)
+    refute(@sv.show_zeros)
   end
 
   def test_tab_selected
     assert_raise(ArgumentError) { @sv.tab_selected = "foo" }
     assert_nothing_raised { @sv.tab_selected = false }
-    assert_equal(@sv.tab_selected, false)
+    refute(@sv.tab_selected)
   end
 
   def test_top_left_cell
     assert_raise(ArgumentError) { @sv.top_left_cell = :cell_adress }
     assert_nothing_raised { @sv.top_left_cell = "A2" }
-    assert_equal(@sv.top_left_cell, "A2")
+    assert_equal("A2", @sv.top_left_cell)
   end
 
   def test_view
     assert_raise(ArgumentError) { @sv.view = 'view' }
     assert_nothing_raised { @sv.view = :page_break_preview }
-    assert_equal(@sv.view, :page_break_preview)
+    assert_equal(:page_break_preview, @sv.view)
   end
 
   def test_window_protection
     assert_raise(ArgumentError) { @sv.window_protection = "foo" }
     assert_nothing_raised { @sv.window_protection = false }
-    assert_equal(@sv.window_protection, false)
+    refute(@sv.window_protection)
   end
 
   def test_workbook_view_id
     assert_raise(ArgumentError) { @sv.workbook_view_id = "1" }
     assert_nothing_raised { @sv.workbook_view_id = 1 }
-    assert_equal(@sv.workbook_view_id, 1)
+    assert_equal(1, @sv.workbook_view_id)
   end
 
   def test_zoom_scale
     assert_raise(ArgumentError) { @sv.zoom_scale = "50" }
     assert_nothing_raised { @sv.zoom_scale = 50 }
-    assert_equal(@sv.zoom_scale, 50)
+    assert_equal(50, @sv.zoom_scale)
   end
 
   def test_zoom_scale_normal
     assert_raise(ArgumentError) { @sv.zoom_scale_normal = "50" }
     assert_nothing_raised { @sv.zoom_scale_normal = 50 }
-    assert_equal(@sv.zoom_scale_normal, 50)
+    assert_equal(50, @sv.zoom_scale_normal)
   end
 
   def test_zoom_scale_page_layout_view
     assert_raise(ArgumentError) { @sv.zoom_scale_page_layout_view = "50" }
     assert_nothing_raised { @sv.zoom_scale_page_layout_view = 50 }
-    assert_equal(@sv.zoom_scale_page_layout_view, 50)
+    assert_equal(50, @sv.zoom_scale_page_layout_view)
   end
 
   def test_zoom_scale_sheet_layout_view
     assert_raise(ArgumentError) { @sv.zoom_scale_sheet_layout_view = "50" }
     assert_nothing_raised { @sv.zoom_scale_sheet_layout_view = 50 }
-    assert_equal(@sv.zoom_scale_sheet_layout_view, 50)
+    assert_equal(50, @sv.zoom_scale_sheet_layout_view)
   end
 
   def test_to_xml
@@ -206,6 +205,7 @@ class TestSheetView < Test::Unit::TestCase
 
   def test_add_selection
     @sv.add_selection(:top_left, :active_cell => "A1")
+
     assert_equal('A1', @sv.selections[:top_left].active_cell)
   end
 end