Refactor more amf_controller tests to use factories.

[rails.git] / test / controllers / amf_controller_test.rb

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index 09b88e98f7ab378e7b3d63b10a4632da22bd2678..f92be48656aa37f38bfa5eef20b929b1cd03ca0e 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -19,9 +19,9 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getpresets
   end
 
   def test_getpresets

-    [:public_user, :german_user].each do |id|
-      user = users(id)
-
+    user_en_de = create(:user, :languages => %w(en de))
+    user_de = create(:user, :languages => %w(de))
+    [user_en_de, user_de].each do |user|

       amf_content "getpresets", "/1", ["#{user.email}:test", ""]
       post :amf_read
       assert_response :success
       amf_content "getpresets", "/1", ["#{user.email}:test", ""]
       post :amf_read
       assert_response :success


@@ -144,7 +144,13 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_whichways
   end
 
   def test_whichways

-    node = current_nodes(:used_node_1)
+    node = create(:node, :lat => 3.0, :lon => 3.0)
+    way = create(:way)
+    deleted_way = create(:way, :deleted)
+    create(:way_node, :way => way, :node => node)
+    create(:way_node, :way => deleted_way, :node => node)
+    create(:way_tag, :way => way)
+

     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1


@@ -190,9 +196,9 @@ class AmfControllerTest < ActionController::TestCase
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     ways = map[2].collect { |x| x[0] }
     # TODO: looks like amf_controller changed since this test was written
     # so someone who knows what they're doing should check this!
     ways = map[2].collect { |x| x[0] }

-    assert ways.include?(current_ways(:used_way).id),
+    assert ways.include?(way.id),

            "map should include used way"
            "map should include used way"

-    assert !ways.include?(current_ways(:invisible_way).id),
+    assert !ways.include?(deleted_way.id),

            "map should not include deleted way"
   end
 
            "map should not include deleted way"
   end
 


@@ -229,7 +235,13 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_whichways_deleted
   end
 
   def test_whichways_deleted

-    node = current_nodes(:used_node_1)
+    node = create(:node, :lat => 3.0, :lon => 3.0)
+    way = create(:way)
+    deleted_way = create(:way, :deleted)
+    create(:way_node, :way => way, :node => node)
+    create(:way_node, :way => deleted_way, :node => node)
+    create(:way_tag, :way => way)
+

     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1
     minlon = node.lon - 0.1
     minlat = node.lat - 0.1
     maxlon = node.lon + 0.1


@@ -414,8 +426,12 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getnode_history
   end
 
   def test_getnode_history

-    latest = current_nodes(:node_with_versions)
-    amf_content "getnode_history", "/1", [latest.id]
+    node = create(:node, :version => 2)
+    node_v1 = create(:old_node, :current_node => node, :version => 1, :timestamp => 3.days.ago)
+    _node_v2 = create(:old_node, :current_node => node, :version => 2, :timestamp => 2.days.ago)
+    node_v3 = create(:old_node, :current_node => node, :version => 3, :timestamp => 1.day.ago)
+
+    amf_content "getnode_history", "/1", [node.id]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -426,13 +442,13 @@ class AmfControllerTest < ActionController::TestCase
     # to the next second
     assert_equal history[0], "node",
                  'first element should be "node"'
     # to the next second
     assert_equal history[0], "node",
                  'first element should be "node"'

-    assert_equal history[1], latest.id,
+    assert_equal history[1], node.id,

                  "second element should be the input node ID"
     assert_equal history[2].first[0],
                  "second element should be the input node ID"
     assert_equal history[2].first[0],

