cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixup AMF tests to match Richard's latest changes.

Browse source
This commit is contained in:
Tom Hughes 2010-02-11 17:33:46 +00:00
parent eccd9b93d9
commit 8264fb92ff
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
test/functional/amf_controller_test.rb
View file

@ -28,7 +28,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal way[0], -4 assert_equal way[0], -4
assert_equal way[1], "way" assert_equal way[1], "way"
assert_equal way[2], id assert_equal way[2], id
assert way[3].empty? and way[4].empty? assert way[3].nil? and way[4].nil?
end end
def test_getway_nonexistent def test_getway_nonexistent
@ -41,7 +41,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal way[0], -4 assert_equal way[0], -4
assert_equal way[1], "way" assert_equal way[1], "way"
assert_equal way[2], 0 assert_equal way[2], 0
assert way[3].empty? and way[4].empty? assert way[3].nil? and way[4].nil?
end end
def test_whichways def test_whichways
@ -185,7 +185,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal rel[0], -4 assert_equal rel[0], -4
assert_equal rel[1], "relation" assert_equal rel[1], "relation"
assert_equal rel[2], id assert_equal rel[2], id
assert rel[3].empty? and rel[4].empty? assert rel[3].nil? and rel[4].nil?
end end
def test_getrelation_nonexistent def test_getrelation_nonexistent
@ -198,7 +198,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal rel[0], -4 assert_equal rel[0], -4
assert_equal rel[1], "relation" assert_equal rel[1], "relation"
assert_equal rel[2], id assert_equal rel[2], id
assert rel[3].empty? and rel[4].empty? assert rel[3].nil? and rel[4].nil?
end end
def test_getway_old def test_getway_old
@ -240,8 +240,8 @@ class AmfControllerTest < ActionController::TestCase
amf_parse_response amf_parse_response
returned_way = amf_result("/1") returned_way = amf_result("/1")
assert_equal -1, returned_way[0] assert_equal -1, returned_way[0]
assert returned_way[3].empty? assert returned_way[3].nil?
assert returned_way[4].empty? assert returned_way[4].nil?
assert returned_way[5].nil? assert returned_way[5].nil?
end end
end end
@ -261,8 +261,8 @@ class AmfControllerTest < ActionController::TestCase
amf_parse_response amf_parse_response
returned_way = amf_result("/1") returned_way = amf_result("/1")
assert_equal -1, returned_way[0] assert_equal -1, returned_way[0]
assert returned_way[3].empty? assert returned_way[3].nil?
assert returned_way[4].empty? assert returned_way[4].nil?
assert returned_way[5].nil? assert returned_way[5].nil?
end end
end end
@ -510,7 +510,7 @@ class AmfControllerTest < ActionController::TestCase
assert_equal 2, result.size assert_equal 2, result.size
assert_equal -1, result[0], "Expected to get the status FAIL in the amf" assert_equal -1, result[0], "Expected to get the status FAIL in the amf"
assert_equal "One of the tags is invalid. Please pester Adobe to fix Flash on Linux.", result[1] assert_equal "One of the tags is invalid. Linux users may need to upgrade to Flash Player 10.1.", result[1]
end end
def test_putpoi_delete_valid def test_putpoi_delete_valid