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

Fix most auto-correctable rubocop issues

Browse source
This commit is contained in:
Tom Hughes 2015-02-16 19:02:59 +00:00
parent 34e3e51456
commit ef7f3d800c
206 changed files with 2925 additions and 3473 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/models/changeset_tag_test.rb
View file

@ -12,7 +12,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
(0..255).each do |i|
tag = ChangesetTag.new
tag.changeset_id = 1
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -24,13 +24,13 @@ class ChangesetTagTest < ActiveSupport::TestCase
tag = ChangesetTag.new
tag.changeset_id = 1
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |k|
["k" * 256].each do |k|
tag = ChangesetTag.new
tag.changeset_id = 1
tag.k = k
@ -41,7 +41,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["v"*256].each do |v|
["v" * 256].each do |v|
tag = ChangesetTag.new
tag.changeset_id = 1
tag.k = "k"
@ -64,7 +64,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
tag.v = changeset_tags(:changeset_1_tag_1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

48
test/models/changeset_test.rb
View file

@ -9,72 +9,72 @@ class ChangesetTest < ActiveSupport::TestCase
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(no_text, true)
}
end
assert_match /Must specify a string with one or more characters/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(no_text, false)
}
end
assert_match /Must specify a string with one or more characters/, message_update.message
end
def test_from_xml_no_changeset
nocs = "<osm></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(nocs, true)
}
end
assert_match /XML doesn't contain an osm\/changeset element/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(nocs, false)
}
end
assert_match /XML doesn't contain an osm\/changeset element/, message_update.message
end
def test_from_xml_no_k_v
nokv = "<osm><changeset><tag /></changeset></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(nokv, true)
}
end
assert_match /tag is missing key/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(nokv, false)
}
end
assert_match /tag is missing key/, message_create.message
end
def test_from_xml_no_v
no_v = "<osm><changeset><tag k='key' /></changeset></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(no_v, true)
}
end
assert_match /tag is missing value/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Changeset.from_xml(no_v, false)
}
end
assert_match /tag is missing value/, message_update.message
end
def test_from_xml_duplicate_k
dupk = "<osm><changeset><tag k='dup' v='test' /><tag k='dup' v='value' /></changeset></osm>"
message_create = assert_raise(OSM::APIDuplicateTagsError) {
message_create = assert_raise(OSM::APIDuplicateTagsError) do
Changeset.from_xml(dupk, true)
}
end
assert_equal "Element changeset/ has duplicate tags with key dup", message_create.message
message_update = assert_raise(OSM::APIDuplicateTagsError) {
message_update = assert_raise(OSM::APIDuplicateTagsError) do
Changeset.from_xml(dupk, false)
}
end
assert_equal "Element changeset/ has duplicate tags with key dup", message_update.message
end
def test_from_xml_valid
# Example taken from the Update section on the API_v0.6 docs on the wiki
xml = "<osm><changeset><tag k=\"comment\" v=\"Just adding some streetnames and a restaurant\"/></changeset></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Changeset.from_xml(xml, false)
}
assert_nothing_raised(OSM::APIBadXMLError) {
end
assert_nothing_raised(OSM::APIBadXMLError) do
Changeset.from_xml(xml, true)
}
end
end
end

26
test/models/diary_entry_test.rb
View file

@ -10,18 +10,18 @@ class DiaryEntryTest < ActiveSupport::TestCase
def test_diary_entry_validations
diary_entry_valid({})
diary_entry_valid({:title => ''}, false)
diary_entry_valid({:title => 'a'*255})
diary_entry_valid({:title => 'a'*256}, false)
diary_entry_valid({:body => ''}, false)
diary_entry_valid({:latitude => 90})
diary_entry_valid({:latitude => 90.00001}, false)
diary_entry_valid({:latitude => -90})
diary_entry_valid({:latitude => -90.00001}, false)
diary_entry_valid({:longitude => 180})
diary_entry_valid({:longitude => 180.00001}, false)
diary_entry_valid({:longitude => -180})
diary_entry_valid({:longitude => -180.00001}, false)
diary_entry_valid({ :title => '' }, false)
diary_entry_valid(:title => 'a' * 255)
diary_entry_valid({ :title => 'a' * 256 }, false)
diary_entry_valid({ :body => '' }, false)
diary_entry_valid(:latitude => 90)
diary_entry_valid({ :latitude => 90.00001 }, false)
diary_entry_valid(:latitude => -90)
diary_entry_valid({ :latitude => -90.00001 }, false)
diary_entry_valid(:longitude => 180)
diary_entry_valid({ :longitude => 180.00001 }, false)
diary_entry_valid(:longitude => -180)
diary_entry_valid({ :longitude => -180.00001 }, false)
end
def test_diary_entry_visible
@ -41,7 +41,7 @@ class DiaryEntryTest < ActiveSupport::TestCase
assert_equal 1, diary_entries(:normal_user_geo_entry).visible_comments.count
end
private
private
def diary_entry_valid(attrs, result = true)
entry = DiaryEntry.new(diary_entries(:normal_user_entry_1).attributes)