-                 (latest.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
+                 (node_v3.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),

                  "first element in third element (array) should be the latest version"
     assert_equal history[2].last[0],
                  "first element in third element (array) should be the latest version"
     assert_equal history[2].last[0],

-                 (nodes(:node_with_versions_v1).timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),
+                 (node_v1.timestamp + 1).strftime("%d %b %Y, %H:%M:%S"),

                  "last element in third element (array) should be the initial version"
   end
 
                  "last element in third element (array) should be the initial version"
   end
 


@@ -460,7 +476,9 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal -1, result[0]
     assert_match /must be logged in/, result[1]
 
     assert_equal -1, result[0]
     assert_match /must be logged in/, result[1]
 

-    amf_content "findgpx", "/1", [1, "blocked@openstreetmap.org:test"]
+    blocked_user = create(:user)
+    create(:user_block, :user => blocked_user)
+    amf_content "findgpx", "/1", [1, "#{blocked_user.email}:test"]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -472,9 +490,10 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_findgpx_by_id
   end
 
   def test_findgpx_by_id

-    trace = gpx_files(:anon_trace_file)
+    user = create(:user)
+    trace = create(:trace, :visibility => "private", :user => user)

 
 

-    amf_content "findgpx", "/1", [trace.id, "test@example.com:test"]
+    amf_content "findgpx", "/1", [trace.id, "#{user.email}:test"]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -530,7 +549,10 @@ class AmfControllerTest < ActionController::TestCase
 
   def test_findrelations_by_tags
     visible_relation = current_relations(:visible_relation)
 
   def test_findrelations_by_tags
     visible_relation = current_relations(:visible_relation)

+    create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes")

     used_relation = current_relations(:used_relation)
     used_relation = current_relations(:used_relation)

+    create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes")
+    create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation")

 
     amf_content "findrelations", "/1", ["yes"]
     post :amf_read
 
     amf_content "findrelations", "/1", ["yes"]
     post :amf_read


@@ -560,7 +582,8 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getpoi_without_timestamp
   end
 
   def test_getpoi_without_timestamp

-    node = current_nodes(:node_with_versions)
+    node = create(:node, :with_history, :version => 4)
+    create(:node_tag, :node => node)

 
     amf_content "getpoi", "/1", [node.id, ""]
     post :amf_read
 
     amf_content "getpoi", "/1", [node.id, ""]
     post :amf_read


@@ -590,10 +613,14 @@ class AmfControllerTest < ActionController::TestCase
   end
 
   def test_getpoi_with_timestamp
   end
 
   def test_getpoi_with_timestamp

-    node = nodes(:node_with_versions_v2)
-    current_node = current_nodes(:node_with_versions)
+    current_node = create(:node, :with_history, :version => 4)
+    node = current_node.old_nodes.find_by(:version => 2)

 
 

-    amf_content "getpoi", "/1", [node.node_id, node.timestamp.xmlschema]
+    # Timestamps are stored with microseconds, but xmlschema truncates them to
+    # previous whole second, causing <= comparison to fail
+    timestamp = (node.timestamp + 1.second).xmlschema
+
+    amf_content "getpoi", "/1", [node.node_id, timestamp]

     post :amf_read
     assert_response :success
     amf_parse_response
     post :amf_read
     assert_response :success
     amf_parse_response


@@ -636,9 +663,10 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can update a poi
   def test_putpoi_update_valid
 
   # check that we can update a poi
   def test_putpoi_update_valid

-    nd = current_nodes(:visible_node)
-    cs_id = changesets(:public_user_first_change).id
-    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]
+    nd = create(:node)
+    cs_id = nd.changeset.id
+    user = nd.changeset.user
+    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, nd.visible]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -654,7 +682,7 @@ class AmfControllerTest < ActionController::TestCase
     # Now try to update again, with a different lat/lon, using the updated version number
     lat = nd.lat + 0.1
     lon = nd.lon - 0.1
     # Now try to update again, with a different lat/lon, using the updated version number
     lat = nd.lat + 0.1
     lon = nd.lon - 0.1

-    amf_content "putpoi", "/2", ["test@example.com:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible]
+    amf_content "putpoi", "/2", ["#{user.email}:test", cs_id, nd.version + 1, nd.id, lon, lat, nd.tags, nd.visible]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -812,9 +840,11 @@ class AmfControllerTest < ActionController::TestCase
 
   # try deleting a node
   def test_putpoi_delete_valid
 
   # try deleting a node
   def test_putpoi_delete_valid

-    nd = current_nodes(:visible_node)
-    cs_id = changesets(:public_user_first_change).id
-    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
+    nd = create(:node)
+    cs_id = nd.changeset.id
+    user = nd.changeset.user
+
+    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -833,9 +863,11 @@ class AmfControllerTest < ActionController::TestCase
 
   # try deleting a node that is already deleted
   def test_putpoi_delete_already_deleted
 
   # try deleting a node that is already deleted
   def test_putpoi_delete_already_deleted

-    nd = current_nodes(:invisible_node)
-    cs_id = changesets(:public_user_first_change).id
-    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]
+    nd = create(:node, :deleted)
+    cs_id = nd.changeset.id
+    user = nd.changeset.user
+
+    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, nd.lon, nd.lat, nd.tags, false]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -849,8 +881,11 @@ class AmfControllerTest < ActionController::TestCase
 
   # try deleting a node that has never existed
   def test_putpoi_delete_not_found
 
   # try deleting a node that has never existed
   def test_putpoi_delete_not_found

