cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added tests for relations for way/relation and a bit of DRYing up.

Browse source
This commit is contained in:
Matt Amos 2008-10-28 14:49:51 +00:00
parent 79284559af
commit c05111fdca
1 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

47
test/functional/relation_controller_test.rb
View file

@ -34,15 +34,28 @@ class RelationControllerTest < ActionController::TestCase
# check that all relations containing a particular node, and no extra # check that all relations containing a particular node, and no extra
# relations, are returned from the relations_for_node call. # relations, are returned from the relations_for_node call.
def test_relations_for_node def test_relations_for_node
node_id = current_nodes(:node_used_by_relationship).id check_relations_for_element(:relations_for_node, "node",
current_nodes(:node_used_by_relationship).id,
[ :visible_relation, :used_relation ])
end
# fetch all the relations which contain that node def test_relations_for_way
get :relations_for_node, :id => node_id check_relations_for_element(:relations_for_way, "way",
current_ways(:used_way).id,
[ :visible_relation ])
end
def test_relations_for_relation
check_relations_for_element(:relations_for_relation, "relation",
current_relations(:used_relation).id,
[ :visible_relation ])
end
def check_relations_for_element(method, type, id, expected_relations)
# check the "relations for relation" mode
get method, :id => id
assert_response :success assert_response :success
# the results we expect
expected_relations = [ :visible_relation, :used_relation ]
# count one osm element # count one osm element
assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1 assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
@ -53,27 +66,7 @@ class RelationControllerTest < ActionController::TestCase
expected_relations.each do |r| expected_relations.each do |r|
relation_id = current_relations(r).id relation_id = current_relations(r).id
assert_select "osm>relation#?", relation_id assert_select "osm>relation#?", relation_id
assert_select "osm>relation#?>member[type=\"node\"][ref=#{node_id}]", relation_id assert_select "osm>relation#?>member[type=\"#{type}\"][ref=#{id}]", relation_id
end
end
def test_relations_for_way
# check the "relations for way" mode
get :relations_for_way, :id => current_ways(:used_way).id
assert_response :success
# FIXME check whether this contains the stuff we want!
if $VERBOSE
print @response.body
end
end
def test_relations_for_relation
# check the "relations for relation" mode
get :relations_for_relation, :id => current_relations(:used_relation).id
assert_response :success
# FIXME check whether this contains the stuff we want!
if $VERBOSE
print @response.body
end end
end end