1
test/models/friend_test.rb
View file

@ -7,5 +7,4 @@ class FriendTest < ActiveSupport::TestCase
def test_friend_count
assert_equal 1, Friend.count
end
end

10
test/models/message_test.rb
View file

@ -5,7 +5,7 @@ class MessageTest < ActiveSupport::TestCase
api_fixtures
fixtures :messages
EURO = "\xe2\x82\xac" #euro symbol
EURO = "\xe2\x82\xac" # euro symbol
# This needs to be updated when new fixtures are added
# or removed.
@ -38,7 +38,7 @@ class MessageTest < ActiveSupport::TestCase
assert_raise(ActiveRecord::RecordNotFound) { User.find(0) }
message.from_user_id = 0
message.to_user_id = 0
assert_raise(ActiveRecord::RecordInvalid) {message.save!}
assert_raise(ActiveRecord::RecordInvalid) { message.save! }
end
def test_utf8_roundtrip
@ -184,18 +184,18 @@ class MessageTest < ActiveSupport::TestCase
assert_equal "text", message.body_format
end
private
private
def make_message(char, count)
message = messages(:unread_message)
message.title = char * count
return message
message
end
def assert_message_ok(char, count)
message = make_message(char, count)
assert message.save!
response = message.class.find(message.id) # stand by for some über-generalisation...
assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length*count} bytes) fails"
assert_equal char * count, response.title, "message with #{count} #{char} chars (i.e. #{char.length * count} bytes) fails"
end
end

12
test/models/node_tag_test.rb
View file

@ -12,7 +12,7 @@ class NodeTagTest < ActiveSupport::TestCase
node_tag_count(:node_with_versions, 2)
end
def node_tag_count (node, count)
def node_tag_count(node, count)
nod = current_nodes(node)
assert_equal count, nod.node_tags.count
end
@ -22,7 +22,7 @@ class NodeTagTest < ActiveSupport::TestCase
(0..255).each do |i|
tag = NodeTag.new
tag.node_id = current_node_tags(:t1).node_id
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -34,13 +34,13 @@ class NodeTagTest < ActiveSupport::TestCase
tag = NodeTag.new
tag.node_id = current_node_tags(:t1).node_id
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = NodeTag.new
tag.node_id = current_node_tags(:t1).node_id
tag.k = i
@ -51,7 +51,7 @@ class NodeTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = NodeTag.new
tag.node_id = current_node_tags(:t1).node_id
tag.k = "k"
@ -74,7 +74,7 @@ class NodeTagTest < ActiveSupport::TestCase
tag.v = current_node_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

112
test/models/node_test.rb
View file

