Merge remote-tracking branch 'openstreetmap/pull/1331'

[rails.git] / test / models / old_node_test.rb

diff --git a/test/models/old_node_test.rb b/test/models/old_node_test.rb
index 2ccf6d18c5dc6939c5de62a4dd203756aea3ea10..03aead2e9927888f3300260fd0b5544acb684eda 100644 (file)
--- a/test/models/old_node_test.rb
+++ b/test/models/old_node_test.rb
@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"

 
 class OldNodeTest < ActiveSupport::TestCase
   api_fixtures
 
 class OldNodeTest < ActiveSupport::TestCase
   api_fixtures

-  
+

   def test_node_count
     assert_equal 23, OldNode.count
   end
   def test_node_count
     assert_equal 23, OldNode.count
   end


@@ -10,68 +10,68 @@ class OldNodeTest < ActiveSupport::TestCase
   def test_node_too_far_north
     invalid_node_test(:node_too_far_north)
   end
   def test_node_too_far_north
     invalid_node_test(:node_too_far_north)
   end

-  
+

   def test_node_north_limit
     valid_node_test(:node_north_limit)
   end
   def test_node_north_limit
     valid_node_test(:node_north_limit)
   end

-  
+

   def test_node_too_far_south
     invalid_node_test(:node_too_far_south)
   end
   def test_node_too_far_south
     invalid_node_test(:node_too_far_south)
   end

-  
+

   def test_node_south_limit
     valid_node_test(:node_south_limit)
   end
   def test_node_south_limit
     valid_node_test(:node_south_limit)
   end

-  
+

   def test_node_too_far_west
     invalid_node_test(:node_too_far_west)
   end
   def test_node_too_far_west
     invalid_node_test(:node_too_far_west)
   end

-  
+

   def test_node_west_limit
     valid_node_test(:node_west_limit)
   end
   def test_node_west_limit
     valid_node_test(:node_west_limit)
   end

-  
+

   def test_node_too_far_east
     invalid_node_test(:node_too_far_east)
   end
   def test_node_too_far_east
     invalid_node_test(:node_too_far_east)
   end

-  
+

   def test_node_east_limit
     valid_node_test(:node_east_limit)
   end
   def test_node_east_limit
     valid_node_test(:node_east_limit)
   end

-  
+

   def test_totally_wrong
     invalid_node_test(:node_totally_wrong)
   end
   def test_totally_wrong
     invalid_node_test(:node_totally_wrong)
   end

-  
+

   # This helper method will check to make sure that a node is within the world, and
   # This helper method will check to make sure that a node is within the world, and

-  # has the the same lat, lon and timestamp than what was put into the db by 
+  # has the the same lat, lon and timestamp than what was put into the db by

   # the fixture
   def valid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)
   # the fixture
   def valid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)

-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE

     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp

-    #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
+    # assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)

     assert node.valid?
   end
     assert node.valid?
   end

-  
-  # This helpermethod will check to make sure that a node is outwith the world, 
+
+  # This helpermethod will check to make sure that a node is outwith the world,

   # and has the same lat, lon and timesamp than what was put into the db by the
   # fixture
   def invalid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)
   # and has the same lat, lon and timesamp than what was put into the db by the
   # fixture
   def invalid_node_test(nod)
     node = nodes(nod)
     dbnode = Node.find(node.node_id)

-    assert_equal dbnode.lat, node.latitude.to_f/SCALE
-    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.lat, node.latitude.to_f / OldNode::SCALE
+    assert_equal dbnode.lon, node.longitude.to_f / OldNode::SCALE

     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.changeset_id, node.changeset_id
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp

-    #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
+    # assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)

     assert_equal false, node.valid?
   end
 
     assert_equal false, node.valid?
   end
 


@@ -87,7 +87,7 @@ class OldNodeTest < ActiveSupport::TestCase
     node = nodes(:node_with_versions_v3)
     tags = OldNode.find(node.id).old_tags.order(:k)
     assert_equal 3, tags.count
     node = nodes(:node_with_versions_v3)
     tags = OldNode.find(node.id).old_tags.order(:k)
     assert_equal 3, tags.count

-    assert_equal "testing", tags[0].k 
+    assert_equal "testing", tags[0].k

     assert_equal "added in node version 3", tags[0].v
     assert_equal "testing three", tags[1].k
     assert_equal "added in node version 3", tags[1].v
     assert_equal "added in node version 3", tags[0].v
     assert_equal "testing three", tags[1].k
     assert_equal "added in node version 3", tags[1].v


@@ -97,7 +97,7 @@ class OldNodeTest < ActiveSupport::TestCase
     node = nodes(:node_with_versions_v4)
     tags = OldNode.find(node.id).old_tags.order(:k)
     assert_equal 2, tags.count
     node = nodes(:node_with_versions_v4)
     tags = OldNode.find(node.id).old_tags.order(:k)
     assert_equal 2, tags.count

-    assert_equal "testing", tags[0].k 
+    assert_equal "testing", tags[0].k

     assert_equal "added in node version 3", tags[0].v
     assert_equal "testing two", tags[1].k
     assert_equal "modified in node version 4", tags[1].v
     assert_equal "added in node version 3", tags[0].v
     assert_equal "testing two", tags[1].k
     assert_equal "modified in node version 4", tags[1].v