Fix test to make sure it picks up the right token

[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 1f2640d4615ce728feabd965b57e5cbd94ab631a..4737fdf51f42d6286f7a4b8006ffa6e5deb9be9a 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -114,6 +114,33 @@ class RelationControllerTest < ActionController::TestCase
     end
   end
 
+  ##
+  # test fetching multiple relations
+  def test_relations
+    # check error when no parameter provided
+    get :relations
+    assert_response :bad_request
+
+    # check error when no parameter value provided
+    get :relations, :relations => ""
+    assert_response :bad_request
+
+    # test a working call
+    get :relations, :relations => "1,2,4,7"
+    assert_response :success
+    assert_select "osm" do
+      assert_select "relation", :count => 4
+      assert_select "relation[id=1][visible=true]", :count => 1
+      assert_select "relation[id=2][visible=false]", :count => 1
+      assert_select "relation[id=4][visible=true]", :count => 1
+      assert_select "relation[id=7][visible=true]", :count => 1
+    end
+
+    # check error when a non-existent relation is included
+    get :relations, :relations => "1,2,4,7,400"
+    assert_response :not_found
+  end
+
   # -------------------------------------
   # Test simple relation creation.
   # -------------------------------------
@@ -751,6 +778,31 @@ OSM
     end
   end
 
+  ##
+  # remove all the members from a relation. the result is pretty useless, but
+  # still technically valid.
+  def test_remove_all_members 
+    check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id|
+      relation_xml = current_relations(:visible_relation).to_xml
+      relation_xml.
+        find("//osm/relation/member").
+        each {|m| m.remove!}
+      
+      # update changeset ID to point to new changeset
+      update_changeset(relation_xml, changeset_id)
+      
+      # upload the change
+      content relation_xml
+      put :update, :id => current_relations(:visible_relation).id
+      assert_response :success, "can't update relation for remove all members test"
+      checkrelation = Relation.find(current_relations(:visible_relation).id)
+      assert_not_nil(checkrelation, 
+                     "uploaded relation not found in database after upload")
+      assert_equal(0, checkrelation.members.length,
+                   "relation contains members but they should have all been deleted")
+    end
+  end
+  
   # ============================================================
   # utility functions
   # ============================================================
@@ -891,7 +943,7 @@ OSM
   ##
   # returns a k->v hash of tags from an xml doc
   def get_tags_as_hash(a) 
-    a.find("//osm/relation/tag").inject({}) do |h,v|
+    a.find("//osm/relation/tag").sort_by { |v| v['k'] }.inject({}) do |h,v|
       h[v['k']] = v['v']
       h
     end