X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f1c6a87aa137c11d0aff5a4b0e563ac2c2a8f82d..cea93e7244cb5fb5ca260a83377d661ab99e8491:/test/models/node_test.rb?ds=inline diff --git a/test/models/node_test.rb b/test/models/node_test.rb index e8a572fd8..214ff595d 100644 --- a/test/models/node_test.rb +++ b/test/models/node_test.rb @@ -4,55 +4,55 @@ class NodeTest < ActiveSupport::TestCase def test_node_too_far_north node = build(:node, :latitude => 90.01 * OldNode::SCALE) node.validate - assert node.errors.full_messages.include?("Node is not in the world") + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_north_limit node = build(:node, :latitude => 90 * OldNode::SCALE) node.validate - assert_equal false, node.errors.full_messages.include?("Node is not in the world") + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_south node = build(:node, :latitude => -90.01 * OldNode::SCALE) node.validate - assert node.errors.full_messages.include?("Node is not in the world") + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_south_limit node = build(:node, :latitude => -90 * OldNode::SCALE) node.validate - assert_equal false, node.errors.full_messages.include?("Node is not in the world") + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_west node = build(:node, :longitude => -180.01 * OldNode::SCALE) node.validate - assert node.errors.full_messages.include?("Node is not in the world") + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_west_limit node = build(:node, :longitude => -180 * OldNode::SCALE) node.validate - assert_equal false, node.errors.full_messages.include?("Node is not in the world") + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_node_too_far_east node = build(:node, :longitude => 180.01 * OldNode::SCALE) node.validate - assert node.errors.full_messages.include?("Node is not in the world") + assert_includes node.errors.full_messages, "Node is not in the world" end def test_node_east_limit node = build(:node, :longitude => 180 * OldNode::SCALE) node.validate - assert_equal false, node.errors.full_messages.include?("Node is not in the world") + assert_not_includes node.errors.full_messages, "Node is not in the world" end def test_totally_wrong node = build(:node, :latitude => 200 * OldNode::SCALE, :longitude => 200 * OldNode::SCALE) node.validate - assert node.errors.full_messages.include?("Node is not in the world") + assert_includes node.errors.full_messages, "Node is not in the world" end def test_lat_lon @@ -88,7 +88,7 @@ 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.where(:node_id => node_template.id).count, 1 + assert_equal(1, OldNode.where(:node_id => node_template.id).count) old_node = OldNode.where(:node_id => node_template.id).first assert_not_nil old_node assert_equal node_template.latitude, old_node.latitude @@ -105,7 +105,7 @@ class NodeTest < ActiveSupport::TestCase node_template = Node.find(node.id) assert_not_nil node_template - assert_equal OldNode.where(:node_id => node_template.id).count, 1 + assert_equal(1, OldNode.where(:node_id => node_template.id).count) assert_not_nil node node_template.lat = 12.3456 @@ -121,7 +121,7 @@ class NodeTest < ActiveSupport::TestCase assert_equal node_template.visible, node.visible # assert_equal node_template.tags, node.tags - assert_equal OldNode.where(:node_id => node_template.id).count, 2 + assert_equal(2, OldNode.where(:node_id => node_template.id).count) 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 @@ -137,7 +137,7 @@ class NodeTest < ActiveSupport::TestCase node_template = Node.find(node.id) assert_not_nil node_template - assert_equal OldNode.where(:node_id => node_template.id).count, 1 + assert_equal(1, OldNode.where(:node_id => node_template.id).count) assert_not_nil node assert node.delete_with_history!(node_template, node.changeset.user) @@ -147,16 +147,16 @@ class NodeTest < ActiveSupport::TestCase 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 false, node.visible + assert_not node.visible # assert_equal node_template.tags, node.tags - assert_equal OldNode.where(:node_id => node_template.id).count, 2 + assert_equal(2, OldNode.where(:node_id => node_template.id).count) 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 false, old_node.visible + assert_not old_node.visible # assert_equal node_template.tags, old_node.tags end @@ -168,11 +168,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 +180,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 +192,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 +204,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 +216,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 +227,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 +241,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 +253,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 +265,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 +277,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 +289,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 +301,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