X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/df496b44cd5d52f96bd090815f4f23b4e0f4452f..8a57904398175d9143cec737282f5066793bdbc3:/test/functional/way_controller_test.rb

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index 8a057c293..895e7532f 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -37,21 +37,11 @@ class WayControllerTest < Test::Unit::TestCase
     # check chat a non-existent way is not returned
     get :read, :id => 0
     assert_response :not_found
+  end
 
-    # check the "ways for node" mode
-    get :ways_for_node, :id => current_nodes(:used_node_1).id
-    assert_response :success
-    # FIXME check whether this contains the stuff we want!
-    #print @response.body
-    # Needs to be updated when changing fixtures
-    # The generator should probably be defined in the environment.rb file
-    # in the same place as the api version
-    assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
-    assert_select "osm way", 3
-    assert_select "osm way nd", 3
-    assert_select "osm way tag", 3
-
-    # check the "full" mode
+  ##
+  # check the "full" mode
+  def test_full
     get :full, :id => current_ways(:visible_way).id
     assert_response :success
     # FIXME check whether this contains the stuff we want!
@@ -257,34 +247,64 @@ class WayControllerTest < Test::Unit::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")
 
     # add the tag into the existing xml
     way_str = "<osm><way changeset='1'>"
+    way_str << "<tag k='addr:housenumber' v='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\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"
+      # copy the XML doc to add the tags
+      way_str_copy = way_str.clone
 
       # add all new tags to the way
-      way_str << "<tag k='" + key + "' v='1'/>"
+      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
-    way_str << "</way></osm>";
+  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'"
+  ##
+  # test that a call to ways_for_node returns all ways that contain the node
+  # and none that don't.
+  def test_ways_for_node
+    # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4 
+    # *used* to use it but doesn't.
+    get :ways_for_node, :id => current_nodes(:used_node_1).id
+    assert_response :success
+    ways_xml = XML::Parser.string(@response.body).parse
+    assert_not_nil ways_xml, "failed to parse ways_for_node response"
+
+    # check that the set of IDs match expectations
+    expected_way_ids = [ current_ways(:visible_way).id,
+                         current_ways(:used_way).id
+                       ]
+    found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
+    assert_equal expected_way_ids, found_way_ids,
+      "expected ways for node #{current_nodes(:used_node_1).id} did not match found"
+    
+    # check the full ways to ensure we're not missing anything
+    expected_way_ids.each do |id|
+      way_xml = ways_xml.find("//osm/way[@id=#{id}]").first
+      assert_ways_are_equal(Way.find(id),
+                            Way.from_xml_node(way_xml))
+    end
   end
 
   ##