1 files changed, 32 insertions, 17 deletions

diff --git a/test/drawing/tc_vml_shape.rb b/test/drawing/tc_vml_shape.rb
index f93ea48d..0f2fb3b5 100644
--- a/test/drawing/tc_vml_shape.rb
+++ b/test/drawing/tc_vml_shape.rb
@@ -16,91 +16,106 @@ class TestVmlShape < Test::Unit::TestCase
 
   def test_row
     shape = @comments.first.vml_shape
-    assert_equal(shape.row, 0)
+
+    assert_equal(0, shape.row)
     shape = @comments.last.vml_shape
-    assert_equal(shape.row, 2)
+
+    assert_equal(2, shape.row)
   end
 
   def test_column
     shape = @comments.first.vml_shape
-    assert_equal(shape.column, 0)
+
+    assert_equal(0, shape.column)
     shape = @comments.last.vml_shape
-    assert_equal(shape.column, 2)
+
+    assert_equal(2, shape.column)
   end
 
   def test_left_column
     shape = @comments.first.vml_shape
     shape.left_column = 3
-    assert(shape.left_column == 3)
+
+    assert_equal(3, shape.left_column)
     assert_raise(ArgumentError) { shape.left_column = [] }
   end
 
   def test_left_offset
     shape = @comments.first.vml_shape
     shape.left_offset = 3
-    assert(shape.left_offset == 3)
+
+    assert_equal(3, shape.left_offset)
     assert_raise(ArgumentError) { shape.left_offset = [] }
   end
 
   def test_right_column
     shape = @comments.first.vml_shape
     shape.right_column = 3
-    assert(shape.right_column == 3)
+
+    assert_equal(3, shape.right_column)
     assert_raise(ArgumentError) { shape.right_column = [] }
   end
 
   def test_right_offset
     shape = @comments.first.vml_shape
     shape.right_offset = 3
-    assert(shape.right_offset == 3)
+
+    assert_equal(3, shape.right_offset)
     assert_raise(ArgumentError) { shape.right_offset = [] }
   end
 
   def test_top_offset
     shape = @comments.first.vml_shape
     shape.top_offset = 3
-    assert(shape.top_offset == 3)
+
+    assert_equal(3, shape.top_offset)
     assert_raise(ArgumentError) { shape.top_offset = [] }
   end
 
   def test_bottom_offset
     shape = @comments.first.vml_shape
     shape.bottom_offset = 3
-    assert(shape.bottom_offset == 3)
+
+    assert_equal(3, shape.bottom_offset)
     assert_raise(ArgumentError) { shape.bottom_offset = [] }
   end
 
   def test_bottom_row
     shape = @comments.first.vml_shape
     shape.bottom_row = 3
-    assert(shape.bottom_row == 3)
+
+    assert_equal(3, shape.bottom_row)
     assert_raise(ArgumentError) { shape.bottom_row = [] }
   end
 
   def test_top_row
     shape = @comments.first.vml_shape
     shape.top_row = 3
-    assert(shape.top_row == 3)
+
+    assert_equal(3, shape.top_row)
     assert_raise(ArgumentError) { shape.top_row = [] }
   end
 
   def test_visible
     shape = @comments.first.vml_shape
     shape.visible = false
-    assert(shape.visible == false)
+
+    refute(shape.visible)
     assert_raise(ArgumentError) { shape.visible = 'foo' }
   end
 
   def test_to_xml_string
     str = @comments.vml_drawing.to_xml_string
     doc = Nokogiri::XML(str)
-    assert_equal(doc.xpath("//v:shape").size, 2)
+
+    assert_equal(2, doc.xpath("//v:shape").size)
     assert_equal(1, doc.xpath("//x:Visible").size, 'ClientData/x:Visible element rendering')
     @comments.each do |comment|
       shape = comment.vml_shape
-      assert(doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size == 1)
-      assert(doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size == 1)
-      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)
+
+      assert_equal(1, doc.xpath("//v:shape/x:ClientData/x:Row[text()='#{shape.row}']").size)
+      assert_equal(1, doc.xpath("//v:shape/x:ClientData/x:Column[text()='#{shape.column}']").size)
+      assert_equal(1, 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)
     end
   end
 end