Upgrade to rails 3.1.0

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

diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb
index ab0f5d5ad35cd6010c2a5590c35bf5493d472de8..1ed8ebf485cc365d8c5864028f18400b8d199789 100644 (file)
--- a/test/functional/amf_controller_test.rb
+++ b/test/functional/amf_controller_test.rb
@@ -28,7 +28,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal way[0], -4
     assert_equal way[1], "way"
     assert_equal way[2], id
-    assert way[3].empty? and way[4].empty?
+    assert way[3].nil? and way[4].nil?
   end
 
   def test_getway_nonexistent
@@ -41,7 +41,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal way[0], -4
     assert_equal way[1], "way"
     assert_equal way[2], 0
-    assert way[3].empty? and way[4].empty?
+    assert way[3].nil? and way[4].nil?
   end
 
   def test_whichways
@@ -185,7 +185,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id
-    assert rel[3].empty? and rel[4].empty?
+    assert rel[3].nil? and rel[4].nil?
   end
 
   def test_getrelation_nonexistent
@@ -198,7 +198,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal rel[0], -4
     assert_equal rel[1], "relation"
     assert_equal rel[2], id
-    assert rel[3].empty? and rel[4].empty?
+    assert rel[3].nil? and rel[4].nil?
   end
 
   def test_getway_old
@@ -240,8 +240,8 @@ class AmfControllerTest < ActionController::TestCase
       amf_parse_response
       returned_way = amf_result("/1")
       assert_equal -1, returned_way[0]
-      assert returned_way[3].empty?
-      assert returned_way[4].empty?
+      assert returned_way[3].nil?
+      assert returned_way[4].nil?
       assert returned_way[5].nil?
     end
   end
@@ -261,8 +261,8 @@ class AmfControllerTest < ActionController::TestCase
       amf_parse_response
       returned_way = amf_result("/1")
       assert_equal -1, returned_way[0]
-      assert returned_way[3].empty?
-      assert returned_way[4].empty?
+      assert returned_way[3].nil?
+      assert returned_way[4].nil?
       assert returned_way[5].nil?
     end
   end
@@ -454,6 +454,65 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal result[4], first_historic_node.version, "The version returned, is different to the one returned by the amf"
   end
   
+  # try creating a POI with rubbish in the tags
+  def test_putpoi_create_with_control_chars
+    # This node has no tags
+    nd = Node.new
+    # create a node with random lat/lon
+    lat = rand(100)-50 + rand
+    lon = rand(100)-50 + rand
+    # normal user has a changeset open
+    changeset = changesets(:public_user_first_change)
+    
+    mostly_invalid = (0..31).to_a.map {|i| i.chr}.join
+    tags = { "something" => "foo#{mostly_invalid}bar" }
+      
+    amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+      
+    # check the array returned by the amf
+    assert_equal 5, result.size
+    assert_equal 0, result[0], "Expected to get the status ok in the amf"
+    assert_equal 0, result[2], "The old id should be 0"
+    assert result[3] > 0, "The new id should be greater than 0"
+    assert_equal 1, result[4], "The new version should be 1"
+    
+    # Finally check that the node that was saved has saved the data correctly 
+    # in both the current and history tables
+    # First check the current table
+    current_node = Node.find(result[3])
+    assert_equal 1, current_node.tags.size, "There seems to be a tag that has been added to the node"
+    assert_equal({ "something" => "foo\t\n\rbar" }, current_node.tags, "tags were not fixed correctly")
+    assert_equal result[4], current_node.version, "The version returned, is different to the one returned by the amf"
+  end
+
+  # try creating a POI with rubbish in the tags
+  def test_putpoi_create_with_invalid_utf8
+    # This node has no tags
+    nd = Node.new
+    # create a node with random lat/lon
+    lat = rand(100)-50 + rand
+    lon = rand(100)-50 + rand
+    # normal user has a changeset open
+    changeset = changesets(:public_user_first_change)
+    
+    invalid = "\xc0\xc0"
+    tags = { "something" => "foo#{invalid}bar" }
+      
+    amf_content "putpoi", "/1", ["test@example.com:test", changeset.id, nil, nil, lon, lat, tags, nil]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 2, result.size
+    assert_equal -1, result[0], "Expected to get the status FAIL in the amf"
+    assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1] 
+  end
+      
   def test_putpoi_delete_valid
     
   end
@@ -470,6 +529,24 @@ class AmfControllerTest < ActionController::TestCase
     
   end
 
+  def test_startchangeset_invalid_xmlchar_comment
+    invalid = "\035\022"
+    comment = "foo#{invalid}bar"
+      
+    amf_content "startchangeset", "/1", ["test@example.com:test", Hash.new, nil, comment, 1]
+    post :amf_write
+    assert_response :success
+    amf_parse_response
+    result = amf_result("/1")
+
+    assert_equal 3, result.size, result.inspect
+    assert_equal 0, result[0]
+    new_cs_id = result[2]
+
+    cs = Changeset.find(new_cs_id)
+    assert_equal "foobar", cs.tags["comment"]
+  end
+
   # ************************************************************
   # AMF Helper functions
 
@@ -500,13 +577,8 @@ class AmfControllerTest < ActionController::TestCase
   # The result is a hash of message_ref => data.
   # The attribute @amf_result is initialised to this hash.
   def amf_parse_response
-    if @response.body.class.to_s == 'Proc'
-      res = StringIO.new()
-      @response.body.call @response, res
-      req = StringIO.new(res.string)
-    else
-      req = StringIO.new(@response.body)
-    end
+    req = StringIO.new(@response.body)
+
     req.read(2)   # version
 
     # parse through any headers