fix more of the tests, particularly changeset controller. Needed more fixtures to...

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

diff --git a/test/unit/old_node_test.rb b/test/unit/old_node_test.rb
index 85c2037c27cdd843379d9ccdb3ae00aad41da551..eb68baafb26521497c2723f7debdc5bf358fd643 100644 (file)
--- a/test/unit/old_node_test.rb
+++ b/test/unit/old_node_test.rb
@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class OldNodeTest < Test::Unit::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class OldNodeTest < 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 :current_node_tags => :NodeTag
-    
+  api_fixtures
+  
+  def test_old_node_count
+    assert_equal 19, OldNode.count
+  end
+

   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


@@ -51,7 +51,7 @@ class OldNodeTest < 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
     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.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp


@@ -67,7 +67,7 @@ class OldNodeTest < 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
     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.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp
     assert_equal dbnode.version, node.version
     assert_equal dbnode.visible, node.visible
     assert_equal dbnode.timestamp, node.timestamp