Adding new browse controller test, which is mostly stubs just now. Also adding the...

[rails.git] / test / functional / relation_controller_test.rb

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index ffd65f6ccc26ad3a6471925051bed72417795c3d..1c6439a966bac80fcfeecb5d63a32e872b83c11a 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -37,18 +37,36 @@ class RelationControllerTest < Test::Unit::TestCase
     # check chat a non-existent relation is not returned
     get :read, :id => 0
     assert_response :not_found
     # check chat a non-existent relation is not returned
     get :read, :id => 0
     assert_response :not_found

+  end

 
 

-    # check the "relations for node" mode
-    get :relations_for_node, :id => current_nodes(:node_used_by_relationship).id
+  ##
+  # check that all relations containing a particular node, and no extra
+  # relations, are returned from the relations_for_node call.
+  def test_relations_for_node
+    node_id = current_nodes(:node_used_by_relationship).id
+    
+    # fetch all the relations which contain that node
+    get :relations_for_node, :id => node_id

     assert_response :success
     assert_response :success

-    # FIXME check whether this contains the stuff we want!
-    # see the test_read in way_controller_test.rb for the assert_select
+
+    # the results we expect
+    expected_relations = [ :visible_relation, :used_relation ]
+
+    # count one osm element

     assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
     assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1

-    assert_select "osm relation"
-    if $VERBOSE
-        print @response.body
+
+    # we should have only the expected number of relations
+    assert_select "osm>relation", expected_relations.size
+
+    # and each of them should contain the node we originally searched for
+    expected_relations.each do |r|
+      relation_id = current_relations(r).id
+      assert_select "osm>relation#?", relation_id
+      assert_select "osm>relation#?>member[type=\"node\"][ref=#{node_id}]", relation_id

     end
     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
     # check the "relations for way" mode
     get :relations_for_way, :id => current_ways(:used_way).id
     assert_response :success


@@ -56,7 +74,9 @@ class RelationControllerTest < Test::Unit::TestCase
     if $VERBOSE
         print @response.body
     end
     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
     # check the "relations for relation" mode
     get :relations_for_relation, :id => current_relations(:used_relation).id
     assert_response :success


@@ -64,7 +84,9 @@ class RelationControllerTest < Test::Unit::TestCase
     if $VERBOSE
         print @response.body
     end
     if $VERBOSE
         print @response.body
     end

+  end

 
 

+  def test_full

     # check the "full" mode
     get :full, :id => current_relations(:visible_relation).id
     assert_response :success
     # check the "full" mode
     get :full, :id => current_relations(:visible_relation).id
     assert_response :success