From: Shaun McDonald Date: Mon, 8 Jun 2009 18:53:19 +0000 (+0000) Subject: More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure... X-Git-Tag: live~7099 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/e3693d487a8da3743d53e90926e8064ed8bf34c7 More unit tests for the parsing of the Node.from_xml. Some code clean up to ensure that a node that cannot be parsed will always throw an exception, to be handled by the arround handler. --- diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb index 19add265d..8eb698920 100644 --- a/app/controllers/node_controller.rb +++ b/app/controllers/node_controller.rb @@ -16,12 +16,9 @@ class NodeController < ApplicationController node = Node.from_xml(request.raw_post, true) - if node - node.create_with_history @user - render :text => node.id.to_s, :content_type => "text/plain" - else - raise OSM::APIBadXMLError.new(:node, request.raw_post) - end + # Assume that Node.from_xml has thrown an exception if there is an error parsing the xml + node.create_with_history @user + render :text => node.id.to_s, :content_type => "text/plain" end # Dump the details on a node given in params[:id] @@ -39,13 +36,12 @@ class NodeController < ApplicationController def update node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - - if new_node and new_node.id == node.id - node.update_from(new_node, @user) - render :text => node.version.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request + + unless new_node and new_node.id == node.id + raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end + node.update_from(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" end # Delete a node. Doesn't actually delete it, but retains its history @@ -55,28 +51,26 @@ class NodeController < ApplicationController node = Node.find(params[:id]) new_node = Node.from_xml(request.raw_post) - if new_node and new_node.id == node.id - node.delete_with_history!(new_node, @user) - render :text => node.version.to_s, :content_type => "text/plain" - else - render :nothing => true, :status => :bad_request + unless new_node and new_node.id == node.id + raise OSM::BadUserInput.new("The id in the url (#{node.id}) is not the same as provided in the xml (#{new_node.id})") end + node.delete_with_history!(new_node, @user) + render :text => node.version.to_s, :content_type => "text/plain" end # Dump the details on many nodes whose ids are given in the "nodes" parameter. def nodes ids = params['nodes'].split(',').collect { |n| n.to_i } - if ids.length > 0 - doc = OSM::API.new.get_xml_doc - - Node.find(ids).each do |node| - doc.root << node.to_xml_node - end + if ids.length == 0 + raise OSM::BadUserInput.new("No nodes were given to search for") + end + doc = OSM::API.new.get_xml_doc - render :text => doc.to_s, :content_type => "text/xml" - else - render :nothing => true, :status => :bad_request + Node.find(ids).each do |node| + doc.root << node.to_xml_node end + + render :text => doc.to_s, :content_type => "text/xml" end end diff --git a/app/models/node.rb b/app/models/node.rb index 01b0f220e..6ef1b9e6f 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -92,17 +92,14 @@ class Node < ActiveRecord::Base node.version = create ? 0 : pt['version'].to_i unless create + raise OSM::APIBadXMLError.new("node", pt, "ID is required when updating.") if pt['id'].nil? if pt['id'] != '0' node.id = pt['id'].to_i end end - # visible if it says it is, or as the default if the attribute - # is missing. - # Don't need to set the visibility, when it is set explicitly in the create/update/delete - #node.visible = pt['visible'].nil? or pt['visible'] == 'true' - # We don't care about the time, as it is explicitly set on create/update/delete + # We don't care about the visibility as it is implicit based on the action tags = [] diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb index acad7218c..d65fe5568 100644 --- a/test/unit/node_test.rb +++ b/test/unit/node_test.rb @@ -167,4 +167,69 @@ class NodeTest < ActiveSupport::TestCase #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 + lat = 56.7 + lon = -2.3 + changeset = 2 + version = 1 + noid = "" + # First try a create which doesn't need the id + assert_nothing_raised(OSM::APIBadXMLError) { + Node.from_xml(noid, true) + } + # Now try an update with no id, and make sure that it gives the appropriate exception + message = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(noid, false) + } + assert_match /ID is required when updating./, message.message + end + + def test_from_xml_no_lat + nolat = "" + message_create = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nolat, true) + } + assert_match /lat missing/, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nolat, false) + } + assert_match /lat missing/, message_update.message + end + + def test_from_xml_no_lon + nolon = "" + message_create = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nolon, true) + } + assert_match /lon missing/, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nolon, false) + } + assert_match /lon missing/, message_update.message + end + + def test_from_xml_no_changeset_id + nocs = "" + message_create = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nocs, true) + } + assert_match /changeset id missing/, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nocs, false) + } + assert_match /changeset id missing/, message_update.message + end + + def test_from_xml_double_lat + nocs = "" + message_create = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nocs, true) + } + assert_match /Fatal error: Attribute lat redefined at/, message_create.message + message_update = assert_raise(OSM::APIBadXMLError) { + Node.from_xml(nocs, false) + } + assert_match /Fatal error: Attribute lat redefined at/, message_update.message + end end