Merge branch 'master' into notes-search

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

diff --git a/test/lib/bounding_box_test.rb b/test/lib/bounding_box_test.rb
index 53095307d244f8c040f620b1831034e1d816aae2..a29711b0b445dd531b485c61c8b13b985a33a344 100644 (file)
--- a/test/lib/bounding_box_test.rb
+++ b/test/lib/bounding_box_test.rb
@@ -168,8 +168,8 @@ class BoundingBoxTest < ActiveSupport::TestCase
     @bad_negative_boundary_bbox.each do |bbox_string|
       bbox = BoundingBox.from_bbox_params(:bbox => bbox_string)
       array = bbox.to_a
     @bad_negative_boundary_bbox.each do |bbox_string|
       bbox = BoundingBox.from_bbox_params(:bbox => bbox_string)
       array = bbox.to_a

-      assert_equal -180, [array[0], array[2]].min
-      assert_equal -90, [array[1], array[3]].min
+      assert_equal(-180, [array[0], array[2]].min)
+      assert_equal(-90, [array[1], array[3]].min)

     end
   end
 
     end
   end
 


@@ -222,7 +222,7 @@ class BoundingBoxTest < ActiveSupport::TestCase
   end
 
   def test_complete
   end
 
   def test_complete

-    assert !@bbox_from_nils.complete?, "should contain a nil"
+    assert_not @bbox_from_nils.complete?, "should contain a nil"

     assert @bbox_from_string.complete?, "should not contain a nil"
   end
 
     assert @bbox_from_string.complete?, "should not contain a nil"
   end
 


@@ -306,7 +306,7 @@ class BoundingBoxTest < ActiveSupport::TestCase
 
   def check_expand(bbox, array_string, margin = 0, result = nil)
     array = array_string.split(",").collect(&:to_f)
 
   def check_expand(bbox, array_string, margin = 0, result = nil)
     array = array_string.split(",").collect(&:to_f)

-    result = array unless result
+    result ||= array

     bbox.expand!(BoundingBox.new(array[0], array[1], array[2], array[3]), margin)
     check_bbox(bbox, result)
   end
     bbox.expand!(BoundingBox.new(array[0], array[1], array[2], array[3]), margin)
     check_bbox(bbox, result)
   end