test/test_mms2r_verizon.rb in mms2r-1.0.5 vs test/test_mms2r_verizon.rb in mms2r-1.0.6

@@ -1,15 +1,16 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
-
+require File.dirname(__FILE__) + "/test_helper"
 require 'test/unit'
 require 'rubygems'
 require 'mms2r'
 require 'mms2r/media'
 require 'tmail/mail'
 require 'logger'
 
 class MMS2RVerizonTest < Test::Unit::TestCase
+  include MMS2R::TestHelper
 
   def setup
     @log = Logger.new(STDOUT)
     @log.level = Logger::DEBUG
     @log.datetime_format = "%H:%M:%S"
@@ -26,14 +27,12 @@
     assert_nil(mms.media['text/plain'])
     assert_nil(mms.media['text/html'])
     assert_not_nil(mms.media['video/3gpp2'][0])
     assert_match(/012345_67890.3g2$/, mms.media['video/3gpp2'][0])
 
-    file = mms.media['video/3gpp2'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 16553, "file #{file} not 16553 byts")
+    assert_file_size(mms.media['video/3gpp2'][0], 16553)
+
     mms.purge
   end
 
   def test_simple_image
     mail = TMail::Mail.parse(load_mail('verizon-image-01.mail').join)
@@ -44,14 +43,12 @@
     assert_nil(mms.media['text/plain'])
     assert_nil(mms.media['text/html'])
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/IMAGE_00004.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 41983 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
+
     mms.purge
   end
 
   def test_simple_text
     mail = TMail::Mail.parse(load_mail('verizon-text-01.mail').join)
@@ -90,24 +87,16 @@
     assert_not_nil(mms.media['text/plain'])
     assert_nil(mms.media['text/html'])
     assert_not_nil(mms.media['image/jpeg'][0])
     assert_match(/04-09-07_1114.jpg$/, mms.media['image/jpeg'][0])
 
-    file = mms.media['image/jpeg'][0]
-    assert_not_nil(file)
-    assert(File::exist?(file), "file #{file} does not exist")
-    assert(File::size(file) == 337, "file #{file} not 337 byts")
+    assert_file_size(mms.media['image/jpeg'][0], 337)
     
     file = mms.media['text/plain'][0]
     assert_not_nil(file)
     assert(File::exist?(file), "file #{file} does not exist")
     text = IO.readlines("#{file}").join
     assert_equal "? Weird", text
     
     mms.purge
-  end
-
-  private
-  def load_mail(file)
-    IO.readlines("#{File.dirname(__FILE__)}/files/#{file}")
   end
 end