test/test_23_note.rb in writeexcel-0.6.9 vs test/test_23_note.rb in writeexcel-0.6.10

@@ -19,47 +19,31 @@
   def setup
     @workbook   = WriteExcel.new(StringIO.new)
     @worksheet  = @workbook.add_worksheet
   end
 
-  def teardown
-    @workbook.close
-  end
-
   def test_blank_author_name
-    data = @worksheet.__send__("comment_params", 2, 0, 'Test')
-    row      = data[0]
-    col      = data[1]
-    author   = data[4]
-    encoding = data[5]
-    visible  = data[6]
+    comment = Writeexcel::Worksheet::Comment.new(@worksheet, 2, 0, 'Test')
     obj_id   = 1
 
-    caption = sprintf(" \tstore_note")
+    caption = sprintf(" \tnote_record")
     target  = %w(
         1C 00 0C 00 02 00 00 00 00 00 01 00 00 00 00 00
     ).join(' ')
-    result = unpack_record(
-        @worksheet.__send__("store_note", row, col, obj_id, author, encoding, visible))
+    result = unpack_record(comment.store_note_record(obj_id))
     assert_equal(target, result, caption)
   end
 
   def test_defined_author_name
-    data = @worksheet.__send__("comment_params", 2, 0,'Test', :author => 'Username')
-    row      = data[0]
-    col      = data[1]
-    author   = data[4]
-    encoding = data[5]
-    visible  = data[6]
+    comment = Writeexcel::Worksheet::Comment.new(@worksheet, 2, 0,'Test', :author => 'Username')
     obj_id   = 1
 
     caption = sprintf(" \tstore_note")
     target  = %w(
         1C 00 14 00 02 00 00 00 00 00 01 00 08 00 00 55
         73 65 72 6E 61 6D 65 00
     ).join(' ')
-    result = unpack_record(
-        @worksheet.__send__("store_note", row,col,obj_id,author,encoding,visible))
+    result = unpack_record(comment.store_note_record(obj_id))
     assert_equal(target, result, caption)
   end
 
   ###############################################################################
   #