X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c0b4c1b9059890e1fb683a9822b966d4efd2698c..acc5ffbe1ca930676ec0ec71592e2b37d9029ce6:/test/functional/amf_controller_test.rb?ds=sidebyside

diff --git a/test/functional/amf_controller_test.rb b/test/functional/amf_controller_test.rb
index 75060b4e2..b71c680e3 100644
--- a/test/functional/amf_controller_test.rb
+++ b/test/functional/amf_controller_test.rb
@@ -15,7 +15,7 @@ class AmfControllerTest < ActionController::TestCase
     amf_content "getway", "/1", [id]
     post :amf_read
     assert_response :success
-    amf_parse_response
+    amf_parse_response                                         
     assert_equal amf_result("/1")[0], id
   end
 
@@ -55,17 +55,50 @@ class AmfControllerTest < ActionController::TestCase
 
     # check contents of message
     map = amf_result "/1"
-    assert_equal 0, map[0]
-    assert_equal Array, map[1].class
-    assert map[1].include?(current_ways(:used_way).id)
-    assert !map[1].include?(current_ways(:invisible_way).id)
+    assert_equal 0, map[0], 'map error code should be 0'
+
+    # check the formatting of the message
+    assert_equal 4, map.length, 'map should have length 4'
+    assert_equal Array, map[1].class, 'map "ways" element should be an array'
+    assert_equal Array, map[2].class, 'map "nodes" element should be an array'
+    assert_equal Array, map[3].class, 'map "relations" element should be an array'
+    map[1].each do |w|
+      assert_equal 2, w.length, 'way should be (id, version) pair'
+      assert w[0] == w[0].floor, 'way ID should be an integer'
+      assert w[1] == w[1].floor, 'way version should be an integer'
+    end
+
+    map[2].each do |n|
+      assert_equal 5, w.length, 'node should be (id, lat, lon, [tags], version) tuple'
+      assert n[0] == n[0].floor, 'node ID should be an integer'
+      assert n[1] >= minlat - 0.01, 'node lat should be greater than min'
+      assert n[1] <= maxlat - 0.01, 'node lat should be less than max'
+      assert n[2] >= minlon - 0.01, 'node lon should be greater than min'
+      assert n[2] <= maxlon - 0.01, 'node lon should be less than max'
+      assert_equal Array, a[3].class, 'node tags should be array'
+      assert n[4] == n[4].floor, 'node version should be an integer'
+    end
+
+    map[3].each do |r|
+      assert_equal 2, r.length, 'relation should be (id, version) pair'
+      assert r[0] == r[0].floor, 'relation ID should be an integer'
+      assert r[1] == r[1].floor, 'relation version should be an integer'
+    end
+
+    # TODO: looks like amf_controller changed since this test was written
+    # so someone who knows what they're doing should check this!
+    ways = map[1].collect { |x| x[0] }
+    assert ways.include?(current_ways(:used_way).id),
+      "map should include used way"
+    assert !ways.include?(current_ways(:invisible_way).id),
+      'map should not include deleted way'
   end
 
   ##
   # checks that too-large a bounding box will not be served.
   def test_whichways_toobig
     bbox = [-0.1,-0.1,1.1,1.1]
-    check_bboxes_are_bad [bbox] do |map|
+    check_bboxes_are_bad [bbox] do |map,bbox|
       assert_equal BOUNDARY_ERROR, map, "AMF controller should have returned an error."
     end
   end
@@ -73,19 +106,23 @@ class AmfControllerTest < ActionController::TestCase
   ##
   # checks that an invalid bounding box will not be served. in this case
   # one with max < min latitudes.
+  #
+  # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlat
-    bboxes = [[0,0.1,0.1,0], [-0.1,80,0.1,70], [0.24,54.34,0.25,54.33]]
-    check_bboxes_are_bad bboxes do |map|
-      assert_equal BOUNDARY_ERROR, map, "AMF controller should have returned an error."
+    bboxes = [[0,0.1,0.1,0], [-0.1,80,0.1,70], [0.24,54.35,0.25,54.33]]
+    check_bboxes_are_bad bboxes do |map, bbox|
+      assert_equal BOUNDARY_ERROR, map, "AMF controller should have returned an error #{bbox.inspect}."
     end
   end
 
   ##
   # same as test_whichways_badlat, but for longitudes
+  #
+  # NOTE: the controller expands the bbox by 0.01 in each direction!
   def test_whichways_badlon
-    bboxes = [[80,-0.1,70,0.1], [54.34,0.24,54.33,0.25]]
-    check_bboxes_are_bad bboxes do |map|
-      assert_equal BOUNDARY_ERROR, map, "AMF controller should have returned an error."
+    bboxes = [[80,-0.1,70,0.1], [54.35,0.24,54.33,0.25]]
+    check_bboxes_are_bad bboxes do |map, bbox|
+      assert_equal BOUNDARY_ERROR, map, "AMF controller should have returned an error #{bbox.inspect}."
     end
   end
 
