Merge branch 'pull/5117'

[rails.git] / test / lib / short_link_test.rb

diff --git a/test/lib/short_link_test.rb b/test/lib/short_link_test.rb
index 401d133c38a1dada13cc028e5cd6f632ce620c88..a32e1ac205b14a29e67f2e3d47d9bb203385bb2a 100644 (file)
--- a/test/lib/short_link_test.rb
+++ b/test/lib/short_link_test.rb
@@ -1,13 +1,13 @@
-require 'test_helper'
+require "test_helper"
 
 class ShortLinkTest < ActiveSupport::TestCase
   ##
   # tests that encoding and decoding are working to within
   # the acceptable quantisation range.
   def test_encode_decode
-    cases = Array.new
+    cases = []
     1000.times do
-      cases << [ 180.0 * rand - 90.0, 360.0 * rand - 180.0, (18 * rand).to_i ]
+      cases << [(180.0 * rand) - 90.0, (360.0 * rand) - 180.0, (18 * rand).to_i]
     end
 
     cases.each do |lat, lon, zoom|
@@ -18,9 +18,9 @@ class ShortLinkTest < ActiveSupport::TestCase
       # one pixel (i.e: zoom + 8). the sqrt(5) is because each position
       # has an extra bit of accuracy in the lat coordinate, due to the
       # smaller range.
-      distance = Math.sqrt((lat - lat2) ** 2 + (lon - lon2) ** 2)
+      distance = Math.sqrt(((lat - lat2)**2) + ((lon - lon2)**2))
       max_distance = 360.0 / (1 << (zoom + 8)) * 0.5 * Math.sqrt(5)
-      assert max_distance > distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})."
+      assert_operator max_distance, :>, distance, "Maximum expected error exceeded: #{max_distance} <= #{distance} for (#{lat}, #{lon}, #{zoom})."
     end
   end
 
@@ -35,7 +35,7 @@ class ShortLinkTest < ActiveSupport::TestCase
 
     cases.each do |new_code, old_code|
       assert_equal ShortLink.decode(old_code), ShortLink.decode(new_code),
-        "old (#{old_code}) and new (#{new_code}) should decode to the same location."
+                   "old (#{old_code}) and new (#{new_code}) should decode to the same location."
     end
   end
 end