@ -55,7 +55,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal dbnode.timestamp, node.timestamp
assert_equal dbnode.version, node.version
assert_equal dbnode.visible, node.visible
#assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
# assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
assert node.valid?
end
@ -71,7 +71,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal dbnode.timestamp, node.timestamp
assert_equal dbnode.version, node.version
assert_equal dbnode.visible, node.visible
#assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
# assert_equal node.tile, QuadTile.tile_for_point(node.lat, node.lon)
assert_equal false, dbnode.valid?
end
@ -115,7 +115,7 @@ class NodeTest < ActiveSupport::TestCase
node_template.latitude = 12.3456
node_template.longitude = 65.4321
#node_template.tags = "updated=yes"
# node_template.tags = "updated=yes"
assert node.update_from(node_template, users(:normal_user))
node = Node.find(node_template.id)
@ -124,7 +124,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, node.longitude
assert_equal node_template.changeset_id, node.changeset_id
assert_equal node_template.visible, node.visible
#assert_equal node_template.tags, node.tags
# assert_equal node_template.tags, node.tags
assert_equal OldNode.where(:node_id => node_template.id).count, 2
old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
@ -133,7 +133,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, old_node.longitude
assert_equal node_template.changeset_id, old_node.changeset_id
assert_equal node_template.visible, old_node.visible
#assert_equal node_template.tags, old_node.tags
# assert_equal node_template.tags, old_node.tags
end
def test_delete
@ -152,7 +152,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, node.longitude
assert_equal node_template.changeset_id, node.changeset_id
assert_equal false, node.visible
#assert_equal node_template.tags, node.tags
# assert_equal node_template.tags, node.tags
assert_equal OldNode.where(:node_id => node_template.id).count, 2
old_node = OldNode.where(:node_id => node_template.id, :version => 2).first
@ -161,7 +161,7 @@ class NodeTest < ActiveSupport::TestCase
assert_equal node_template.longitude, old_node.longitude
assert_equal node_template.changeset_id, old_node.changeset_id
assert_equal false, old_node.visible
#assert_equal node_template.tags, old_node.tags
# assert_equal node_template.tags, old_node.tags
end
def test_from_xml_no_id
@ -171,72 +171,72 @@ class NodeTest < ActiveSupport::TestCase
version = 1
noid = "<osm><node lat='#{lat}' lon='#{lon}' changeset='#{changeset}' version='#{version}' /></osm>"
# First try a create which doesn't need the id
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Node.from_xml(noid, true)
}
end
# Now try an update with no id, and make sure that it gives the appropriate exception
message = assert_raise(OSM::APIBadXMLError) {
message = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(noid, false)
}
end
assert_match /ID is required when updating./, message.message
end
def test_from_xml_no_lat
nolat = "<osm><node id='1' lon='23.3' changeset='2' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, true)
}
end
assert_match /lat missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolat, false)
}
end
assert_match /lat missing/, message_update.message
end
def test_from_xml_no_lon
nolon = "<osm><node id='1' lat='23.1' changeset='2' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, true)
}
end
assert_match /lon missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nolon, false)
}
end
assert_match /lon missing/, message_update.message
end
def test_from_xml_no_changeset_id
nocs = "<osm><node id='123' lon='23.23' lat='23.1' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
}
end
assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
}
end
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
no_version = "<osm><node id='123' lat='23' lon='23' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Node.from_xml(no_version, true)
}
message_update = assert_raise(OSM::APIBadXMLError) {
end
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_version, false)
}
end
assert_match /Version is required when updating/, message_update.message
end
def test_from_xml_double_lat
nocs = "<osm><node id='123' lon='23.23' lat='23.1' lat='12' changeset='23' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, true)
}
end
assert_match /Fatal error: Attribute lat redefined at/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nocs, false)
}
end
assert_match /Fatal error: Attribute lat redefined at/, message_update.message
end
@ -244,73 +244,73 @@ class NodeTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = "<osm><node id='#{id}' lat='12.3' lon='12.3' changeset='33' version='23' /></osm>"
assert_nothing_raised(OSM::APIBadUserInput) {
assert_nothing_raised(OSM::APIBadUserInput) do
Node.from_xml(zero_id, true)
}
message_update = assert_raise(OSM::APIBadUserInput) {
end
message_update = assert_raise(OSM::APIBadUserInput) do
Node.from_xml(zero_id, false)
}
end
assert_match /ID of node cannot be zero when updating/, message_update.message
end
end
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_text, true)
}
end
assert_match /Must specify a string with one or more characters/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_text, false)
}
end
assert_match /Must specify a string with one or more characters/, message_update.message
end
def test_from_xml_no_node
no_node = "<osm></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_node, true)
}
end
assert_match /XML doesn't contain an osm\/node element/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_node, false)
}
end
assert_match /XML doesn't contain an osm\/node element/, message_update.message
end
def test_from_xml_no_k_v
nokv = "<osm><node id='23' lat='12.3' lon='23.4' changeset='12' version='23'><tag /></node></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, true)
}
end
assert_match /tag is missing key/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(nokv, false)
}
end
assert_match /tag is missing key/, message_update.message
end
def test_from_xml_no_v
no_v = "<osm><node id='23' lat='23.43' lon='23.32' changeset='23' version='32'><tag k='key' /></node></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, true)
}
end
assert_match /tag is missing value/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Node.from_xml(no_v, false)
}
end
assert_match /tag is missing value/, message_update.message
end
def test_from_xml_duplicate_k
dupk = "<osm><node id='23' lat='23.2' lon='23' changeset='34' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></node></osm>"
message_create = assert_raise(OSM::APIDuplicateTagsError) {
message_create = assert_raise(OSM::APIDuplicateTagsError) do
Node.from_xml(dupk, true)
}
end
assert_equal "Element node/ has duplicate tags with key dup", message_create.message
message_update = assert_raise(OSM::APIDuplicateTagsError) {
message_update = assert_raise(OSM::APIDuplicateTagsError) do
Node.from_xml(dupk, false)
}
end
assert_equal "Element node/23 has duplicate tags with key dup", message_update.message
end
@ -335,7 +335,7 @@ class NodeTest < ActiveSupport::TestCase
def test_containing_relation_members
node = current_nodes(:node_used_by_relationship)
crm = Node.find(node.id).containing_relation_members.order(:relation_id)
# assert_equal 3, crm.size
# assert_equal 3, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Node", crm.first.member_type
assert_equal node.id, crm.first.member_id

12
test/models/note_comment_test.rb
View file

@ -5,8 +5,8 @@ class NoteCommentTest < ActiveSupport::TestCase
fixtures :users, :notes, :note_comments
def test_event_valid
ok = [ "opened", "closed", "reopened", "commented", "hidden" ]
bad = [ "expropriated", "fubared" ]
ok = %w(opened closed reopened commented hidden)
bad = %w(expropriated fubared)
ok.each do |event|
note_comment = note_comments(:t1)
@ -22,10 +22,10 @@ class NoteCommentTest < ActiveSupport::TestCase
end
def test_body_valid
ok = [ "Name", "vergrößern", "foo\x0abar",
"ルシステムにも対応します", "輕觸搖晃的遊戲", ]
bad = [ "foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
"foo\ufffebar", "foo\uffffbar" ]
ok = ["Name", "vergrößern", "foo\x0abar",
"ルシステムにも対応します", "輕觸搖晃的遊戲"]
bad = ["foo\x00bar", "foo\x08bar", "foo\x1fbar", "foo\x7fbar",
"foo\ufffebar", "foo\uffffbar"]
ok.each do |body|
note_comment = note_comments(:t1)

