X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dce4f18a3e0d952e482a911d41971893fb2d858d..061d77726666beb8bccc27e0d410c4dc0ee4ef09:/test/unit/node_test.rb?ds=sidebyside

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 87b61a745..2c6515cb7 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
-  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
+  fixtures :changesets, :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 :current_node_tags => NodeTag
     
   def test_node_too_far_north
 	  invalid_node_test(:node_too_far_north)
@@ -48,28 +48,38 @@ class NodeTest < Test::Unit::TestCase
   # the fixture
   def valid_node_test(nod)
     node = current_nodes(nod)
-    assert_equal node.lat, current_nodes(nod).latitude.to_f/SCALE
-    assert_equal node.lon, current_nodes(nod).longitude.to_f/SCALE
-    assert_equal node.timestamp, current_nodes(nod).timestamp
+    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.changeset_id, node.changeset_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 helpermethod will check to make sure that a node is outwith the world, 
+  # 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)
-    assert_equal node.lat, current_nodes(nod).latitude.to_f/SCALE
-    assert_equal node.lon, current_nodes(nod).longitude.to_f/SCALE
-    assert_equal node.timestamp, current_nodes(nod).timestamp
-    assert_equal false, node.valid?
+    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.changeset_id, node.changeset_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,
-                             :user_id => users(:normal_user),
+                             :changeset_id => changesets(:normal_user_first_change),
                              :visible => 1, 
                              :version => 1)
     assert node_template.save_with_history!
@@ -78,7 +88,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil node
     assert_equal node_template.latitude, node.latitude
     assert_equal node_template.longitude, node.longitude
-    assert_equal node_template.user_id, node.user_id
+    assert_equal node_template.changeset_id, node.changeset_id
     assert_equal node_template.visible, node.visible
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
@@ -87,7 +97,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil old_node
     assert_equal node_template.latitude, old_node.latitude
     assert_equal node_template.longitude, old_node.longitude
-    assert_equal node_template.user_id, old_node.user_id
+    assert_equal node_template.changeset_id, old_node.changeset_id
     assert_equal node_template.visible, old_node.visible
     assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
@@ -110,7 +120,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil node
     assert_equal node_template.latitude, node.latitude
     assert_equal node_template.longitude, node.longitude
-    assert_equal node_template.user_id, node.user_id
+    assert_equal node_template.changeset_id, node.changeset_id
     assert_equal node_template.visible, node.visible
     #assert_equal node_template.tags, node.tags
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
@@ -121,7 +131,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil old_node
     assert_equal node_template.latitude, old_node.latitude
     assert_equal node_template.longitude, old_node.longitude
-    assert_equal node_template.user_id, old_node.user_id
+    assert_equal node_template.changeset_id, old_node.changeset_id
     assert_equal node_template.visible, old_node.visible
     #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
@@ -142,7 +152,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil node
     assert_equal node_template.latitude, node.latitude
     assert_equal node_template.longitude, node.longitude
-    assert_equal node_template.user_id, node.user_id
+    assert_equal node_template.changeset_id, node.changeset_id
     assert_equal node_template.visible, node.visible
     #assert_equal node_template.tags, node.tags
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
@@ -153,7 +163,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil old_node
     assert_equal node_template.latitude, old_node.latitude
     assert_equal node_template.longitude, old_node.longitude
-    assert_equal node_template.user_id, old_node.user_id
+    assert_equal node_template.changeset_id, old_node.changeset_id
     assert_equal node_template.visible, old_node.visible
     #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i