Refactor image_asserter.

vkolgi · Sep 7, 2013 · ae6660f · ae6660f
1 parent e687e99
commit ae6660f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/image_asserter b/image_asserter
@@ -19,7 +19,7 @@ end
 assertion_result = ImageAssertion.assert_image(File.expand_path(test_output),
                                                File.expand_path(ref_images_path),
                                                image_name,
-                                              threshold)
+                                               threshold)
 exit FAILED_EXIT_STATUS unless assertion_result
 
 exit SUCCESS_EXIT_STATUS

diff --git a/image_assertion.rb b/image_assertion.rb
@@ -58,15 +58,16 @@ def self.process_imagemagick_result(image_file_name, stderr, threshold)
 
     #imagemagick outputs floating point metrics value when succeeds
     compare_succeed = ( stderr.match(/[0-9]*\.?[0-9]+/).length > 0 )
+    threshold ||= MAX_ALLOWED_DIFF_VALUE
 
     if compare_succeed
-      if (threshold.nil? && stderr.to_f < MAX_ALLOWED_DIFF_VALUE) || (!threshold.nil? && stderr.to_f < threshold.to_f)
+      if stderr.to_f < threshold
 
         result_status   = 'passed'
         result_message  = "#{image_file_name} asserted successfully."
         assertionResult = true
       else
-        print_status(create_status(result_status, "expected diff is smaller than #{threshold.nil? ? MAX_ALLOWED_DIFF_VALUE : threshold} but #{stderr.to_f}."))
+        print_status(create_status(result_status, "expected diff is smaller than #{threshold} but #{stderr.to_f}."))
       end
     else