4
test/models/note_test.rb
View file

@ -5,8 +5,8 @@ class NoteTest < ActiveSupport::TestCase
fixtures :users, :notes, :note_comments
def test_status_valid
ok = [ "open", "closed", "hidden" ]
bad = [ "expropriated", "fubared" ]
ok = %w(open closed hidden)
bad = %w(expropriated fubared)
ok.each do |status|
note = notes(:open_note)

1
test/models/oauth_nonce_test.rb
View file

@ -16,5 +16,4 @@ class OauthNonceTest < ActiveSupport::TestCase
nonce2 = OauthNonce.remember(string, timestamp)
assert_equal false, nonce2, "Shouldn't be able to remember the same nonce twice."
end
end

1
test/models/oauth_token_test.rb
View file

@ -22,5 +22,4 @@ class OauthTokenTest < ActiveSupport::TestCase
tok.invalidate!
assert_equal false, tok.authorized?, "Token should now be invalid."
end
end

10
test/models/old_node_tag_test.rb
View file

@ -13,7 +13,7 @@ class OldNodeTagTest < ActiveSupport::TestCase
tag = OldNodeTag.new
tag.node_id = node_tags(:t1).node_id
tag.version = node_tags(:t1).version
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -26,13 +26,13 @@ class OldNodeTagTest < ActiveSupport::TestCase
tag.node_id = node_tags(:t1).node_id
tag.version = node_tags(:t1).version
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldNodeTag.new
tag.node_id = node_tags(:t1).node_id
tag.version = node_tags(:t1).version
@ -44,7 +44,7 @@ class OldNodeTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldNodeTag.new
tag.node_id = node_tags(:t1).node_id
tag.version = node_tags(:t1).version
@ -69,7 +69,7 @@ class OldNodeTagTest < ActiveSupport::TestCase
tag.v = node_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

4
test/models/old_node_test.rb
View file

@ -55,7 +55,7 @@ class OldNodeTest < ActiveSupport::TestCase
assert_equal dbnode.version, node.version
assert_equal dbnode.visible, node.visible
assert_equal dbnode.timestamp, node.timestamp
#assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
# assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
assert node.valid?
end
@ -71,7 +71,7 @@ class OldNodeTest < ActiveSupport::TestCase
assert_equal dbnode.version, node.version
assert_equal dbnode.visible, node.visible
assert_equal dbnode.timestamp, node.timestamp
#assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
# assert_equal node.tile, QuadTile.tile_for_point(nodes(nod).lat, nodes(nod).lon)
assert_equal false, node.valid?
end

10
test/models/old_relation_tag_test.rb
View file

@ -13,7 +13,7 @@ class OldRelationTagTest < ActiveSupport::TestCase
tag = OldRelationTag.new
tag.relation_id = relation_tags(:t1).relation_id
tag.version = 1
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -26,13 +26,13 @@ class OldRelationTagTest < ActiveSupport::TestCase
tag.relation_id = relation_tags(:t1).relation_id
tag.version = 1
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldRelationTag.new
tag.relation_id = relation_tags(:t1).relation_id
tag.version = 1
@ -44,7 +44,7 @@ class OldRelationTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldRelationTag.new
tag.relation_id = relation_tags(:t1).relation_id
tag.version = 1
@ -69,7 +69,7 @@ class OldRelationTagTest < ActiveSupport::TestCase
tag.v = relation_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

10
test/models/old_way_tag_test.rb
View file

@ -13,7 +13,7 @@ class OldWayTagTest < ActiveSupport::TestCase
tag = OldWayTag.new
tag.way_id = way_tags(:t1).way_id
tag.version = 1
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -26,13 +26,13 @@ class OldWayTagTest < ActiveSupport::TestCase
tag.way_id = way_tags(:t1).way_id
tag.version = 1
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldWayTag.new
tag.way_id = way_tags(:t1).way_id
tag.version = 1
@ -44,7 +44,7 @@ class OldWayTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = OldWayTag.new
tag.way_id = way_tags(:t1).way_id
tag.version = 1
@ -69,7 +69,7 @@ class OldWayTagTest < ActiveSupport::TestCase
tag.v = way_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

8
test/models/old_way_test.rb
View file

