X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c9a171c74581e0eb80794e2c9ed92e1b8faffa42..0e5e08a96e62a7bc058ac1cf87f5808f06988bb4:/test/unit/node_test.rb

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index b5ef30298..d1ec98e0d 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,12 +1,12 @@
 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
-    
+  api_fixtures
+  
+  def test_node_count
+    assert_equal 16, Node.count
+  end
+
   def test_node_too_far_north
 	  invalid_node_test(:node_too_far_north)
   end
@@ -51,7 +51,7 @@ class NodeTest < Test::Unit::TestCase
     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.changeset_id, node.changeset_id
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
@@ -67,7 +67,7 @@ class NodeTest < Test::Unit::TestCase
     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.changeset_id, node.changeset_id
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
@@ -79,16 +79,16 @@ class NodeTest < Test::Unit::TestCase
   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).id,
                              :visible => 1, 
                              :version => 1)
-    assert node_template.save_with_history!
+    assert node_template.create_with_history(users(:normal_user))
 
     node = Node.find(node_template.id)
     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
 
@@ -97,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
@@ -114,13 +114,13 @@ class NodeTest < Test::Unit::TestCase
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
     #node_template.tags = "updated=yes"
-    assert node_template.save_with_history!
+    assert node_template.update_from(old_node_template, users(:normal_user))
 
     node = Node.find(node_template.id)
     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
@@ -131,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
@@ -145,14 +145,13 @@ class NodeTest < Test::Unit::TestCase
     old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ])
     assert_not_nil old_node_template
 
-    node_template.visible = 0
-    assert node_template.save_with_history!
+    assert node_template.delete_with_history!(old_node_template, users(:normal_user))
 
     node = Node.find(node_template.id)
     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
@@ -163,7 +162,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