X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/64a5e21f53be132cd5fe3265230c6cdc00ccabaa..8429c850518294c27fcfc21ef6acc9e05274a438:/test/unit/node_test.rb

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 460c13a02..b5ef30298 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,47 +1,81 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
-  fixtures :current_nodes, :users, :current_node_tags,:nodes,  :node_tags
+  fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags
   set_fixture_class :current_nodes => :Node
   set_fixture_class :nodes => :OldNode
   set_fixture_class :node_tags => :OldNodeTag
   set_fixture_class :currenr_node_tags => :NodeTag
     
   def test_node_too_far_north
-	  node = current_nodes(:node_too_far_north)
-    assert_equal node.lat, current_nodes(:node_too_far_north).latitude/SCALE
-    assert_equal node.lon, current_nodes(:node_too_far_north).longitude/SCALE
-    assert_equal false, node.valid?
+	  invalid_node_test(:node_too_far_north)
+  end
+  
+  def test_node_north_limit
+    valid_node_test(:node_north_limit)
   end
   
   def test_node_too_far_south
-    node = current_nodes(:node_too_far_south)
-    assert_equal node.lat, current_nodes(:node_too_far_south).latitude/SCALE
-    assert_equal node.lon, current_nodes(:node_too_far_south).longitude/SCALE
-    assert_equal false, node.valid?
+    invalid_node_test(:node_too_far_south)
+  end
+  
+  def test_node_south_limit
+    valid_node_test(:node_south_limit)
   end
   
   def test_node_too_far_west
-    node = current_nodes(:node_too_far_west)
-    assert_equal node.lat, current_nodes(:node_too_far_west).latitude/SCALE
-    assert_equal node.lon, current_nodes(:node_too_far_west).longitude/SCALE
-    assert_equal false, node.valid?
+    invalid_node_test(:node_too_far_west)
+  end
+  
+  def test_node_west_limit
+    valid_node_test(:node_west_limit)
   end
   
   def test_node_too_far_east
-    node = current_nodes(:node_too_far_east)
-    assert_equal node.lat, current_nodes(:node_too_far_east).latitude/SCALE
-    assert_equal node.lon, current_nodes(:node_too_far_east).longitude/SCALE
-    assert_equal false, node.valid?
+    invalid_node_test(:node_too_far_east)
+  end
+  
+  def test_node_east_limit
+    valid_node_test(:node_east_limit)
   end
   
   def test_totally_wrong
-    node = current_nodes(:node_totally_wrong)
-    #assert_equal node.lat, current_nodes(:node_totally_wrong).latitude/SCALE
-    #assert_equal node.lon, current_nodes(:node_totally_wrong).longitude/SCALE
-    assert_equal false, node.valid?
+    invalid_node_test(:node_totally_wrong)
+  end
+  
+  # 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 
+  # the fixture
+  def valid_node_test(nod)
+    node = current_nodes(nod)
+    dbnode = Node.find(node.id)
+    assert_equal dbnode.lat, node.latitude.to_f/SCALE
+    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.user_id, node.user_id
+    assert_equal dbnode.timestamp, node.timestamp
+    assert_equal dbnode.version, node.version
+    assert_equal dbnode.visible, node.visible
+    #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
+    assert_valid node
+  end
+  
+  # This helper method 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 = current_nodes(nod)
+    dbnode = Node.find(node.id)
+    assert_equal dbnode.lat, node.latitude.to_f/SCALE
+    assert_equal dbnode.lon, node.longitude.to_f/SCALE
+    assert_equal dbnode.user_id, node.user_id
+    assert_equal dbnode.timestamp, node.timestamp
+    assert_equal dbnode.version, node.version
+    assert_equal dbnode.visible, node.visible
+    #assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
+    assert_equal false, dbnode.valid?
   end
   
+  # Check that you can create a node and store it
   def test_create
     node_template = Node.new(:latitude => 12.3456,
                              :longitude => 65.4321,