@@ -6,8 +6,8 @@ module AutotestNotification def notify(title, msg, img, total = 1, failures = 0) img = get_image_path(img).strip system "sncmd /m '#{title}' '#{msg}' '#{img}' /t #{Config.expiration_in_seconds}" - play(SUCCESS_SOUND) unless SUCCESS_SOUND.empty? or failures > 0 - play(FAILURE_SOUND) unless FAILURE_SOUND.empty? or failures == 0 + play(SUCCESS_SOUND) if AutotestNotification.const_defined?("SUCCESS_SOUND") && !SUCCESS_SOUND.empty? && failures == 0 + play(FAILURE_SOUND) if AutotestNotification.const_defined?("FAILURE_SOUND") && !FAILURE_SOUND.empty? && failures > 0 say(total, failures) if DOOM_EDITION end lib/autotest_notification/cygwin.rb @@ -6,8 +6,8 @@ module AutotestNotification def notify(title, msg, img, total = 1, failures = 0, priority = 0) system "growlnotify -n autotest --image #{img} #{'-s ' if ((failures > 0) and STICKY)}-p #{priority} -m '#{msg}' -t #{title}" - play(SUCCESS_SOUND) if const_defined?("SUCCESS_SOUND") and failures == 0 - play(FAILURE_SOUND) if const_defined?("FAILURE_SOUND") and failures > 0 + play(SUCCESS_SOUND) if AutotestNotification.const_defined?("SUCCESS_SOUND") && !SUCCESS_SOUND.empty? && failures == 0 + play(FAILURE_SOUND) if AutotestNotification.const_defined?("FAILURE_SOUND") && !FAILURE_SOUND.empty? && failures > 0 say(total, failures) if SPEAKING end lib/autotest_notification/mac.rb @@ -38,7 +38,7 @@ class TestMac < Test::Unit::TestCase end def test_success_sound_is_played_when_specified_and_test_success - AutotestNotification.const_set :SUCCESS_SOUND, sound_path + AutotestNotification.const_set :SUCCESS_SOUND, sound_path AutotestNotification::Mac.expects(:play).with(sound_path) AutotestNotification::Mac.notify("title", "msg", "image", 1, 0) end test/autotest_notification/test_mac.rb @@ -16,7 +16,7 @@ class TestAutotestNotification < Test::Unit::TestCase end def test_notify_when_os_is_cygwin - AutotestNotification::Cygwin.expects(:notify).with(@title, @msg, @image) + AutotestNotification::Cygwin.expects(:notify).with(@title, @msg, @image, @total, @failures) verify_to("cygwin") end test/test_autotest_notification.rb 5b02a0665061ae8e12f3569250b092ecdaa54ec6 Carlos Brando eduardobrando@gmail.com http://github.com/carlosbrando/autotest-notification/commit/7092d829710c523b49155f7a55901e7c5c874a58 7092d829710c523b49155f7a55901e7c5c874a58 2009-04-02T06:41:07-07:00 2009-04-02T06:41:07-07:00 Fix bugs with SUCCESS_SOUND and FAILURE_SOUND. 74fa5a298d83a711e31099aaa767cbe400cd444e Carlos Brando eduardobrando@gmail.com