-    cs_id = changesets(:public_user_first_change).id
-    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, 1, 999999, 0, 0, {}, false]
+    changeset = create(:changeset)
+    cs_id = changeset.id
+    user = changeset.user
+
+    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, 1, 999999, 0, 0, {}, false]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -864,9 +899,11 @@ class AmfControllerTest < ActionController::TestCase
 
   # try setting an invalid location on a node
   def test_putpoi_invalid_latlon
 
   # try setting an invalid location on a node
   def test_putpoi_invalid_latlon

-    nd = current_nodes(:visible_node)
-    cs_id = changesets(:public_user_first_change).id
-    amf_content "putpoi", "/1", ["test@example.com:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true]
+    nd = create(:node)
+    cs_id = nd.changeset.id
+    user = nd.changeset.user
+
+    amf_content "putpoi", "/1", ["#{user.email}:test", cs_id, nd.version, nd.id, 200, 100, nd.tags, true]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -879,9 +916,17 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can create a way
   def test_putway_create_valid
 
   # check that we can create a way
   def test_putway_create_valid

-    cs_id = changesets(:public_user_first_change).id
+    changeset = create(:changeset)
+    cs_id = changeset.id
+    user = changeset.user

 
 

-    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [1, 4, 7], { "test" => "new" }, [], {}]
+    a = create(:node).id
+    b = create(:node).id
+    c = create(:node).id
+    d = create(:node).id
+    e = create(:node).id
+
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [a, b, c], { "test" => "new" }, [], {}]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -900,10 +945,10 @@ class AmfControllerTest < ActionController::TestCase
 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version
 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version

-    assert_equal [1, 4, 7], new_way.nds
+    assert_equal [a, b, c], new_way.nds

     assert_equal({ "test" => "new" }, new_way.tags)
 
     assert_equal({ "test" => "new" }, new_way.tags)
 

-    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [4, 6, 15, 1], { "test" => "newer" }, [], {}]
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, d, e, a], { "test" => "newer" }, [], {}]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -922,10 +967,10 @@ class AmfControllerTest < ActionController::TestCase
 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version
 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version

-    assert_equal [4, 6, 15, 1], new_way.nds
+    assert_equal [b, d, e, a], new_way.nds

     assert_equal({ "test" => "newer" }, new_way.tags)
 
     assert_equal({ "test" => "newer" }, new_way.tags)
 

-    amf_content "putway", "/1", ["test@example.com:test", cs_id, 0, -1, [4, -1, 6, 15], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, 6, 1, { "test" => "ok" }]], { 1 => 1 }]
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, 0, -1, [b, -1, d, e], { "test" => "newest" }, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, d, 1, { "test" => "ok" }]], { a => 1 }]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -940,12 +985,12 @@ class AmfControllerTest < ActionController::TestCase
     assert_not_equal -1, result[3]
     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal 1, result[5]
     assert_not_equal -1, result[3]
     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal 1, result[5]

-    assert_equal({ new_node_id.to_s => 1, "6" => 2 }, result[6])
-    assert_equal({ "1" => 1 }, result[7])
+    assert_equal({ new_node_id.to_s => 1, d.to_s => 2 }, result[6])
+    assert_equal({ a.to_s => 1 }, result[7])

 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version
 
     new_way = Way.find(new_way_id)
     assert_equal 1, new_way.version

-    assert_equal [4, new_node_id, 6, 15], new_way.nds
+    assert_equal [b, new_node_id, d, e], new_way.nds

     assert_equal({ "test" => "newest" }, new_way.tags)
 
     new_node = Node.find(new_node_id)
     assert_equal({ "test" => "newest" }, new_way.tags)
 
     new_node = Node.find(new_node_id)


@@ -955,7 +1000,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 12.34, new_node.lat
     assert_equal({ "test" => "new" }, new_node.tags)
 
     assert_equal 12.34, new_node.lat
     assert_equal({ "test" => "new" }, new_node.tags)
 

-    changed_node = Node.find(6)
+    changed_node = Node.find(d)

     assert_equal 2, changed_node.version
     assert_equal true, changed_node.visible
     assert_equal 12.34, changed_node.lon
     assert_equal 2, changed_node.version
     assert_equal true, changed_node.visible
     assert_equal 12.34, changed_node.lon


@@ -963,18 +1008,19 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal({ "test" => "ok" }, changed_node.tags)
 
     # node is not deleted because our other ways are using it
     assert_equal({ "test" => "ok" }, changed_node.tags)
 
     # node is not deleted because our other ways are using it

-    deleted_node = Node.find(1)
+    deleted_node = Node.find(a)

     assert_equal 1, deleted_node.version
     assert_equal true, deleted_node.visible
   end
 
   # check that we can update a way
   def test_putway_update_valid
     assert_equal 1, deleted_node.version
     assert_equal true, deleted_node.visible
   end
 
   # check that we can update a way
   def test_putway_update_valid