@ -92,13 +92,13 @@ class OldWayTest < ActiveSupport::TestCase
way = ways(:way_with_versions_v3)
nodes = OldWay.find(way.id).get_nodes_undelete
assert_equal 2, nodes.size
assert_equal [1.0, 1.0, 15, 4, {"testing" => "added in node version 3", "testing two" => "modified in node version 4"}, true], nodes[0]
assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[1]
assert_equal [1.0, 1.0, 15, 4, { "testing" => "added in node version 3", "testing two" => "modified in node version 4" }, true], nodes[0]
assert_equal [3.0, 3.0, 3, 1, { "test" => "yes" }, true], nodes[1]
way = ways(:way_with_redacted_versions_v2)
nodes = OldWay.find(way.id).get_nodes_undelete
assert_equal 2, nodes.size
assert_equal [3.0, 3.0, 3, 1, {"test" => "yes"}, true], nodes[0]
assert_equal [2.0, 2.0, 2, 1, {"testused" => "yes"}, false], nodes[1]
assert_equal [3.0, 3.0, 3, 1, { "test" => "yes" }, true], nodes[0]
assert_equal [2.0, 2.0, 2, 1, { "testused" => "yes" }, false], nodes[1]
end
end

1
test/models/redaction_test.rb
View file

@ -32,5 +32,4 @@ class RedactionTest < ActiveSupport::TestCase
end
assert_equal(true, n.redacted?, "Expected node to be redacted after redact! call.")
end
end

10
test/models/relation_tag_test.rb
View file

@ -12,7 +12,7 @@ class RelationTagTest < ActiveSupport::TestCase
(0..255).each do |i|
tag = RelationTag.new
tag.relation_id = 1
tag.k = key*i
tag.k = key * i
tag.v = "v"
assert tag.valid?
end
@ -24,13 +24,13 @@ class RelationTagTest < ActiveSupport::TestCase
tag = RelationTag.new
tag.relation_id = 1
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = RelationTag.new
tag.relation_id = 1
tag.k = i
@ -41,7 +41,7 @@ class RelationTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["v"*256].each do |i|
["v" * 256].each do |i|
tag = RelationTag.new
tag.relation_id = 1
tag.k = "k"
@ -64,7 +64,7 @@ class RelationTagTest < ActiveSupport::TestCase
tag.v = current_relation_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end

66
test/models/relation_test.rb
View file

@ -9,35 +9,35 @@ class RelationTest < ActiveSupport::TestCase
def test_from_xml_no_id
noid = "<osm><relation version='12' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Relation.from_xml(noid, true)
}
message = assert_raise(OSM::APIBadXMLError) {
end
message = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(noid, false)
}
end
assert_match /ID is required when updating/, message.message
end
def test_from_xml_no_changeset_id
nocs = "<osm><relation id='123' version='12' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(nocs, true)
}
end
assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(nocs, false)
}
end
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
no_version = "<osm><relation id='123' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Relation.from_xml(no_version, true)
}
message_update = assert_raise(OSM::APIBadXMLError) {
end
message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_version, false)
}
end
assert_match /Version is required when updating/, message_update.message
end
@ -45,61 +45,61 @@ class RelationTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = "<osm><relation id='#{id}' changeset='332' version='23' /></osm>"
assert_nothing_raised(OSM::APIBadUserInput) {
assert_nothing_raised(OSM::APIBadUserInput) do
Relation.from_xml(zero_id, true)
}
message_update = assert_raise(OSM::APIBadUserInput) {
end
message_update = assert_raise(OSM::APIBadUserInput) do
Relation.from_xml(zero_id, false)
}
end
assert_match /ID of relation cannot be zero when updating/, message_update.message
end
end
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_text, true)
}
end
assert_match /Must specify a string with one or more characters/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_text, false)
}
end
assert_match /Must specify a string with one or more characters/, message_update.message
end
def test_from_xml_no_k_v
nokv = "<osm><relation id='23' changeset='23' version='23'><tag /></relation></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(nokv, true)
}
end
assert_match /tag is missing key/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(nokv, false)
}
end
assert_match /tag is missing key/, message_update.message
end
def test_from_xml_no_v
no_v = "<osm><relation id='23' changeset='23' version='23'><tag k='key' /></relation></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_v, true)
}
end
assert_match /tag is missing value/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Relation.from_xml(no_v, false)
}
end
assert_match /tag is missing value/, message_update.message
end
def test_from_xml_duplicate_k
dupk = "<osm><relation id='23' changeset='23' version='23'><tag k='dup' v='test'/><tag k='dup' v='tester'/></relation></osm>"
message_create = assert_raise(OSM::APIDuplicateTagsError) {
message_create = assert_raise(OSM::APIDuplicateTagsError) do
Relation.from_xml(dupk, true)
}
end
assert_equal "Element relation/ has duplicate tags with key dup", message_create.message
message_update = assert_raise(OSM::APIDuplicateTagsError) {
message_update = assert_raise(OSM::APIDuplicateTagsError) do
Relation.from_xml(dupk, false)
}
end
assert_equal "Element relation/23 has duplicate tags with key dup", message_update.message
end
@ -148,7 +148,7 @@ class RelationTest < ActiveSupport::TestCase
def test_containing_relation_members
relation = current_relations(:used_relation)
crm = Relation.find(relation.id).containing_relation_members.order(:relation_id)
# assert_equal 1, crm.size
# assert_equal 1, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Relation", crm.first.member_type
assert_equal relation.id, crm.first.member_id

