X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c72940684ea5c702bf2963fae096a2d48d845267..898c1475baaac883442fdf32d16379f1b737052c:/test/models/way_test.rb
diff --git a/test/models/way_test.rb b/test/models/way_test.rb
index de0eb6146..654076eec 100644
--- a/test/models/way_test.rb
+++ b/test/models/way_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
class WayTest < ActiveSupport::TestCase
api_fixtures
@@ -8,69 +8,69 @@ class WayTest < ActiveSupport::TestCase
def test_db_count
assert_equal 7, Way.count
end
-
+
def test_bbox
node = current_nodes(:used_node_1)
- [ :visible_way,
- :invisible_way,
- :used_way ].each do |way_symbol|
+ [:visible_way,
+ :invisible_way,
+ :used_way].each do |way_symbol|
way = current_ways(way_symbol)
- assert_equal node.bbox.min_lon, way.bbox.min_lon, 'min_lon'
- assert_equal node.bbox.min_lat, way.bbox.min_lat, 'min_lat'
- assert_equal node.bbox.max_lon, way.bbox.max_lon, 'max_lon'
- assert_equal node.bbox.max_lat, way.bbox.max_lat, 'max_lat'
+ assert_equal node.bbox.min_lon, way.bbox.min_lon, "min_lon"
+ assert_equal node.bbox.min_lat, way.bbox.min_lat, "min_lat"
+ assert_equal node.bbox.max_lon, way.bbox.max_lon, "max_lon"
+ assert_equal node.bbox.max_lat, way.bbox.max_lat, "max_lat"
end
end
-
- # Check that the preconditions fail when you are over the defined limit of
+
+ # Check that the preconditions fail when you are over the defined limit of
# the maximum number of nodes in each way.
def test_max_nodes_per_way_limit
# Take one of the current ways and add nodes to it until we are near the limit
way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
- 1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) {
+ 1.upto(MAX_NUMBER_OF_WAY_NODES / 2) do
way.add_nd_num(current_nodes(:used_node_1).id)
way.add_nd_num(current_nodes(:used_node_2).id)
- }
+ end
way.save
- #print way.nds.size
+ # print way.nds.size
assert way.valid?
way.add_nd_num(current_nodes(:visible_node).id)
assert way.valid?
end
-
+
def test_from_xml_no_id
noid = ""
- assert_nothing_raised(OSM::APIBadXMLError) {
+ assert_nothing_raised(OSM::APIBadXMLError) do
Way.from_xml(noid, true)
- }
- message = assert_raise(OSM::APIBadXMLError) {
+ end
+ message = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(noid, false)
- }
+ end
assert_match /ID is required when updating/, message.message
end
-
+
def test_from_xml_no_changeset_id
nocs = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nocs, true)
- }
+ end
assert_match /Changeset id is missing/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nocs, false)
- }
+ end
assert_match /Changeset id is missing/, message_update.message
end
-
+
def test_from_xml_no_version
no_version = ""
- assert_nothing_raised(OSM::APIBadXMLError) {
+ assert_nothing_raised(OSM::APIBadXMLError) do
Way.from_xml(no_version, true)
- }
- message_update = assert_raise(OSM::APIBadXMLError) {
+ end
+ message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_version, false)
- }
+ end
assert_match /Version is required when updating/, message_update.message
end
@@ -78,61 +78,61 @@ class WayTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = ""
- assert_nothing_raised(OSM::APIBadUserInput) {
+ assert_nothing_raised(OSM::APIBadUserInput) do
Way.from_xml(zero_id, true)
- }
- message_update = assert_raise(OSM::APIBadUserInput) {
+ end
+ message_update = assert_raise(OSM::APIBadUserInput) do
Way.from_xml(zero_id, false)
- }
+ end
assert_match /ID of way cannot be zero when updating/, message_update.message
end
end
-
+
def test_from_xml_no_text
no_text = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_text, true)
- }
+ end
assert_match /Must specify a string with one or more characters/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_text, false)
- }
+ end
assert_match /Must specify a string with one or more characters/, message_update.message
end
-
+
def test_from_xml_no_k_v
nokv = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nokv, true)
- }
+ end
assert_match /tag is missing key/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nokv, false)
- }
+ end
assert_match /tag is missing key/, message_update.message
end
-
+
def test_from_xml_no_v
no_v = ""
- message_create = assert_raise(OSM::APIBadXMLError) {
+ message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_v, true)
- }
+ end
assert_match /tag is missing value/, message_create.message
- message_update = assert_raise(OSM::APIBadXMLError) {
+ message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_v, false)
- }
+ end
assert_match /tag is missing value/, message_update.message
end
-
+
def test_from_xml_duplicate_k
dupk = ""
- message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ message_create = assert_raise(OSM::APIDuplicateTagsError) do
Way.from_xml(dupk, true)
- }
+ end
assert_equal "Element way/ has duplicate tags with key dup", message_create.message
- message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ message_update = assert_raise(OSM::APIDuplicateTagsError) do
Way.from_xml(dupk, false)
- }
+ end
assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
end
@@ -142,7 +142,7 @@ class WayTest < ActiveSupport::TestCase
assert_equal 3, nodes.count
assert_equal 4, nodes[0].node_id
assert_equal 15, nodes[1].node_id
- assert_equal 6, nodes[2].node_id
+ assert_equal 11, nodes[2].node_id
end
def test_nodes
@@ -151,7 +151,7 @@ class WayTest < ActiveSupport::TestCase
assert_equal 3, nodes.count
assert_equal 4, nodes[0].id
assert_equal 15, nodes[1].id
- assert_equal 6, nodes[2].id
+ assert_equal 11, nodes[2].id
end
def test_nds
@@ -160,31 +160,34 @@ class WayTest < ActiveSupport::TestCase
assert_equal 3, nodes.count
assert_equal 4, nodes[0]
assert_equal 15, nodes[1]
- assert_equal 6, nodes[2]
+ assert_equal 11, nodes[2]
end
def test_way_tags
way = current_ways(:way_with_versions)
+ taglist = create_list(:way_tag, 2, :way => way)
tags = Way.find(way.id).way_tags.order(:k)
assert_equal 2, tags.count
- assert_equal "testing", tags[0].k
- assert_equal "added in way version 3", tags[0].v
- assert_equal "testing two", tags[1].k
- assert_equal "modified in way version 4", tags[1].v
+ taglist.sort_by!(&:k).each_index do |i|
+ assert_equal taglist[i].k, tags[i].k
+ assert_equal taglist[i].v, tags[i].v
+ end
end
def test_tags
way = current_ways(:way_with_versions)
+ taglist = create_list(:way_tag, 2, :way => way)
tags = Way.find(way.id).tags
assert_equal 2, tags.size
- assert_equal "added in way version 3", tags["testing"]
- assert_equal "modified in way version 4", tags["testing two"]
+ taglist.each do |tag|
+ assert_equal tag.v, tags[tag.k]
+ end
end
def test_containing_relation_members
way = current_ways(:used_way)
crm = Way.find(way.id).containing_relation_members.order(:relation_id)
-# assert_equal 1, crm.size
+ # assert_equal 1, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Way", crm.first.member_type
assert_equal way.id, crm.first.member_id