X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e4d7b3ee6631e1c5aee23ebe52adb32c716f5cbd..e756dbae7f3715561de5688e6503b60fdfe0327d:/test/unit/way_test.rb
diff --git a/test/unit/way_test.rb b/test/unit/way_test.rb
index afbe36252..ca5b75176 100644
--- a/test/unit/way_test.rb
+++ b/test/unit/way_test.rb
@@ -6,7 +6,7 @@ class WayTest < ActiveSupport::TestCase
# Check that we have the correct number of currnet ways in the db
# This will need to updated whenever the current_ways.yml is updated
def test_db_count
- assert_equal 4, Way.count
+ assert_equal 5, Way.count
end
def test_bbox
@@ -15,7 +15,10 @@ class WayTest < ActiveSupport::TestCase
:invisible_way,
:used_way ].each do |way_symbol|
way = current_ways(way_symbol)
- assert_equal node.bbox, way.bbox
+ 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
@@ -26,7 +29,7 @@ class WayTest < ActiveSupport::TestCase
way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
- 1.upto((APP_CONFIG['max_number_of_way_nodes']) / 2) {
+ 1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) {
way.add_nd_num(current_nodes(:used_node_1).id)
way.add_nd_num(current_nodes(:used_node_2).id)
}
@@ -94,6 +97,42 @@ class WayTest < ActiveSupport::TestCase
message_update = assert_raise(OSM::APIBadXMLError) {
Way.from_xml(no_text, false)
}
- assert_match /Must specify a string with one or more characters/, message_create.message
+ 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) {
+ Way.from_xml(nokv, true)
+ }
+ assert_match /tag is missing key/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(nokv, false)
+ }
+ assert_match /tag is missing key/, message_update.message
+ end
+
+ def test_from_xml_no_v
+ no_v = ""
+ message_create = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_v, true)
+ }
+ assert_match /tag is missing value/, message_create.message
+ message_update = assert_raise(OSM::APIBadXMLError) {
+ Way.from_xml(no_v, false)
+ }
+ assert_match /tag is missing value/, message_update.message
+ end
+
+ def test_from_xml_duplicate_k
+ dupk = ""
+ message_create = assert_raise(OSM::APIDuplicateTagsError) {
+ Way.from_xml(dupk, true)
+ }
+ assert_equal "Element way/ has duplicate tags with key dup", message_create.message
+ message_update = assert_raise(OSM::APIDuplicateTagsError) {
+ Way.from_xml(dupk, false)
+ }
+ assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
end
end