More functional tests, this time for way_tags.

diff --git a/test/functional/old_way_controller_test.rb b/test/functional/old_way_controller_test.rb
index c6d4ce240180d351d3b7c99c7072c1770c277944..b357b0987acb583d484bc328ca157828a26cb48c 100644 (file)
--- a/test/functional/old_way_controller_test.rb
+++ b/test/functional/old_way_controller_test.rb
@@ -74,7 +74,8 @@ class OldWayControllerTest < Test::Unit::TestCase
   end
 
   ##
   end
 
   ##

-  #
+  # look at all the versions of the way in the history and get each version from
+  # the versions call. check that they're the same.

   def check_history_equals_versions(way_id)
     get :history, :id => way_id
     assert_response :success, "can't get way #{way_id} from API"
   def check_history_equals_versions(way_id)
     get :history, :id => way_id
     assert_response :success, "can't get way #{way_id} from API"

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 2049ba0cbdade73d4a8d959b9444e844e3621b02..8a057c2936d5502b0a8dfc98b42447e3b11a9a2c 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -203,6 +203,90 @@ class WayControllerTest < Test::Unit::TestCase
     assert_response :not_found
   end
 
     assert_response :not_found
   end
 

+  # ------------------------------------------------------------
+  # test tags handling
+  # ------------------------------------------------------------
+
+  ##
+  # Try adding a duplicate of an existing tag to a way
+  def test_add_duplicate_tags
+    # setup auth
+    basic_authorization(users(:normal_user).email, "test")
+
+    # add an identical tag to the way
+    tag_xml = XML::Node.new("tag")
+    tag_xml['k'] = current_way_tags(:t1).k
+    tag_xml['v'] = current_way_tags(:t1).v
+
+    # add the tag into the existing xml
+    way_xml = current_ways(:visible_way).to_xml
+    way_xml.find("//osm/way").first << tag_xml
+
+    # try and upload it
+    content way_xml
+    put :update, :id => current_ways(:visible_way).id
+    assert_response :bad_request, 
+       "adding a duplicate tag to a way should fail with 'bad request'"
+  end
+
+  ##
+  # Try adding a new duplicate tags to a way
+  def test_new_duplicate_tags
+    # setup auth
+    basic_authorization(users(:normal_user).email, "test")
+
+    # create duplicate tag
+    tag_xml = XML::Node.new("tag")
+    tag_xml['k'] = "i_am_a_duplicate"
+    tag_xml['v'] = "foobar"
+
+    # add the tag into the existing xml
+    way_xml = current_ways(:visible_way).to_xml
+
+    # add two copies of the tag
+    way_xml.find("//osm/way").first << tag_xml.copy(true) << tag_xml
+
+    # try and upload it
+    content way_xml
+    put :update, :id => current_ways(:visible_way).id
+    assert_response :bad_request, 
+       "adding new duplicate tags to a way should fail with 'bad request'"
+  end
+
+  ##
+  # Try adding a new duplicate tags to a way.
+  # But be a bit subtle - use unicode decoding ambiguities to use different
+  # binary strings which have the same decoding.
+  def test_invalid_duplicate_tags
+    # setup auth
+    basic_authorization(users(:normal_user).email, "test")
+
+    # add the tag into the existing xml
+    way_str = "<osm><way changeset='1'>"
+
+    # all of these keys have the same unicode decoding, but are binary
+    # not equal. libxml should make these identical as it decodes the
+    # XML document...
+    [ "addr:housenumber",
+      "addr\xc0\xbahousenumber",
+      "addr\xe0\x80\xbahousenumber",
+      "addr\xf0\x80\x80\xbahousenumber" ].each do |key|
+      tag_xml = XML::Node.new("tag")
+      tag_xml['k'] = key
+      tag_xml['v'] = "1"
+
+      # add all new tags to the way
+      way_str << "<tag k='" + key + "' v='1'/>"
+    end
+    way_str << "</way></osm>";
+
+    # try and upload it
+    content way_str
+    put :create
+    assert_response :bad_request, 
+       "adding new duplicate tags to a way should fail with 'bad request'"
+  end
+

   ##
   # update the changeset_id of a node element
   def update_changeset(xml, changeset_id)
   ##
   # update the changeset_id of a node element
   def update_changeset(xml, changeset_id)