X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ea59d95f4aad7cafe3a0d0b4d5ef533b0662e365..20e03c73bb7755dec0c63a6beb40e747496d6e7b:/test/models/node_test.rb diff --git a/test/models/node_test.rb b/test/models/node_test.rb index b5435412b..2e6108234 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -71,13 +71,11 @@ class NodeTest < ActiveSupport::TestCase # Check that you can create a node and store it def test_create changeset = create(:changeset) - node_template = Node.new( - :lat => 12.3456, - :lon => 65.4321, - :changeset_id => changeset.id, - :visible => 1, - :version => 1 - ) + node_template = build(:node, :lat => 12.3456, + :lon => 65.4321, + :changeset_id => changeset.id, + :visible => true, + :version => 1) assert node_template.create_with_history(changeset.user) node = Node.find(node_template.id) @@ -168,11 +166,11 @@ class NodeTest < ActiveSupport::TestCase noid = "" # First try a create which doesn't need the id assert_nothing_raised do - Node.from_xml(noid, true) + Node.from_xml(noid, :create => true) end # Now try an update with no id, and make sure that it gives the appropriate exception message = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(noid, false) + Node.from_xml(noid, :create => false) end assert_match(/ID is required when updating./, message.message) end @@ -180,11 +178,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_lat nolat = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolat, true) + Node.from_xml(nolat, :create => true) end assert_match(/lat missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolat, false) + Node.from_xml(nolat, :create => false) end assert_match(/lat missing/, message_update.message) end @@ -192,11 +190,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_lon nolon = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolon, true) + Node.from_xml(nolon, :create => true) end assert_match(/lon missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nolon, false) + Node.from_xml(nolon, :create => false) end assert_match(/lon missing/, message_update.message) end @@ -204,11 +202,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_changeset_id nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, true) + Node.from_xml(nocs, :create => true) end assert_match(/Changeset id is missing/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, false) + Node.from_xml(nocs, :create => false) end assert_match(/Changeset id is missing/, message_update.message) end @@ -216,10 +214,10 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_version no_version = "" assert_nothing_raised do - Node.from_xml(no_version, true) + Node.from_xml(no_version, :create => true) end message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_version, false) + Node.from_xml(no_version, :create => false) end assert_match(/Version is required when updating/, message_update.message) end @@ -227,11 +225,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_double_lat nocs = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, true) + Node.from_xml(nocs, :create => true) end assert_match(/Fatal error: Attribute lat redefined at/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nocs, false) + Node.from_xml(nocs, :create => false) end assert_match(/Fatal error: Attribute lat redefined at/, message_update.message) end @@ -241,10 +239,10 @@ class NodeTest < ActiveSupport::TestCase id_list.each do |id| zero_id = "" assert_nothing_raised do - Node.from_xml(zero_id, true) + Node.from_xml(zero_id, :create => true) end message_update = assert_raise(OSM::APIBadUserInput) do - Node.from_xml(zero_id, false) + Node.from_xml(zero_id, :create => false) end assert_match(/ID of node cannot be zero when updating/, message_update.message) end @@ -253,11 +251,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_text no_text = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_text, true) + Node.from_xml(no_text, :create => true) end assert_match(/Must specify a string with one or more characters/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_text, false) + Node.from_xml(no_text, :create => false) end assert_match(/Must specify a string with one or more characters/, message_update.message) end @@ -265,11 +263,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_node no_node = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_node, true) + Node.from_xml(no_node, :create => true) end assert_match %r{XML doesn't contain an osm/node element}, message_create.message message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_node, false) + Node.from_xml(no_node, :create => false) end assert_match %r{XML doesn't contain an osm/node element}, message_update.message end @@ -277,11 +275,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_k_v nokv = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nokv, true) + Node.from_xml(nokv, :create => true) end assert_match(/tag is missing key/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(nokv, false) + Node.from_xml(nokv, :create => false) end assert_match(/tag is missing key/, message_update.message) end @@ -289,11 +287,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_no_v no_v = "" message_create = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_v, true) + Node.from_xml(no_v, :create => true) end assert_match(/tag is missing value/, message_create.message) message_update = assert_raise(OSM::APIBadXMLError) do - Node.from_xml(no_v, false) + Node.from_xml(no_v, :create => false) end assert_match(/tag is missing value/, message_update.message) end @@ -301,11 +299,11 @@ class NodeTest < ActiveSupport::TestCase def test_from_xml_duplicate_k dupk = "" message_create = assert_raise(OSM::APIDuplicateTagsError) do - Node.from_xml(dupk, true) + Node.from_xml(dupk, :create => true) end assert_equal "Element node/ has duplicate tags with key dup", message_create.message message_update = assert_raise(OSM::APIDuplicateTagsError) do - Node.from_xml(dupk, false) + Node.from_xml(dupk, :create => false) end assert_equal "Element node/23 has duplicate tags with key dup", message_update.message end