24
test/models/trace_test.rb
View file

@ -39,17 +39,17 @@ class TraceTest < ActiveSupport::TestCase
def test_validations
trace_valid({})
trace_valid({:user_id => nil}, false)
trace_valid({:name => 'a'*255})
trace_valid({:name => 'a'*256}, false)
trace_valid({:description => nil}, false)
trace_valid({:description => 'a'*255})
trace_valid({:description => 'a'*256}, false)
trace_valid({:visibility => "private"})
trace_valid({:visibility => "public"})
trace_valid({:visibility => "trackable"})
trace_valid({:visibility => "identifiable"})
trace_valid({:visibility => "foo"}, false)
trace_valid({ :user_id => nil }, false)
trace_valid(:name => 'a' * 255)
trace_valid({ :name => 'a' * 256 }, false)
trace_valid({ :description => nil }, false)
trace_valid(:description => 'a' * 255)
trace_valid({ :description => 'a' * 256 }, false)
trace_valid(:visibility => "private")
trace_valid(:visibility => "public")
trace_valid(:visibility => "trackable")
trace_valid(:visibility => "identifiable")
trace_valid({ :visibility => "foo" }, false)
end
def test_tagstring
@ -106,7 +106,7 @@ class TraceTest < ActiveSupport::TestCase
assert_equal ".gpx.gz", gpx_files(:identifiable_trace_file).extension_name
end
private
private
def check_query(query, traces)
traces = traces.map { |t| gpx_files(t) }.sort

1
test/models/tracepoint_test.rb
View file

@ -6,5 +6,4 @@ class TracepointTest < ActiveSupport::TestCase
def test_tracepoint_count
assert_equal 4, Tracepoint.count
end
end

22
test/models/tracetag_test.rb
View file

@ -9,19 +9,19 @@ class TracetagTest < ActiveSupport::TestCase
def test_validations
tracetag_valid({})
tracetag_valid({:tag => nil}, false)
tracetag_valid({:tag => ''}, false)
tracetag_valid({:tag => 'a'})
tracetag_valid({:tag => 'a'*255})
tracetag_valid({:tag => 'a'*256}, false)
tracetag_valid({:tag => 'a/b'}, false)
tracetag_valid({:tag => 'a;b'}, false)
tracetag_valid({:tag => 'a.b'}, false)
tracetag_valid({:tag => 'a,b'}, false)
tracetag_valid({:tag => 'a?b'}, false)
tracetag_valid({ :tag => nil }, false)
tracetag_valid({ :tag => '' }, false)
tracetag_valid(:tag => 'a')
tracetag_valid(:tag => 'a' * 255)
tracetag_valid({ :tag => 'a' * 256 }, false)
tracetag_valid({ :tag => 'a/b' }, false)
tracetag_valid({ :tag => 'a;b' }, false)
tracetag_valid({ :tag => 'a.b' }, false)
tracetag_valid({ :tag => 'a,b' }, false)
tracetag_valid({ :tag => 'a?b' }, false)
end
private
private
def tracetag_valid(attrs, result = true)
entry = Tracetag.new(gpx_file_tags(:first_trace_1).attributes)

19
test/models/user_preference_test.rb
View file

@ -20,7 +20,7 @@ class UserPreferenceTest < ActiveSupport::TestCase
newUP.k = up.k
newUP.v = "some other value"
assert_not_equal newUP.v, up.v
assert_raise (ActiveRecord::RecordNotUnique) {newUP.save}
assert_raise (ActiveRecord::RecordNotUnique) { newUP.save }
end
def test_check_valid_length
@ -29,27 +29,26 @@ class UserPreferenceTest < ActiveSupport::TestCase
(1..255).each do |i|
up = UserPreference.new
up.user = users(:normal_user)
up.k = key*i
up.v = val*i
up.k = key * i
up.v = val * i
assert up.valid?
assert up.save!
resp = UserPreference.find(up.id)
assert_equal key*i, resp.k, "User preference with #{i} #{key} chars (i.e. #{key.length*i} bytes) fails"
assert_equal val*i, resp.v, "User preference with #{i} #{val} chars (i.e. #{val.length*i} bytes) fails"
assert_equal key * i, resp.k, "User preference with #{i} #{key} chars (i.e. #{key.length * i} bytes) fails"
assert_equal val * i, resp.v, "User preference with #{i} #{val} chars (i.e. #{val.length * i} bytes) fails"
end
end
def test_check_invalid_length
key = "k"
val = "v"
[0,256].each do |i|
[0, 256].each do |i|
up = UserPreference.new
up.user = users(:normal_user)
up.k = key*i
up.v = val*i
up.k = key * i
up.v = val * i
assert_equal false, up.valid?
assert_raise(ActiveRecord::RecordInvalid) {up.save!}
assert_raise(ActiveRecord::RecordInvalid) { up.save! }
end
end
end

44
test/models/user_test.rb
View file

