X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff03138a978406b431da71aba64941d87b509098..1e0bdda2f5ea1c8d401c7c92ac32acf2f9625ac2:/test/unit/node_test.rb?ds=sidebyside diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb index dd907f0f4..753e6a95c 100644 --- a/test/unit/node_test.rb +++ b/test/unit/node_test.rb @@ -4,11 +4,11 @@ class NodeTest < ActiveSupport::TestCase api_fixtures def test_node_count - assert_equal 16, Node.count + assert_equal 17, Node.count end 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 @@ -77,11 +77,13 @@ class NodeTest < ActiveSupport::TestCase # Check that you can create a node and store it def test_create - node_template = Node.new(:latitude => 12.3456, - :longitude => 65.4321, - :changeset_id => changesets(:normal_user_first_change).id, - :visible => 1, - :version => 1) + node_template = Node.new({ + :latitude => 12.3456, + :longitude => 65.4321, + :changeset_id => changesets(:normal_user_first_change).id, + :visible => 1, + :version => 1 + }, :without_protection => true) assert node_template.create_with_history(users(:normal_user)) node = Node.find(node_template.id) @@ -92,8 +94,8 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.visible, node.visible assert_equal node_template.timestamp.to_i, node.timestamp.to_i - assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1 - old_node = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ]) + assert_equal OldNode.where(:node_id => node_template.id).count, 1 + old_node = OldNode.where(:node_id => node_template.id).first assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude assert_equal node_template.longitude, old_node.longitude @@ -107,14 +109,14 @@ class NodeTest < ActiveSupport::TestCase 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 - old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ]) - assert_not_nil old_node_template + assert_equal OldNode.where(:node_id => node_template.id).count, 1 + node = Node.find(node_template.id) + assert_not_nil node node_template.latitude = 12.3456 node_template.longitude = 65.4321 #node_template.tags = "updated=yes" - assert node_template.update_from(old_node_template, users(:normal_user)) + assert node.update_from(node_template, users(:normal_user)) node = Node.find(node_template.id) assert_not_nil node @@ -123,49 +125,43 @@ class NodeTest < ActiveSupport::TestCase 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 - assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2 - assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1 - old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]) + assert_equal OldNode.where(:node_id => node_template.id).count, 2 + old_node = OldNode.where(:node_id => node_template.id, :version => 2).first 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.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 end def test_delete 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 - old_node_template = OldNode.find(:first, :conditions => [ "id = ?", node_template.id ]) - assert_not_nil old_node_template + assert_equal OldNode.where(:node_id => node_template.id).count, 1 + node = Node.find(node_template.id) + assert_not_nil node - assert node_template.delete_with_history!(old_node_template, users(:normal_user)) + assert node.delete_with_history!(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.changeset_id, node.changeset_id - assert_equal node_template.visible, node.visible + assert_equal false, 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, 2 - assert_equal OldNode.find(:all, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]).length, 1 - old_node = OldNode.find(:first, :conditions => [ "id = ? and timestamp = ?", node_template.id, node_template.timestamp ]) + assert_equal OldNode.where(:node_id => node_template.id).count, 2 + old_node = OldNode.where(:node_id => node_template.id, :version => 2).first 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.changeset_id, old_node.changeset_id - assert_equal node_template.visible, old_node.visible + assert_equal false, old_node.visible #assert_equal node_template.tags, old_node.tags - assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i end def test_from_xml_no_id @@ -270,6 +266,18 @@ class NodeTest < ActiveSupport::TestCase assert_match /Must specify a string with one or more characters/, message_update.message end + def test_from_xml_no_node + no_node = "" + message_create = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(no_node, true) + } + assert_match /XML doesn't contain an osm\/node element/, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(no_node, false) + } + assert_match /XML doesn't contain an osm\/node element/, message_update.message + end + def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) {