More tests, found a bug in the data browser, no fix yet. Fix db readme. Don't show...

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

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index be4c41a394fb9318b091a5b7756eceaac1690143..40ac0bd71c2388447c7fae9d4b44d58d92f18d85 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -219,6 +219,7 @@ class WayControllerTest < ActionController::TestCase
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request, 
        "adding a duplicate tag to a way should fail with 'bad request'"
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request, 
        "adding a duplicate tag to a way should fail with 'bad request'"

+    assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}.", @response.body

   end
 
   ##
   end
 
   ##


@@ -243,16 +244,13 @@ class WayControllerTest < ActionController::TestCase
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request, 
        "adding new duplicate tags to a way should fail with 'bad request'"
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request, 
        "adding new duplicate tags to a way should fail with 'bad request'"

+    assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key i_am_a_duplicate.", @response.body

   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.
   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.

-  #
-  # 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")
   def test_invalid_duplicate_tags
     # setup auth
     basic_authorization(users(:normal_user).email, "test")


@@ -260,26 +258,15 @@ 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'/>"
     # 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'"
+    assert_equal "Element way/ has duplicate tags with key addr:housenumber.", @response.body

   end
 
   ##
   end
 
   ##