-    way = current_ways(:way_with_multiple_nodes)
-    cs_id = changesets(:public_user_first_change).id
+    way = create(:way_with_nodes, :nodes_count => 3)
+    cs_id = way.changeset.id
+    user = way.changeset.user

 
     assert_not_equal({ "test" => "ok" }, way.tags)
 
     assert_not_equal({ "test" => "ok" }, way.tags)

-    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}]
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version, way.id, way.nds, { "test" => "ok" }, [], {}]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -995,8 +1041,14 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal way.nds, new_way.nds
     assert_equal({ "test" => "ok" }, new_way.tags)
 
     assert_equal way.nds, new_way.nds
     assert_equal({ "test" => "ok" }, new_way.tags)
 

-    assert_not_equal [4, 6, 15, 1], way.tags
-    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version + 1, way.id, [4, 6, 15, 1], way.tags, [], {}]
+    # Test changing the nodes in the way
+    a = create(:node).id
+    b = create(:node).id
+    c = create(:node).id
+    d = create(:node).id
+
+    assert_not_equal [a, b, c, d], way.nds
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version + 1, way.id, [a, b, c, d], way.tags, [], {}]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -1014,10 +1066,10 @@ class AmfControllerTest < ActionController::TestCase
 
     new_way = Way.find(way.id)
     assert_equal way.version + 2, new_way.version
 
     new_way = Way.find(way.id)
     assert_equal way.version + 2, new_way.version

-    assert_equal [4, 6, 15, 1], new_way.nds
+    assert_equal [a, b, c, d], new_way.nds

     assert_equal way.tags, new_way.tags
 
     assert_equal way.tags, new_way.tags
 

-    amf_content "putway", "/1", ["test@example.com:test", cs_id, way.version + 2, way.id, [4, -1, 6, 15], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, 6, 1, { "test" => "ok" }]], { 1 => 1 }]
+    amf_content "putway", "/1", ["#{user.email}:test", cs_id, way.version + 2, way.id, [a, -1, b, c], way.tags, [[4.56, 12.34, -1, 0, { "test" => "new" }], [12.34, 4.56, b, 1, { "test" => "ok" }]], { d => 1 }]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -1031,12 +1083,12 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal way.id, result[3]
     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal way.version + 3, result[5]
     assert_equal way.id, result[3]
     assert_equal({ "-1" => new_node_id }, result[4])
     assert_equal way.version + 3, result[5]

-    assert_equal({ new_node_id.to_s => 1, "6" => 2 }, result[6])
-    assert_equal({ "1" => 1 }, result[7])
+    assert_equal({ new_node_id.to_s => 1, b.to_s => 2 }, result[6])
+    assert_equal({ d.to_s => 1 }, result[7])

 
     new_way = Way.find(way.id)
     assert_equal way.version + 3, new_way.version
 
     new_way = Way.find(way.id)
     assert_equal way.version + 3, new_way.version

-    assert_equal [4, new_node_id, 6, 15], new_way.nds
+    assert_equal [a, new_node_id, b, c], new_way.nds

     assert_equal way.tags, new_way.tags
 
     new_node = Node.find(new_node_id)
     assert_equal way.tags, new_way.tags
 
     new_node = Node.find(new_node_id)


@@ -1046,25 +1098,35 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal 12.34, new_node.lat
     assert_equal({ "test" => "new" }, new_node.tags)
 
     assert_equal 12.34, new_node.lat
     assert_equal({ "test" => "new" }, new_node.tags)
 

-    changed_node = Node.find(6)
+    changed_node = Node.find(b)

     assert_equal 2, changed_node.version
     assert_equal true, changed_node.visible
     assert_equal 12.34, changed_node.lon
     assert_equal 4.56, changed_node.lat
     assert_equal({ "test" => "ok" }, changed_node.tags)
 
     assert_equal 2, changed_node.version
     assert_equal true, changed_node.visible
     assert_equal 12.34, changed_node.lon
     assert_equal 4.56, changed_node.lat
     assert_equal({ "test" => "ok" }, changed_node.tags)
 

-    deleted_node = Node.find(1)
+    deleted_node = Node.find(d)

     assert_equal 2, deleted_node.version
     assert_equal false, deleted_node.visible
   end
 
   # check that we can delete a way
   def test_deleteway_valid
     assert_equal 2, deleted_node.version
     assert_equal false, deleted_node.visible
   end
 
   # check that we can delete a way
   def test_deleteway_valid

