Merge branch 'leaflet'

[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 bdd685388821ebf7ecdff6a3c6b45a36533da892..84ea65b68efb762c352923f95e2172d242006862 100644 (file)
--- a/test/unit/old_node_test.rb
+++ b/test/unit/old_node_test.rb
@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 require File.dirname(__FILE__) + '/../test_helper'
 

-class OldNodeTest < Test::Unit::TestCase
-  set_fixture_class :current_nodes => Node
-  set_fixture_class :nodes => OldNode
-  set_fixture_class :node_tags => OldNodeTag
-  set_fixture_class :current_node_tags => NodeTag
-  fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags
-    
+class OldNodeTest < ActiveSupport::TestCase
+  api_fixtures
+  
+  def test_old_node_count
+    assert_equal 21, OldNode.count
+  end
+

   def test_node_too_far_north
   def test_node_too_far_north

-         invalid_node_test(:node_too_far_north)
+    invalid_node_test(:node_too_far_north)

   end
   
   def test_node_north_limit
   end
   
   def test_node_north_limit


@@ -48,7 +48,7 @@ class OldNodeTest < Test::Unit::TestCase
   # the fixture
   def valid_node_test(nod)
     node = nodes(nod)
   # the fixture
   def valid_node_test(nod)
     node = nodes(nod)

-    dbnode = Node.find(node.id)
+    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.changeset_id, node.changeset_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


@@ -56,7 +56,7 @@ class OldNodeTest < Test::Unit::TestCase
     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 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_valid node
+    assert node.valid?

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


@@ -64,7 +64,7 @@ class OldNodeTest < Test::Unit::TestCase
   # fixture
   def invalid_node_test(nod)
     node = nodes(nod)
   # fixture
   def invalid_node_test(nod)
     node = nodes(nod)

-    dbnode = Node.find(node.id)
+    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.changeset_id, node.changeset_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


@@ -74,6 +74,4 @@ class OldNodeTest < Test::Unit::TestCase
     #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
     assert_equal false, node.valid?
   end
     #assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
     assert_equal false, node.valid?
   end

-  
-

 end
 end