X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c24c2e481cc6d27e76274ed4e32668a4690a7788..4c564e5a322e04cd0a811c859ddb251cb80b45d4:/test/controllers/api/relations_controller_test.rb diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb index b04ad3c19..eb8f8e022 100644 --- a/test/controllers/api/relations_controller_test.rb +++ b/test/controllers/api/relations_controller_test.rb @@ -151,25 +151,6 @@ module Api [relation_with_relation, second_relation]) end - def check_relations_for_element(path, type, id, expected_relations) - # check the "relations for relation" mode - get path - assert_response :success - - # count one osm element - assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1 - - # we should have only the expected number of relations - assert_select "osm>relation", expected_relations.size - - # and each of them should contain the element we originally searched for - expected_relations.each do |relation| - # The relation should appear once, but the element could appear multiple times - assert_select "osm>relation[id='#{relation.id}']", 1 - assert_select "osm>relation[id='#{relation.id}']>member[type='#{type}'][ref='#{id}']" - end - end - def test_full # check the "full" mode get relation_full_path(:id => 999999) @@ -264,7 +245,7 @@ module Api # create an relation with a node as member, this time test that we don't # need a role attribute to be included xml = "" \ - "" + "" + "" put relation_create_path, :params => xml, :headers => auth_header # hope for forbidden due to user assert_response :forbidden, @@ -296,10 +277,8 @@ module Api assert_not_nil checkrelation, "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 0, - "saved relation contains members but should not" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal(0, checkrelation.members.length, "saved relation contains members but should not") + assert_equal(1, checkrelation.tags.length, "saved relation does not contain exactly one tag") assert_equal changeset.id, checkrelation.changeset.id, "saved relation does not belong in the changeset it was assigned to" assert_equal user.id, checkrelation.changeset.user_id, @@ -326,10 +305,8 @@ module Api assert_not_nil checkrelation, "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 1, - "saved relation does not contain exactly one member" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal(1, checkrelation.members.length, "saved relation does not contain exactly one member") + assert_equal(1, checkrelation.tags.length, "saved relation does not contain exactly one tag") assert_equal changeset.id, checkrelation.changeset.id, "saved relation does not belong in the changeset it was assigned to" assert_equal user.id, checkrelation.changeset.user_id, @@ -345,7 +322,7 @@ module Api # create an relation with a node as member, this time test that we don't # need a role attribute to be included xml = "" \ - "" + "" + "" put relation_create_path, :params => xml, :headers => auth_header # hope for success assert_response :success, @@ -356,10 +333,8 @@ module Api assert_not_nil checkrelation, "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 1, - "saved relation does not contain exactly one member" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal(1, checkrelation.members.length, "saved relation does not contain exactly one member") + assert_equal(1, checkrelation.tags.length, "saved relation does not contain exactly one tag") assert_equal changeset.id, checkrelation.changeset.id, "saved relation does not belong in the changeset it was assigned to" assert_equal user.id, checkrelation.changeset.user_id, @@ -387,10 +362,8 @@ module Api assert_not_nil checkrelation, "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 2, - "saved relation does not have exactly two members" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal(2, checkrelation.members.length, "saved relation does not have exactly two members") + assert_equal(1, checkrelation.tags.length, "saved relation does not contain exactly one tag") assert_equal changeset.id, checkrelation.changeset.id, "saved relation does not belong in the changeset it was assigned to" assert_equal user.id, checkrelation.changeset.user_id, @@ -934,9 +907,26 @@ module Api end end - # ============================================================ - # utility functions - # ============================================================ + private + + def check_relations_for_element(path, type, id, expected_relations) + # check the "relations for relation" mode + get path + assert_response :success + + # count one osm element + assert_select "osm[version='#{Settings.api_version}'][generator='OpenStreetMap server']", 1 + + # we should have only the expected number of relations + assert_select "osm>relation", expected_relations.size + + # and each of them should contain the element we originally searched for + expected_relations.each do |relation| + # The relation should appear once, but the element could appear multiple times + assert_select "osm>relation[id='#{relation.id}']", 1 + assert_select "osm>relation[id='#{relation.id}']>member[type='#{type}'][ref='#{id}']" + end + end ## # checks that the XML document and the string arguments have @@ -1019,7 +1009,7 @@ module Api ## # updates the relation (XML) +rel+ and # yields the new version of that relation into the block. - # the parsed XML doc is retured. + # the parsed XML doc is returned. def with_update(rel, headers) rel_id = rel.find("//osm/relation").first["id"].to_i put api_relation_path(:id => rel_id), :params => rel.to_s, :headers => headers @@ -1039,14 +1029,14 @@ module Api ## # updates the relation (XML) +rel+ via the diff-upload API and # yields the new version of that relation into the block. - # the parsed XML doc is retured. + # the parsed XML doc is returned. def with_update_diff(rel, headers) rel_id = rel.find("//osm/relation").first["id"].to_i cs_id = rel.find("//osm/relation").first["changeset"].to_i version = nil with_controller(Api::ChangesetsController.new) do - doc = OSM::API.new.get_xml_doc + doc = OSM::API.new.xml_doc change = XML::Node.new "osmChange" doc.root = change modify = XML::Node.new "modify"