-    way = current_ways(:way_with_multiple_nodes)
+    way = create(:way_with_nodes, :nodes_count => 3)

     nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }
     nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }

-    cs_id = changesets(:public_user_first_change).id
+    cs_id = way.changeset.id
+    user = way.changeset.user
+
+    # Of the three nodes, two should be kept since they are used in
+    # a different way, and the third deleted since it's unused

 
 

-    amf_content "deleteway", "/1", ["test@example.com:test", cs_id, way.id, way.version, nodes]
+    a = way.nodes[0]
+    create(:way_node, :node => a)
+    b = way.nodes[1]
+    create(:way_node, :node => b)
+    c = way.nodes[2]
+
+    amf_content "deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -1075,7 +1137,7 @@ class AmfControllerTest < ActionController::TestCase
     assert_equal "", result[1]
     assert_equal way.id, result[2]
     assert_equal way.version + 1, result[3]
     assert_equal "", result[1]
     assert_equal way.id, result[2]
     assert_equal way.version + 1, result[3]

-    assert_equal({ "11" => 2 }, result[4])
+    assert_equal({ c.id.to_s => 2 }, result[4])

 
     new_way = Way.find(way.id)
     assert_equal way.version + 1, new_way.version
 
     new_way = Way.find(way.id)
     assert_equal way.version + 1, new_way.version


@@ -1088,11 +1150,13 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can't delete a way that is in use
   def test_deleteway_inuse
 
   # check that we can't delete a way that is in use
   def test_deleteway_inuse

-    way = current_ways(:used_way)
+    way = create(:way_with_nodes, :nodes_count => 4)
+    create(:relation_member, :member => way)

     nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }
     nodes = way.nodes.each_with_object({}) { |n, ns| ns[n.id] = n.version }

-    cs_id = changesets(:public_user_first_change).id
+    cs_id = way.changeset.id
+    user = way.changeset.user

 
 

-    amf_content "deleteway", "/1", ["test@example.com:test", cs_id, way.id, way.version, nodes]
+    amf_content "deleteway", "/1", ["#{user.email}:test", cs_id, way.id, way.version, nodes]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -1113,9 +1177,15 @@ class AmfControllerTest < ActionController::TestCase
 
   # check that we can create a relation
   def test_putrelation_create_valid
 
   # check that we can create a relation
   def test_putrelation_create_valid

-    cs_id = changesets(:public_user_first_change).id
+    changeset = create(:changeset)
+    user = changeset.user
+    cs_id = changeset.id

 
 

-    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, 0, -1, { "test" => "new" }, [["Node", 3, "node"], ["Way", 7, "way"], ["Relation", 1, "relation"]], true]
+    node = create(:node)
+    way = create(:way_with_nodes, :nodes_count => 2)
+    relation = create(:relation)
+
+    amf_content "putrelation", "/1", ["#{user.email}:test", cs_id, 0, -1, { "test" => "new" }, [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], true]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response


@@ -1131,18 +1201,20 @@ class AmfControllerTest < ActionController::TestCase
 
     new_relation = Relation.find(new_relation_id)
     assert_equal 1, new_relation.version
 
     new_relation = Relation.find(new_relation_id)
     assert_equal 1, new_relation.version

-    assert_equal [["Node", 3, "node"], ["Way", 7, "way"], ["Relation", 1, "relation"]], new_relation.members
+    assert_equal [["Node", node.id, "node"], ["Way", way.id, "way"], ["Relation", relation.id, "relation"]], new_relation.members

     assert_equal({ "test" => "new" }, new_relation.tags)
     assert_equal true, new_relation.visible
   end
 
   # check that we can update a relation
   def test_putrelation_update_valid
     assert_equal({ "test" => "new" }, new_relation.tags)
     assert_equal true, new_relation.visible
   end
 
   # check that we can update a relation
   def test_putrelation_update_valid

-    relation = current_relations(:visible_relation)
-    cs_id = changesets(:public_user_first_change).id
+    relation = create(:relation)
+    create(:relation_member, :relation => relation)
+    user = relation.changeset.user
+    cs_id = relation.changeset.id

 
     assert_not_equal({ "test" => "ok" }, relation.tags)
 
     assert_not_equal({ "test" => "ok" }, relation.tags)

-    amf_content "putrelation", "/1", ["test@example.com:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true]
+    amf_content "putrelation", "/1", ["#{user.email}:test", cs_id, relation.version, relation.id, { "test" => "ok" }, relation.members, true]

     post :amf_write
     assert_response :success
     amf_parse_response
     post :amf_write
     assert_response :success
     amf_parse_response