Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

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

diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index b3e83437072b3f28b5135bf8b324fa0368dc2553..bb2b7dfa4fd6ab682b87be1002e669f9fd535326 100644 (file)
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,17 +1,88 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase

-  fixtures :current_nodes, :nodes, :users
+  fixtures :current_nodes, :users, :current_node_tags, :nodes, :node_tags

   set_fixture_class :current_nodes => :Node
   set_fixture_class :nodes => :OldNode
   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)
+  end
+  
+  def test_node_north_limit
+    valid_node_test(:node_north_limit)
+  end
+  
+  def test_node_too_far_south
+    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
+    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
+    invalid_node_test(:node_too_far_east)
+  end
+  
+  def test_node_east_limit
+    valid_node_test(:node_east_limit)
+  end
+  
+  def test_totally_wrong
+    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,
   def test_create
     node_template = Node.new(:latitude => 12.3456,
                              :longitude => 65.4321,

-                             :user_id => users(:normal_user).id,
-                             :visible => 1,
-                             :tags => "")
-    assert node_template.save_with_history
+                             :user_id => users(:normal_user),
+                             :visible => 1, 
+                             :version => 1)
+    assert node_template.save_with_history!

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -19,7 +90,6 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_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
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1


@@ -34,7 +104,7 @@ class NodeTest < Test::Unit::TestCase
   end
 
   def test_update
   end
 
   def test_update

-    node_template = Node.find(1)
+    node_template = Node.find(current_nodes(:visible_node).id)

     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1


@@ -43,8 +113,8 @@ class NodeTest < Test::Unit::TestCase
 
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
 
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321

-    node_template.tags = "updated=yes"
-    assert node_template.save_with_history
+    #node_template.tags = "updated=yes"
+    assert node_template.save_with_history!

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -52,7 +122,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible

-    assert_equal node_template.tags, node.tags
+    #assert_equal node_template.tags, node.tags

     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2


@@ -63,12 +133,12 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible

-    assert_equal node_template.tags, old_node.tags
+    #assert_equal node_template.tags, old_node.tags

     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 
   def test_delete
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 
   def test_delete

-    node_template = Node.find(1)
+    node_template = Node.find(current_nodes(:visible_node))

     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1


@@ -76,7 +146,7 @@ class NodeTest < Test::Unit::TestCase
     assert_not_nil old_node_template
 
     node_template.visible = 0
     assert_not_nil old_node_template
 
     node_template.visible = 0

-    assert node_template.save_with_history
+    assert node_template.save_with_history!

 
     node = Node.find(node_template.id)
     assert_not_nil node
 
     node = Node.find(node_template.id)
     assert_not_nil node


@@ -84,7 +154,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible

-    assert_equal node_template.tags, node.tags
+    #assert_equal node_template.tags, node.tags

     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2


@@ -95,7 +165,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible

-    assert_equal node_template.tags, old_node.tags
+    #assert_equal node_template.tags, old_node.tags

     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 end
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 end