@ -44,10 +44,10 @@ class UserTest < ActiveSupport::TestCase
end
def test_email_valid
ok = %w{ a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
test_local@openstreetmap.org test-local@example.com }
bad = %w{ hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
輕觸搖晃的遊戲@ah.com も対応します@s.name }
ok = %w(a@s.com test@shaunmcdonald.me.uk hello_local@ping-d.ng
test_local@openstreetmap.org test-local@example.com)
bad = %w(hi ht@ n@ @.com help@.me.uk help"hi.me.uk も対@応します
輕觸搖晃的遊戲@ah.com も対応します@s.name)
ok.each do |name|
user = users(:normal_user)
@ -81,15 +81,15 @@ class UserTest < ActiveSupport::TestCase
# Due to sanitisation in the view some of these that you might not
# expact are allowed
# However, would they affect the xml planet dumps?
ok = [ "Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
"vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲" ]
ok = ["Name", "'me", "he\"", "<hr>", "*ho", "\"help\"@",
"vergrößern", "ルシステムにも対応します", "輕觸搖晃的遊戲"]
# These need to be 3 chars in length, otherwise the length test above
# should be used.
bad = [ "<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
"aa,", "aa?", "/;.,?", "も対応します/", "#ping",
"foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
"new", "terms", "save", "confirm", "confirm-email",
"go_public", "reset-password", "forgot-password", "suspended" ]
bad = ["<hr/>", "test@example.com", "s/f", "aa/", "aa;", "aa.",
"aa,", "aa?", "/;.,?", "も対応します/", "#ping",
"foo\x1fbar", "foo\x7fbar", "foo\ufffebar", "foo\uffffbar",
"new", "terms", "save", "confirm", "confirm-email",
"go_public", "reset-password", "forgot-password", "suspended"]
ok.each do |display_name|
user = users(:normal_user)
user.display_name = display_name
@ -129,10 +129,10 @@ class UserTest < ActiveSupport::TestCase
assert_equal 1, Friend.count
norm = users(:normal_user)
sec = users(:public_user)
#friend = Friend.new
#friend.befriender = norm
#friend.befriendee = sec
#friend.save
# friend = Friend.new
# friend.befriender = norm
# friend.befriendee = sec
# friend.save
assert_equal [sec], norm.nearby
assert_equal 1, norm.nearby.size
assert_equal 1, Friend.count
@ -143,8 +143,8 @@ class UserTest < ActiveSupport::TestCase
assert !users(:public_user).is_friends_with?(users(:inactive_user))
assert !users(:inactive_user).is_friends_with?(users(:normal_user))
assert !users(:inactive_user).is_friends_with?(users(:public_user))
#Friend.delete(friend)
#assert_equal 0, Friend.count
# Friend.delete(friend)
# assert_equal 0, Friend.count
end
def test_user_preferred_editor
@ -190,12 +190,12 @@ class UserTest < ActiveSupport::TestCase
def test_languages
user = users(:normal_user)
assert_equal [ "en" ], user.languages
user.languages = [ "de", "fr", "en" ]
assert_equal [ "de", "fr", "en" ], user.languages
user.languages = [ "fr", "de", "sl" ]
assert_equal ["en"], user.languages
user.languages = %w(de fr en)
assert_equal %w(de fr en), user.languages
user.languages = %w(fr de sl)
assert_equal "de", user.preferred_language
assert_equal "de", user.preferred_language_from(["en", "sl", "de", "es"])
assert_equal "de", user.preferred_language_from(%w(en sl de es))
end
def test_visible?

1
test/models/user_token_test.rb
View file

@ -7,5 +7,4 @@ class UserTokenTest < ActiveSupport::TestCase
def test_user_token_count
assert_equal 0, UserToken.count
end
end

10
test/models/way_tag_test.rb
View file

@ -12,7 +12,7 @@ class WayTagTest < ActiveSupport::TestCase
(0..255).each do |i|
tag = WayTag.new
tag.way_id = current_way_tags(:t1).way_id
tag.k = key*i
tag.k = key * i
tag.v = current_way_tags(:t1).v
assert tag.valid?
end
@ -24,13 +24,13 @@ class WayTagTest < ActiveSupport::TestCase
tag = WayTag.new
tag.way_id = current_way_tags(:t1).way_id
tag.k = "k"
tag.v = val*i
tag.v = val * i
assert tag.valid?
end
end
def test_length_key_invalid
["k"*256].each do |i|
["k" * 256].each do |i|
tag = WayTag.new
tag.way_id = current_way_tags(:t1).way_id
tag.k = i
@ -41,7 +41,7 @@ class WayTagTest < ActiveSupport::TestCase
end
def test_length_value_invalid
["v"*256].each do |i|
["v" * 256].each do |i|
tag = WayTag.new
tag.way_id = current_way_tags(:t1).way_id
tag.k = "k"
@ -64,7 +64,7 @@ class WayTagTest < ActiveSupport::TestCase
tag.v = current_way_tags(:t1).v
assert tag.new_record?
assert !tag.valid?
assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
assert tag.new_record?
end
end

