From c3785ff278f605fc6c98ac0bdcd3dc3c79de05a4 Mon Sep 17 00:00:00 2001
From: Matt Amos <zerebubuth@gmail.com>
Date: Fri, 28 Nov 2008 12:33:18 +0000
Subject: [PATCH 1/1] Changed duplicate tags test to test the correct code path
 - was previously failing in libxml, rather than the duplicate tags check.

---
 test/functional/way_controller_test.rb | 30 ++++++--------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index be4c41a39..fcd1557d1 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -249,10 +249,6 @@ class WayControllerTest < ActionController::TestCase
   # 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.
-  #
-  # NOTE: I'm not sure this test is working correctly, as a lot of the tag
-  # keys seem to come out as "addr��housenumber". It might be something to
-  # do with Ruby's unicode handling...?
   def test_invalid_duplicate_tags
     # setup auth
     basic_authorization(users(:normal_user).email, "test")
@@ -260,26 +256,14 @@ class WayControllerTest < ActionController::TestCase
     # add the tag into the existing xml
     way_str = "<osm><way changeset='1'>"
     way_str << "<tag k='addr:housenumber' v='1'/>"
+    way_str << "<tag k='addr:housenumber' v='2'/>"
+    way_str << "</way></osm>";
 
-    # 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\xc0\xbahousenumber",
-      "addr\xe0\x80\xbahousenumber",
-      "addr\xf0\x80\x80\xbahousenumber" ].each do |key|
-      # copy the XML doc to add the tags
-      way_str_copy = way_str.clone
-
-      # add all new tags to the way
-      way_str_copy << "<tag k='" << key << "' v='1'/>"
-      way_str_copy << "</way></osm>";
-
-      # try and upload it
-      content way_str_copy
-      put :create
-      assert_response :bad_request, 
-         "adding new duplicate tags to a way should fail with 'bad request'"
-    end
+    # 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
 
   ##
-- 
2.43.2