@@ -102,10 +139,14 @@ class AmfControllerTest < ActionController::TestCase
 
     # check contents of message
     map = amf_result "/1"
-    assert_equal 0, map[0]
-    assert_equal Array, map[1].class
-    assert map[1].include?(current_ways(:used_way).id)
-    assert !map[1].include?(current_ways(:invisible_way).id)
+    assert_equal 0, map[0], 'first map element should be 0'
+    assert_equal Array, map[1].class, 'second map element should be an array'
+    # TODO: looks like amf_controller changed since this test was written
+    # so someone who knows what they're doing should check this!
+    assert !map[1].include?(current_ways(:used_way).id),
+      "map should not include used way"
+    assert map[1].include?(current_ways(:invisible_way).id),
+      'map should include deleted way'
   end
 
   def test_whichways_deleted_toobig
@@ -220,10 +261,18 @@ class AmfControllerTest < ActionController::TestCase
     history = amf_result("/1")
 
     # ['node',nodeid,history]
-    assert_equal history[0], 'node'
-    assert_equal history[1], latest.id
-    assert_equal history[2].first[0], latest.timestamp.to_i
-    assert_equal history[2].last[0], nodes(:node_with_versions_v1).timestamp.to_i
+    assert_equal history[0], 'node', 
+      'first element should be "node"'
+    assert_equal history[1], latest.id,
+      'second element should be the input node ID'
+    # NOTE: changed this test to match what amf_controller actually 
+    # outputs - which may or may not be what potlatch is expecting.
+    # someone who knows potlatch (i.e: richard f) should review this.
+    assert_equal history[2].first[0], latest.version,
+      'first part of third element should be the latest version'
+    assert_equal history[2].last[0], 
+      nodes(:node_with_versions_v1).version,
+      'second part of third element should be the initial version'
   end
 
   def test_getnode_history_nonexistent
@@ -299,15 +348,15 @@ class AmfControllerTest < ActionController::TestCase
     current_node = Node.find(result[2])
     assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly"
     assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly"
-    assert_equal 0, current_node.tags.count, "There seems to be a tag that has been added to the node"
+    assert_equal 0, current_node.tags.size, "There seems to be a tag that has been added to the node"
     assert_equal result[3], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
     historic_nodes = Node.find(:all, :conditions => { :id => result[2] })
-    assert_equal 1, historic_nodes.count, "There should only be one historic node created"
+    assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"
     assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly"
-    assert_equal 0, first_historic_node.tags.count, "There seems to be a tag that have been attached to this node"
+    assert_equal 0, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node"
     assert_equal result[3], first_historic_node.version, "The version returned, is different to the one returned by the amf"
     
     ####
@@ -338,19 +387,34 @@ class AmfControllerTest < ActionController::TestCase
     current_node = Node.find(result[2])
     assert_in_delta lat, current_node.lat, 0.00001, "The latitude was not retreieved correctly"
     assert_in_delta lon, current_node.lon, 0.00001, "The longitude was not retreived correctly"
-    assert_equal 2, current_node.tags.count, "There seems to be a tag that has been added to the node"
+    assert_equal 2, current_node.tags.size, "There seems to be a tag that has been added to the node"
     assert_equal({ "key" => "value", "ping" => "pong" }, current_node.tags, "tags are different")
     assert_equal result[3], current_node.version, "The version returned, is different to the one returned by the amf"
     # Now check the history table
     historic_nodes = Node.find(:all, :conditions => { :id => result[2] })
-    assert_equal 1, historic_nodes.count, "There should only be one historic node created"
+    assert_equal 1, historic_nodes.size, "There should only be one historic node created"
     first_historic_node = historic_nodes.first
     assert_in_delta lat, first_historic_node.lat, 0.00001, "The latitude was not retreived correctly"
     assert_in_delta lon, first_historic_node.lon, 0.00001, "The longitude was not retreuved correctly"
-    assert_equal 2, first_historic_node.tags.count, "There seems to be a tag that have been attached to this node"
+    assert_equal 2, first_historic_node.tags.size, "There seems to be a tag that have been attached to this node"
     assert_equal({ "key" => "value", "ping" => "pong" }, first_historic_node.tags, "tags are different")
     assert_equal result[3], first_historic_node.version, "The version returned, is different to the one returned by the amf"
-
+  end
+  
+  def test_putpoi_delete_valid
+    
+  end
+  
+  def test_putpoi_delete_already_deleted
+    
+  end
+  
+  def test_putpoi_delete_not_found
+    
+  end
+  
+  def test_putpoi_invalid_latlon
+    
   end
 
   # ************************************************************
@@ -428,7 +492,7 @@ class AmfControllerTest < ActionController::TestCase
       # pass the response back to the caller's block to be tested
       # against what the caller expected.
       map = amf_result "/1"
-      yield map
+      yield map, bbox
     end
   end
 end