78
test/models/way_test.rb
View file

@ -11,9 +11,9 @@ class WayTest < ActiveSupport::TestCase
def test_bbox
node = current_nodes(:used_node_1)
[ :visible_way,
:invisible_way,
:used_way ].each do |way_symbol|
[:visible_way,
:invisible_way,
:used_way].each do |way_symbol|
way = current_ways(way_symbol)
assert_equal node.bbox.min_lon, way.bbox.min_lon, 'min_lon'
assert_equal node.bbox.min_lat, way.bbox.min_lat, 'min_lat'
@ -29,12 +29,12 @@ class WayTest < ActiveSupport::TestCase
way = Way.find(current_ways(:visible_way).id)
assert way.valid?
# it already has 1 node
1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) {
1.upto((MAX_NUMBER_OF_WAY_NODES) / 2) do
way.add_nd_num(current_nodes(:used_node_1).id)
way.add_nd_num(current_nodes(:used_node_2).id)
}
end
way.save
#print way.nds.size
# print way.nds.size
assert way.valid?
way.add_nd_num(current_nodes(:visible_node).id)
assert way.valid?
@ -42,35 +42,35 @@ class WayTest < ActiveSupport::TestCase
def test_from_xml_no_id
noid = "<osm><way version='12' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Way.from_xml(noid, true)
}
message = assert_raise(OSM::APIBadXMLError) {
end
message = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(noid, false)
}
end
assert_match /ID is required when updating/, message.message
end
def test_from_xml_no_changeset_id
nocs = "<osm><way id='123' version='23' /></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nocs, true)
}
end
assert_match /Changeset id is missing/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nocs, false)
}
end
assert_match /Changeset id is missing/, message_update.message
end
def test_from_xml_no_version
no_version = "<osm><way id='123' changeset='23' /></osm>"
assert_nothing_raised(OSM::APIBadXMLError) {
assert_nothing_raised(OSM::APIBadXMLError) do
Way.from_xml(no_version, true)
}
message_update = assert_raise(OSM::APIBadXMLError) {
end
message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_version, false)
}
end
assert_match /Version is required when updating/, message_update.message
end
@ -78,61 +78,61 @@ class WayTest < ActiveSupport::TestCase
id_list = ["", "0", "00", "0.0", "a"]
id_list.each do |id|
zero_id = "<osm><way id='#{id}' changeset='33' version='23' /></osm>"
assert_nothing_raised(OSM::APIBadUserInput) {
assert_nothing_raised(OSM::APIBadUserInput) do
Way.from_xml(zero_id, true)
}
message_update = assert_raise(OSM::APIBadUserInput) {
end
message_update = assert_raise(OSM::APIBadUserInput) do
Way.from_xml(zero_id, false)
}
end
assert_match /ID of way cannot be zero when updating/, message_update.message
end
end
def test_from_xml_no_text
no_text = ""
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_text, true)
}
end
assert_match /Must specify a string with one or more characters/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_text, false)
}
end
assert_match /Must specify a string with one or more characters/, message_update.message
end
def test_from_xml_no_k_v
nokv = "<osm><way id='23' changeset='23' version='23'><tag /></way></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nokv, true)
}
end
assert_match /tag is missing key/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(nokv, false)
}
end
assert_match /tag is missing key/, message_update.message
end
def test_from_xml_no_v
no_v = "<osm><way id='23' changeset='23' version='23'><tag k='key' /></way></osm>"
message_create = assert_raise(OSM::APIBadXMLError) {
message_create = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_v, true)
}
end
assert_match /tag is missing value/, message_create.message
message_update = assert_raise(OSM::APIBadXMLError) {
message_update = assert_raise(OSM::APIBadXMLError) do
Way.from_xml(no_v, false)
}
end
assert_match /tag is missing value/, message_update.message
end
def test_from_xml_duplicate_k
dupk = "<osm><way id='23' changeset='23' version='23'><tag k='dup' v='test' /><tag k='dup' v='tester' /></way></osm>"
message_create = assert_raise(OSM::APIDuplicateTagsError) {
message_create = assert_raise(OSM::APIDuplicateTagsError) do
Way.from_xml(dupk, true)
}
end
assert_equal "Element way/ has duplicate tags with key dup", message_create.message
message_update = assert_raise(OSM::APIDuplicateTagsError) {
message_update = assert_raise(OSM::APIDuplicateTagsError) do
Way.from_xml(dupk, false)
}
end
assert_equal "Element way/23 has duplicate tags with key dup", message_update.message
end
@ -184,7 +184,7 @@ class WayTest < ActiveSupport::TestCase
def test_containing_relation_members
way = current_ways(:used_way)
crm = Way.find(way.id).containing_relation_members.order(:relation_id)
# assert_equal 1, crm.size
# assert_equal 1, crm.size
assert_equal 1, crm.first.relation_id
assert_equal "Way", crm.first.member_type
assert_equal way.id, crm.first.member_id